X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.c;h=5a41c3800709ff3c2a628758ed89f01636be04f7;hb=78d8cf23b650a268d373f789de10d37523a67bfa;hp=f30df2097fd36aea2b03d2f30f96d791226dc1a9;hpb=0dd01979d6f26886199ef746377640b57260421c;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
index f30df2097..5a41c3800 100644
--- a/src/bin/lttng-sessiond/ust-app.c
+++ b/src/bin/lttng-sessiond/ust-app.c
@@ -566,18 +566,6 @@ ssize_t ust_app_push_metadata(struct ust_registry_session *registry,
 		return 0;
 	}
 
-	/*
-	 * On a push metadata error either the consumer is dead or the
-	 * metadata channel has been destroyed because its endpoint
-	 * might have died (e.g: relayd), or because the application has
-	 * exited. If so, the metadata closed flag is set to 1 so we
-	 * deny pushing metadata again which is not valid anymore on the
-	 * consumer side.
-	 */
-	if (registry->metadata_closed) {
-		return -EPIPE;
-	}
-
 	offset = registry->metadata_len_sent;
 	len = registry->metadata_len - registry->metadata_len_sent;
 	new_metadata_len_sent = registry->metadata_len;
@@ -5203,54 +5191,6 @@ end:
 	return ret;
 }
 
-/*
- * Calibrate registered applications.
- */
-int ust_app_calibrate_glb(struct lttng_ust_calibrate *calibrate)
-{
-	int ret = 0;
-	struct lttng_ht_iter iter;
-	struct ust_app *app;
-
-	rcu_read_lock();
-
-	cds_lfht_for_each_entry(ust_app_ht->ht, &iter.iter, app, pid_n.node) {
-		if (!app->compatible) {
-			/*
-			 * TODO: In time, we should notice the caller of this error by
-			 * telling him that this is a version error.
-			 */
-			continue;
-		}
-
-		health_code_update();
-
-		pthread_mutex_lock(&app->sock_lock);
-		ret = ustctl_calibrate(app->sock, calibrate);
-		pthread_mutex_unlock(&app->sock_lock);
-		if (ret < 0) {
-			switch (ret) {
-			case -ENOSYS:
-				/* Means that it's not implemented on the tracer side. */
-				ret = 0;
-				break;
-			default:
-				DBG2("Calibrate app PID %d returned with error %d",
-						app->pid, ret);
-				break;
-			}
-		}
-	}
-
-	DBG("UST app global domain calibration finished");
-
-	rcu_read_unlock();
-
-	health_code_update();
-
-	return ret;
-}
-
 /*
  * Receive registration and populate the given msg structure.
  *
@@ -6148,3 +6088,69 @@ end:
 	rcu_read_unlock();
 	return ret;
 }
+
+static
+int ust_app_regenerate_statedump(struct ltt_ust_session *usess,
+		struct ust_app *app)
+{
+	int ret = 0;
+	struct ust_app_session *ua_sess;
+
+	DBG("Regenerating the metadata for ust app pid %d", app->pid);
+
+	rcu_read_lock();
+
+	ua_sess = lookup_session_by_app(usess, app);
+	if (ua_sess == NULL) {
+		/* The session is in teardown process. Ignore and continue. */
+		goto end;
+	}
+
+	pthread_mutex_lock(&ua_sess->lock);
+
+	if (ua_sess->deleted) {
+		goto end_unlock;
+	}
+
+	pthread_mutex_lock(&app->sock_lock);
+	ret = ustctl_regenerate_statedump(app->sock, ua_sess->handle);
+	pthread_mutex_unlock(&app->sock_lock);
+
+end_unlock:
+	pthread_mutex_unlock(&ua_sess->lock);
+
+end:
+	rcu_read_unlock();
+	health_code_update();
+	return ret;
+}
+
+/*
+ * Regenerate the statedump for each app in the session.
+ */
+int ust_app_regenerate_statedump_all(struct ltt_ust_session *usess)
+{
+	int ret = 0;
+	struct lttng_ht_iter iter;
+	struct ust_app *app;
+
+	DBG("Regenerating the metadata for all UST apps");
+
+	rcu_read_lock();
+
+	cds_lfht_for_each_entry(ust_app_ht->ht, &iter.iter, app, pid_n.node) {
+		if (!app->compatible) {
+			continue;
+		}
+
+		ret = ust_app_regenerate_statedump(usess, app);
+		if (ret < 0) {
+			/* Continue to the next app even on error */
+			continue;
+		}
+	}
+
+	rcu_read_unlock();
+
+	return 0;
+}