X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=libustcmd%2Fustcmd.c;h=c51232000310340d81144ed8e6607c412a6b405a;hb=dc46f6e66144edead3c54d69eaa0b4bec56e4eaf;hp=5b4fd02efcf242854e9ed69a6455a6ede087ac4e;hpb=08b8805efffcad4e0f713272cac6f75390176396;p=ust.git

diff --git a/libustcmd/ustcmd.c b/libustcmd/ustcmd.c
index 5b4fd02..c512320 100644
--- a/libustcmd/ustcmd.c
+++ b/libustcmd/ustcmd.c
@@ -97,7 +97,7 @@ int ustcmd_set_marker_state(const char *mn, int state, pid_t pid)
 	}
 
 	result = ustcmd_send_cmd(cmd, pid, NULL);
-	if (result) {
+	if (result != 1) {
 		free(cmd);
 		return USTCMD_ERR_GEN;
 	}
@@ -182,9 +182,8 @@ int ustcmd_get_subbuf_size(const char *channel, pid_t pid)
 	}
 
 	result = ustcmd_send_cmd(cmd, pid, &reply);
-	if (result) {
+	if (result != 1) {
 		free(cmd);
-		free(reply);
 		return -1;
 	}
 
@@ -214,9 +213,8 @@ int ustcmd_get_subbuf_num(const char *channel, pid_t pid)
 	}
 
 	result = ustcmd_send_cmd(cmd, pid, &reply);
-	if (result) {
+	if (result != 1) {
 		free(cmd);
-		free(reply);
 		return -1;
 	}
 
@@ -397,10 +395,6 @@ int ustcmd_get_cmsf(struct marker_status **cmsf, const pid_t pid)
 		return -1;
 	}
 	result = ustcmd_send_cmd("list_markers", pid, &big_str);
-	if (result != 1) {
-		return -1;
-	}
-
 	if (result != 1) {
 		ERR("error while getting markers list");
 		return -1;
@@ -409,6 +403,7 @@ int ustcmd_get_cmsf(struct marker_status **cmsf, const pid_t pid)
 	tmp_cmsf = (struct marker_status *) malloc(sizeof(struct marker_status) *
 		(ustcmd_count_nl(big_str) + 1));
 	if (tmp_cmsf == NULL) {
+		ERR("Failed to allocate CMSF array");
 		return -1;
 	}
 
@@ -440,6 +435,83 @@ int ustcmd_get_cmsf(struct marker_status **cmsf, const pid_t pid)
 	return 0;
 }
 
+
+/**
+ * Frees a TES array.
+ *
+ * @param tes	TES array to free
+ * @return	0 if successful, or error USTCMD_ERR_ARG
+ */
+int ustcmd_free_tes(struct trace_event_status *tes)
+{
+	if (tes == NULL) {
+		return USTCMD_ERR_ARG;
+	}
+
+	unsigned int i = 0;
+	while (tes[i].name != NULL) {
+		free(tes[i].name);
+		++i;
+	}
+	free(tes);
+
+	return 0;
+}
+
+/**
+ * Gets trace_events string for a given PID.
+ *
+ * @param tes	Pointer to TES array to be filled (callee allocates, caller
+ *		frees with `ustcmd_free_tes')
+ * @param pid	Targeted PID
+ * @return	0 if successful, or -1 on error
+ */
+int ustcmd_get_tes(struct trace_event_status **tes,
+			    const pid_t pid)
+{
+	char *big_str = NULL;
+	int result;
+	struct trace_event_status *tmp_tes = NULL;
+	unsigned int i = 0, tes_ind = 0;
+
+	if (tes == NULL) {
+		return -1;
+	}
+
+	result = ustcmd_send_cmd("list_trace_events", pid, &big_str);
+	if (result != 1) {
+		ERR("error while getting trace_event list");
+		return -1;
+	}
+
+	tmp_tes = (struct trace_event_status *)
+		zmalloc(sizeof(struct trace_event_status) *
+			(ustcmd_count_nl(big_str) + 1));
+	if (tmp_tes == NULL) {
+		ERR("Failed to allocate TES array");
+		return -1;
+	}
+
+	/* Parse received reply string (format: "[name]"): */
+	while (big_str[i] != '\0') {
+		char state;
+
+		sscanf(big_str + i, "trace_event: %a[^\n]",
+			&tmp_tes[tes_ind].name);
+		while (big_str[i] != '\n') {
+			++i; /* Go to next '\n' */
+		}
+		++i; /* Skip current pointed '\n' */
+		++tes_ind;
+	}
+	tmp_tes[tes_ind].name = NULL;
+
+	*tes = tmp_tes;
+
+	free(big_str);
+	return 0;
+}
+
 /**
  * Set socket path
  *
@@ -488,7 +560,6 @@ int ustcmd_get_sock_path(char **sock_path, pid_t pid)
 	result = ustcmd_send_cmd(cmd, pid, &reply);
 	if (result != 1) {
 		free(cmd);
-		free(reply);
 		return USTCMD_ERR_GEN;
 	}
 
@@ -516,7 +587,7 @@ int ustcmd_force_switch(pid_t pid)
  * @param pid	Targeted PID
  * @param reply	Pointer to string to be filled with a reply string (must
  *		be NULL if no reply is needed for the given command).
- * @return	-1 if successful, 0 on EOT, 1 on success
+ * @return	-1 if not successful, 0 on EOT, 1 on success
  */
 
 int ustcmd_send_cmd(const char *cmd, const pid_t pid, char **reply)