X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fsessiond-comm%2Fsessiond-comm.h;h=e4d81f28718f7adf4e8cb73d50252e4a7cd29304;hp=48cf933216c431ece31185b7fc55bb4ee5816f8b;hb=a186a15913c34e8adc83ea71565d3b0eec296774;hpb=10a8a2237343699e3923d87e24dbf2d7fe225377 diff --git a/src/common/sessiond-comm/sessiond-comm.h b/src/common/sessiond-comm/sessiond-comm.h index 48cf93321..e4d81f287 100644 --- a/src/common/sessiond-comm/sessiond-comm.h +++ b/src/common/sessiond-comm/sessiond-comm.h @@ -1,48 +1,41 @@ -#ifndef _LTTNG_SESSIOND_COMM_H -#define _LTTNG_SESSIOND_COMM_H - /* * Copyright (C) 2011 - David Goulet * Julien Desfossez * Mathieu Desnoyers * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; only version 2 - * of the License. + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the Free + * Software Foundation; only version 2 of the License. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * You should have received a copy of the GNU General Public License along with + * this program; if not, write to the Free Software Foundation, Inc., 59 Temple + * Place - Suite 330, Boston, MA 02111-1307, USA. */ /* - * This header is meant for liblttng and libust internal use ONLY. - * These declarations should NOT be considered stable API. + * This header is meant for liblttng and libust internal use ONLY. These + * declarations should NOT be considered stable API. */ +#ifndef _LTTNG_SESSIOND_COMM_H +#define _LTTNG_SESSIOND_COMM_H + #define _GNU_SOURCE #include #include -#include - -#define LTTNG_RUNDIR "/var/run/lttng" -#define LTTNG_HOME_RUNDIR "%s/.lttng" - -/* Default unix socket path */ -#define DEFAULT_GLOBAL_CLIENT_UNIX_SOCK LTTNG_RUNDIR "/client-lttng-sessiond" -#define DEFAULT_GLOBAL_APPS_UNIX_SOCK LTTNG_RUNDIR "/apps-lttng-sessiond" -#define DEFAULT_HOME_APPS_UNIX_SOCK LTTNG_HOME_RUNDIR "/apps-lttng-sessiond" -#define DEFAULT_HOME_CLIENT_UNIX_SOCK LTTNG_HOME_RUNDIR "/client-lttng-sessiond" +#include /* Queue size of listen(2) */ #define LTTNG_SESSIOND_COMM_MAX_LISTEN 64 +/* Maximum number of FDs that can be sent over a Unix socket */ +#define LTTCOMM_MAX_SEND_FDS 4 + /* * Get the error code index from 0 since LTTCOMM_OK start at 1000 */ @@ -82,7 +75,7 @@ enum lttcomm_return_code { LTTCOMM_UNKNOWN_DOMAIN, /* Tracing domain not known */ LTTCOMM_ALLOC_FAIL, /* Trace allocation fail */ LTTCOMM_NO_SESSION, /* No session found */ - LTTCOMM_CREATE_FAIL, /* Create trace fail */ + LTTCOMM_CREATE_DIR_FAIL, /* Create directory fail */ LTTCOMM_SESSION_FAIL, /* Create session fail */ LTTCOMM_START_FAIL, /* Start tracing fail */ LTTCOMM_STOP_FAIL, /* Stop tracing fail */ @@ -99,6 +92,7 @@ enum lttcomm_return_code { LTTCOMM_APP_NOT_FOUND, /* App not found in traceable app list */ LTTCOMM_EPERM, /* Permission denied */ LTTCOMM_KERN_NA, /* Kernel tracer unavalable */ + LTTCOMM_KERN_VERSION, /* Kernel tracer version is not compatible */ LTTCOMM_KERN_EVENT_EXIST, /* Kernel event already exists */ LTTCOMM_KERN_SESS_FAIL, /* Kernel create session failed */ LTTCOMM_KERN_CHAN_FAIL, /* Kernel create channel failed */ @@ -117,6 +111,8 @@ enum lttcomm_return_code { LTTCOMM_KERN_DIR_EXIST, /* Kernel trace directory exist */ LTTCOMM_KERN_NO_SESSION, /* No kernel session found */ LTTCOMM_KERN_LIST_FAIL, /* Kernel listing events failed */ + LTTCOMM_UST_CALIBRATE_FAIL, /* UST calibration failed */ + LTTCOMM_UST_VERSION, /* UST tracer version is not compatible */ LTTCOMM_UST_SESS_FAIL, /* UST create session failed */ LTTCOMM_UST_CHAN_EXIST, /* UST channel already exist */ LTTCOMM_UST_CHAN_FAIL, /* UST create channel failed */ @@ -139,6 +135,7 @@ enum lttcomm_return_code { LTTCOMM_UST_EVENT_EXIST, /* UST event exist */ LTTCOMM_UST_EVENT_NOT_FOUND, /* UST event not found */ LTTCOMM_UST_CONTEXT_EXIST, /* UST context exist */ + LTTCOMM_UST_CONTEXT_INVAL, /* UST context invalid */ CONSUMERD_COMMAND_SOCK_READY, /* when consumerd command socket ready */ CONSUMERD_SUCCESS_RECV_FD, /* success on receiving fds */ @@ -284,7 +281,6 @@ extern int lttcomm_accept_unix_sock(int sock); extern int lttcomm_listen_unix_sock(int sock); extern int lttcomm_close_unix_sock(int sock); -#define LTTCOMM_MAX_SEND_FDS 4 /* Send a message accompanied by fd(s) over a unix socket. */ extern ssize_t lttcomm_send_fds_unix_sock(int sock, int *fds, size_t nb_fd); /* Recv a message accompanied by fd(s) from a unix socket */ @@ -295,7 +291,7 @@ extern ssize_t lttcomm_send_unix_sock(int sock, void *buf, size_t len); extern ssize_t lttcomm_send_creds_unix_sock(int sock, void *buf, size_t len); extern ssize_t lttcomm_recv_creds_unix_sock(int sock, void *buf, size_t len, - struct ucred *creds); + lttng_sock_cred *creds); extern const char *lttcomm_get_readable_code(enum lttcomm_return_code code); extern int lttcomm_setsockopt_creds_unix_sock(int sock);