X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=792f519abbddb3cae7c2a1714a42ed96fff16361;hb=fbe49b3b8c9dc03d99441f68dfb8bcf7450d71e3;hp=c66548cd87d25495de8d87ebb275d5bea5adc557;hpb=7c1d2758d663ac5f119eae6849e50b56546a0c48;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index c66548cd8..792f519ab 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -3766,7 +3766,35 @@ skip_domain:
 	}
 	case LTTNG_DATA_PENDING:
 	{
-		ret = cmd_data_pending(cmd_ctx->session);
+		int pending_ret;
+
+		/* 1 byte to return whether or not data is pending */
+		ret = setup_lttng_msg(cmd_ctx, 1);
+		if (ret < 0) {
+			goto setup_error;
+		}
+
+		pending_ret = cmd_data_pending(cmd_ctx->session);
+		/*
+		 * FIXME
+		 *
+		 * This function may returns 0 or 1 to indicate whether or not
+		 * there is data pending. In case of error, it should return an
+		 * LTTNG_ERR code. However, some code paths may still return
+		 * a nondescript error code, which we handle by returning an
+		 * "unknown" error.
+		 */
+		if (pending_ret == 0 || pending_ret == 1) {
+			ret = LTTNG_OK;
+		} else if (pending_ret < 0) {
+			ret = LTTNG_ERR_UNK;
+			goto setup_error;
+		} else {
+			ret = pending_ret;
+			goto setup_error;
+		}
+
+		*cmd_ctx->llm->payload = (uint8_t) pending_ret;
 		break;
 	}
 	case LTTNG_SNAPSHOT_ADD_OUTPUT:
@@ -4333,9 +4361,10 @@ static void *thread_manage_clients(void *data)
 
 		health_code_update();
 
-		DBG("Sending response (size: %d, retcode: %s)",
+		DBG("Sending response (size: %d, retcode: %s (%d))",
 				cmd_ctx->lttng_msg_size,
-				lttng_strerror(-cmd_ctx->llm->ret_code));
+				lttng_strerror(-cmd_ctx->llm->ret_code),
+				cmd_ctx->llm->ret_code);
 		ret = send_unix_sock(sock, cmd_ctx->llm, cmd_ctx->lttng_msg_size);
 		if (ret < 0) {
 			ERR("Failed to send data back to client");
@@ -5302,9 +5331,6 @@ int main(int argc, char **argv)
 	void *status;
 	const char *home_path, *env_app_timeout;
 
-	/* Initialize agent apps ht global variable */
-	agent_apps_ht_by_sock = NULL;
-
 	init_kernel_workarounds();
 
 	rcu_register_thread();