X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=libustcomm%2Fustcomm.c;h=d9c795633b238ac103a4315a7045fbe5e0c5afea;hb=3847c3bab100bfb6b01b5654c2429a5d0d162ff5;hp=3843921cf08933a4e6212f0e31e3762452b69456;hpb=f9e5ce615d925102c8cf44f4fe61ab6aacd92c45;p=ust.git

diff --git a/libustcomm/ustcomm.c b/libustcomm/ustcomm.c
index 3843921..d9c7956 100644
--- a/libustcomm/ustcomm.c
+++ b/libustcomm/ustcomm.c
@@ -1,63 +1,239 @@
+#define _GNU_SOURCE
 #include <sys/types.h>
 #include <signal.h>
 #include <errno.h>
 #include <sys/socket.h>
 #include <sys/un.h>
+#include <unistd.h>
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
+#include <execinfo.h>
+
+#include "ustcomm.h"
+#include "localerr.h"
 
 #define UNIX_PATH_MAX 108
 #define SOCK_DIR "/tmp/socks"
 #define UST_SIGNAL SIGIO
 
+#define MSG_MAX 1000
+
+//static void bt(void)
+//{
+//	void *buffer[100];
+//	int result;
+//
+//	result = backtrace(&buffer, 100);
+//	backtrace_symbols_fd(buffer, result, STDERR_FILENO);
+//}
+
 static void signal_process(pid_t pid)
 {
 	int result;
 
 	result = kill(pid, UST_SIGNAL);
 	if(result == -1) {
-		perror("kill");
+		PERROR("kill");
 		return;
 	}
 
 	sleep(1);
 }
 
-int send_message(pid_t pid, const char *msg, const char *reply)
+int send_message_path(const char *path, const char *msg, char **reply, int signalpid)
 {
 	int fd;
 	int result;
 	struct sockaddr_un addr;
-	char *buf;
 
 	result = fd = socket(PF_UNIX, SOCK_DGRAM, 0);
 	if(result == -1) {
-		perror("socket");
-		return 1;
+		PERROR("socket");
+		return -1;
 	}
 
 	addr.sun_family = AF_UNIX;
 
-	result = snprintf(addr.sun_path, UNIX_PATH_MAX, "%s/%d", SOCK_DIR, pid);
+	result = snprintf(addr.sun_path, UNIX_PATH_MAX, "%s", path);
+	if(result >= UNIX_PATH_MAX) {
+		ERR("string overflow allocating socket name");
+		return -1;
+	}
+
+	if(signalpid >= 0)
+		signal_process(signalpid);
+
+	result = sendto(fd, msg, strlen(msg), 0, (struct sockaddr *)&addr, sizeof(addr));
+	if(result == -1) {
+		PERROR("sendto");
+		return -1;
+	}
+
+	if(!reply)
+		return 0;
+
+	*reply = (char *) malloc(MSG_MAX+1);
+	result = recvfrom(fd, *reply, MSG_MAX, 0, NULL, NULL);
+	if(result == -1) {
+		PERROR("recvfrom");
+		return -1;
+	}
+	
+	(*reply)[result] = '\0';
+
+	return 0;
+}
+
+/* pid: the pid of the trace process that must receive the msg
+   msg: pointer to a null-terminated message to send
+   reply: location where to put the null-terminated string of the reply;
+	  it must be free'd after usage
+ */
+
+int send_message(pid_t pid, const char *msg, char **reply)
+{
+	int result;
+	char path[UNIX_PATH_MAX];
+
+	result = snprintf(path, UNIX_PATH_MAX, "%s/%d", SOCK_DIR, pid);
 	if(result >= UNIX_PATH_MAX) {
 		fprintf(stderr, "string overflow allocating socket name");
-		return 1;
+		return -1;
+	}
+
+	send_message_path(path, msg, reply, pid);
+
+	return 0;
+}
+
+/* Called by an app to ask the consumer daemon to connect to it. */
+
+int ustcomm_request_consumer(pid_t pid, const char *channel)
+{
+	char path[UNIX_PATH_MAX];
+	int result;
+	char *msg;
+
+	result = snprintf(path, UNIX_PATH_MAX, "%s/ustd", SOCK_DIR);
+	if(result >= UNIX_PATH_MAX) {
+		fprintf(stderr, "string overflow allocating socket name");
+		return -1;
+	}
+
+	asprintf(&msg, "collect %d %s", pid, channel); 
+
+	send_message_path(path, msg, NULL, -1);
+	free(msg);
+
+	return 0;
+}
+
+static int recv_message_fd(int fd, char **msg)
+{
+	int result;
+
+	*msg = (char *) malloc(MSG_MAX+1);
+	result = recvfrom(fd, *msg, MSG_MAX, 0, NULL, NULL);
+	if(result == -1) {
+		PERROR("recvfrom");
+		return -1;
+	}
+
+	(*msg)[result] = '\0';
+	
+	DBG("ustcomm_app_recv_message: result is %d, message is %s", result, (*msg));
+
+	return 0;
+}
+
+int ustcomm_ustd_recv_message(struct ustcomm_ustd *ustd, char **msg)
+{
+	return recv_message_fd(ustd->fd, msg);
+}
+
+int ustcomm_app_recv_message(struct ustcomm_app *app, char **msg)
+{
+	return recv_message_fd(app->fd, msg);
+}
+
+static int init_named_socket(char *name, char **path_out)
+{
+	int result;
+	int fd;
+
+	struct sockaddr_un addr;
+	
+	result = fd = socket(PF_UNIX, SOCK_DGRAM, 0);
+	if(result == -1) {
+		PERROR("socket");
+		return -1;
 	}
 
-	asprintf(&buf, "%s\n", msg);
+	addr.sun_family = AF_UNIX;
 
-	signal_process(pid);
+	strncpy(addr.sun_path, name, UNIX_PATH_MAX);
+	addr.sun_path[UNIX_PATH_MAX-1] = '\0';
 
-	result = sendto(fd, buf, strlen(buf), 0, (struct sockaddr *)&addr, sizeof(addr));
+	result = bind(fd, (struct sockaddr *)&addr, sizeof(addr));
 	if(result == -1) {
-		perror("sendto");
-		return 1;
+		PERROR("bind");
+		goto close_sock;
 	}
 
-	free(buf);
+	if(path_out) {
+		*path_out = "";
+		*path_out = strdupa(addr.sun_path);
+	}
+
+	return fd;
+
+	close_sock:
+	close(fd);
+
+	return -1;
+}
+
+int ustcomm_init_app(pid_t pid, struct ustcomm_app *handle)
+{
+	int result;
+	char *name;
+
+	result = asprintf(&name, "%s/%d", SOCK_DIR, (int)pid);
+	if(result >= UNIX_PATH_MAX) {
+		ERR("string overflow allocating socket name");
+		return -1;
+	}
+
+	handle->fd = init_named_socket(name, &(handle->socketpath));
+	if(handle->fd < 0) {
+		goto free_name;
+	}
+	free(name);
 
 	return 0;
+
+free_name:
+	free(name);
+	return -1;
 }
 
+int ustcomm_init_ustd(struct ustcomm_ustd *handle)
+{
+	int result;
+	char *name;
+
+	result = asprintf(&name, "%s/%s", SOCK_DIR, "ustd");
+	if(result >= UNIX_PATH_MAX) {
+		ERR("string overflow allocating socket name");
+		return -1;
+	}
+
+	handle->fd = init_named_socket(name, &handle->socketpath);
+	if(handle->fd < 0)
+		return handle->fd;
+	free(name);
 
+	return 0;
+}