X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.c;h=5a41c3800709ff3c2a628758ed89f01636be04f7;hb=7b33648488cbc5292327347cf6b48c342f9ed8dc;hp=47bd04cd837d76c2ecc8f4588ca7077d7581de49;hpb=c25613651ac7525a16b9877230a682fc1a64e036;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
index 47bd04cd8..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.
  *