X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=b0674612b54589de311bdfa0e76117226675223e;hb=389fbf04b41e2002be44a1e3392bfade2f1deeef;hp=f47f73e0f2d3128bc8d95898eebc80ad7b1a901e;hpb=1a1a34b40ab10a195633b1ed5e2e9b42fdae0a78;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index f47f73e0f..b0674612b 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -1357,7 +1357,6 @@ restart:
 		consumer_data->metadata_sock.lock = zmalloc(sizeof(pthread_mutex_t));
 		if (consumer_data->metadata_sock.lock == NULL) {
 			PERROR("zmalloc pthread mutex");
-			ret = -1;
 			goto error;
 		}
 		pthread_mutex_init(consumer_data->metadata_sock.lock, NULL);
@@ -2379,7 +2378,7 @@ static int spawn_consumer_thread(struct consumer_data *consumer_data)
 	pthread_mutex_lock(&consumer_data->cond_mutex);
 
 	/* Get time for sem_timedwait absolute timeout */
-	clock_ret = clock_gettime(CLOCK_MONOTONIC, &timeout);
+	clock_ret = lttng_clock_gettime(CLOCK_MONOTONIC, &timeout);
 	/*
 	 * Set the timeout for the condition timed wait even if the clock gettime
 	 * call fails since we might loop on that call and we want to avoid to
@@ -3004,7 +3003,8 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int sock,
 	case LTTNG_SNAPSHOT_RECORD:
 	case LTTNG_SAVE_SESSION:
 	case LTTNG_SET_SESSION_SHM_PATH:
-	case LTTNG_METADATA_REGENERATE:
+	case LTTNG_REGENERATE_METADATA:
+	case LTTNG_REGENERATE_STATEDUMP:
 		need_domain = 0;
 		break;
 	default:
@@ -4115,9 +4115,14 @@ error_add_context:
 				cmd_ctx->lsm->u.set_shm_path.shm_path);
 		break;
 	}
-	case LTTNG_METADATA_REGENERATE:
+	case LTTNG_REGENERATE_METADATA:
+	{
+		ret = cmd_regenerate_metadata(cmd_ctx->session);
+		break;
+	}
+	case LTTNG_REGENERATE_STATEDUMP:
 	{
-		ret = cmd_metadata_regenerate(cmd_ctx->session);
+		ret = cmd_regenerate_statedump(cmd_ctx->session);
 		break;
 	}
 	default:
@@ -4286,7 +4291,6 @@ restart:
 			if (ret) {
 				PERROR("close");
 			}
-			new_sock = -1;
 			continue;
 		}
 
@@ -4315,7 +4319,6 @@ restart:
 		if (ret) {
 			PERROR("close");
 		}
-		new_sock = -1;
 	}
 
 exit: