* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* 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.
#include "ltt-sessiond.h"
#include "lttngerr.h"
#include "session.h"
+#include "traceable-app.h"
/* Const values */
const char default_home_dir[] = DEFAULT_HOME_DIR;
static int check_existing_daemon(void);
static int notify_apps(const char* name);
static int connect_app(pid_t pid);
-static int find_app_by_pid(pid_t pid);
static int init_daemon_socket(void);
static int process_client_msg(int sock, struct lttcomm_session_msg*);
static int send_unix_sock(int sock, void *buf, size_t len);
static int setup_data_buffer(char **buf, size_t size, struct lttcomm_lttng_msg *llm);
-static void add_traceable_app(struct ltt_traceable_app *lta);
-static void del_traceable_app(struct ltt_traceable_app *lta);
/* Command function */
-static void get_list_apps(pid_t *pids);
static void *thread_manage_clients(void *data);
static void *thread_manage_apps(void *data);
static struct ltt_session *current_session;
-/* Number of element for the list below. */
-static unsigned int traceable_app_count;
-
-/* Init ust traceabl application's list */
-static struct ltt_traceable_app_list ltt_traceable_app_list = {
- .head = CDS_LIST_HEAD_INIT(ltt_traceable_app_list.head),
-};
-
-/* List mutex */
-pthread_mutex_t ltt_traceable_app_list_mutex;
-
/*
* thread_manage_apps
*
static void *thread_manage_apps(void *data)
{
int sock, ret;
- struct ltt_traceable_app *lta;
/* TODO: Something more elegant is needed but fine for now */
struct {
/* Add application to the global traceable list */
if (reg_msg.reg == 1) {
/* Registering */
- lta = malloc(sizeof(struct ltt_traceable_app));
- lta->pid = reg_msg.pid;
- lta->uid = reg_msg.uid;
- add_traceable_app(lta);
+ ret = register_traceable_app(reg_msg.pid, reg_msg.uid);
+ if (ret < 0) {
+ /* register_traceable_app only return an error with
+ * ENOMEM. At this point, we better stop everything.
+ */
+ goto error;
+ }
} else {
/* Unregistering */
- cds_list_for_each_entry(lta, <t_traceable_app_list.head, list) {
- if (lta->pid == reg_msg.pid && lta->uid == reg_msg.uid) {
- del_traceable_app(lta);
- free(lta);
- break;
- }
- }
+ unregister_traceable_app(reg_msg.pid);
}
}
return NULL;
}
-/*
- * add_traceable_app
- *
- * Add a traceable application structure to the global
- * list protected by a mutex.
- */
-static void add_traceable_app(struct ltt_traceable_app *lta)
-{
- pthread_mutex_lock(<t_traceable_app_list_mutex);
- cds_list_add(<a->list, <t_traceable_app_list.head);
- traceable_app_count++;
- pthread_mutex_unlock(<t_traceable_app_list_mutex);
-}
-
-/*
- * del_traceable_app
- *
- * Delete a traceable application structure from the
- * global list protected by a mutex.
- */
-static void del_traceable_app(struct ltt_traceable_app *lta)
-{
- pthread_mutex_lock(<t_traceable_app_list_mutex);
- cds_list_del(<a->list);
- /* Sanity check */
- if (traceable_app_count != 0) {
- traceable_app_count--;
- }
- pthread_mutex_unlock(<t_traceable_app_list_mutex);
-}
-
/*
* send_unix_sock
*
*/
static int connect_app(pid_t pid)
{
- int sock, ret;
+ int sock;
+ struct ltt_traceable_app *lta;
- ret = find_app_by_pid(pid);
- if (ret == 0) {
+ lta = find_app_by_pid(pid);
+ if (lta == NULL) {
+ /* App not found */
return -1;
}
- sock = ustctl_connect_pid(pid);
+ sock = ustctl_connect_pid(lta->pid);
if (sock < 0) {
ERR("Fail connecting to the PID %d\n", pid);
}
return ret;
}
-/*
- * find_app_by_pid
- *
- * Iterate over the traceable apps list.
- * On success, return 1, else return 0
- */
-static int find_app_by_pid(pid_t pid)
-{
- struct ltt_traceable_app *iter;
-
- pthread_mutex_lock(<t_traceable_app_list_mutex);
- cds_list_for_each_entry(iter, <t_traceable_app_list.head, list) {
- if (iter->pid == pid) {
- pthread_mutex_unlock(<t_traceable_app_list_mutex);
- /* Found */
- return 1;
- }
- }
- pthread_mutex_unlock(<t_traceable_app_list_mutex);
-
- return 0;
-}
-
/*
* ust_create_trace
*
return ret;
}
-/*
- * get_list_apps
- *
- * List traceable user-space application and fill an
- * array of pids.
- */
-static void get_list_apps(pid_t *pids)
-{
- int i = 0;
- struct ltt_traceable_app *iter;
-
- /* Protected by a mutex here because the threads manage_client
- * and manage_apps can access this list.
- */
- pthread_mutex_lock(<t_traceable_app_list_mutex);
- cds_list_for_each_entry(iter, <t_traceable_app_list.head, list) {
- pids[i] = iter->pid;
- i++;
- }
- pthread_mutex_unlock(<t_traceable_app_list_mutex);
-}
-
/*
* copy_common_data
*
}
case UST_LIST_APPS:
{
+ unsigned int app_count = get_app_count();
/* Stop right now if no apps */
- if (traceable_app_count == 0) {
+ if (app_count == 0) {
ret = LTTCOMM_NO_APPS;
goto end;
}
/* Setup data buffer and details for transmission */
buf_size = setup_data_buffer(&send_buf,
- sizeof(pid_t) * traceable_app_count, &llm);
+ sizeof(pid_t) * app_count, &llm);
if (buf_size < 0) {
ret = LTTCOMM_FATAL;
goto end;
}
- get_list_apps((pid_t *)(send_buf + header_size));
+ get_app_list_pids((pid_t *)(send_buf + header_size));
break;
}
}
/*
- * cleanup
+ * cleanup
*
* Cleanup the daemon on exit
*/
projects / lttng-tools.git / blobdiff