projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup liblttngctl
[lttng-tools.git]
/
ltt-sessiond
/
session.c
diff --git
a/ltt-sessiond/session.c
b/ltt-sessiond/session.c
index bf5f618a8ef34a7c7209806671ab7ed5feafb425..ae09625a4dba0256236171d729a70706b31d8879 100644
(file)
--- a/
ltt-sessiond/session.c
+++ b/
ltt-sessiond/session.c
@@
-17,12
+17,10
@@
*/
#define _GNU_SOURCE
*/
#define _GNU_SOURCE
-#include <lttng/liblttngctl.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <urcu/list.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <urcu/list.h>
-#include <uuid/uuid.h>
#include "lttngerr.h"
#include "session.h"
#include "lttngerr.h"
#include "session.h"
@@
-34,11
+32,21
@@
static unsigned int session_count;
static void add_session_list(struct ltt_session *ls);
static void del_session_list(struct ltt_session *ls);
static void add_session_list(struct ltt_session *ls);
static void del_session_list(struct ltt_session *ls);
-/* Init
session's
list */
-st
atic st
ruct ltt_session_list ltt_session_list = {
+/* Init
global session
list */
+struct ltt_session_list ltt_session_list = {
.head = CDS_LIST_HEAD_INIT(ltt_session_list.head),
};
.head = CDS_LIST_HEAD_INIT(ltt_session_list.head),
};
+/*
+ * get_session_list
+ *
+ * Return a pointer to the session list.
+ */
+struct ltt_session_list *get_session_list(void)
+{
+ return <t_session_list;
+}
+
/*
* get_session_count
*
/*
* get_session_count
*
@@
-115,7
+123,7
@@
struct ltt_session *find_session_by_name(char *name)
struct ltt_session *iter;
cds_list_for_each_entry(iter, <t_session_list.head, list) {
struct ltt_session *iter;
cds_list_for_each_entry(iter, <t_session_list.head, list) {
- if (strncmp(iter->name, name, strlen(
iter->
name)) == 0) {
+ if (strncmp(iter->name, name, strlen(name)) == 0) {
found = 1;
break;
}
found = 1;
break;
}
@@
-194,19
+202,21
@@
int create_session(char *name, uuid_t *session_id)
uuid_generate(new_session->uuid);
uuid_copy(*session_id, new_session->uuid);
uuid_generate(new_session->uuid);
uuid_copy(*session_id, new_session->uuid);
- /* Set consumer (identifier) to 0. This means that there is
+ /*
+ * Set consumer (identifier) to 0. This means that there is
* NO consumer attach to that session yet.
*/
new_session->ust_consumer = 0;
* NO consumer attach to that session yet.
*/
new_session->ust_consumer = 0;
- new_session->kernel_consumer = 0;
+
+ /* Init kernel session */
+ new_session->kernel_session = NULL;
+ new_session->kern_session_count = 0;
/* Init list */
CDS_INIT_LIST_HEAD(&new_session->ust_traces);
/* Init list */
CDS_INIT_LIST_HEAD(&new_session->ust_traces);
- CDS_INIT_LIST_HEAD(&new_session->kernel_traces);
/* Set trace list counter */
new_session->ust_trace_count = 0;
/* Set trace list counter */
new_session->ust_trace_count = 0;
- new_session->kern_trace_count = 0;
/* Add new session to the global session list */
add_session_list(new_session);
/* Add new session to the global session list */
add_session_list(new_session);
@@
-226,7
+236,7
@@
error_mem:
* Iterate over the global session list and
* fill the lttng_session array.
*/
* Iterate over the global session list and
* fill the lttng_session array.
*/
-void get_lttng_session(struct lttng_session *
lt
)
+void get_lttng_session(struct lttng_session *
sessions
)
{
int i = 0;
struct ltt_session *iter;
{
int i = 0;
struct ltt_session *iter;
@@
-239,10
+249,10
@@
void get_lttng_session(struct lttng_session *lt)
*/
cds_list_for_each_entry(iter, <t_session_list.head, list) {
/* Copy name and uuid */
*/
cds_list_for_each_entry(iter, <t_session_list.head, list) {
/* Copy name and uuid */
- uuid_
unparse(iter->uuid, lsess.
uuid);
+ uuid_
copy(lsess.uuid, iter->
uuid);
strncpy(lsess.name, iter->name, sizeof(lsess.name));
lsess.name[sizeof(lsess.name) - 1] = '\0';
strncpy(lsess.name, iter->name, sizeof(lsess.name));
lsess.name[sizeof(lsess.name) - 1] = '\0';
- memcpy(&
lt
[i], &lsess, sizeof(lsess));
+ memcpy(&
sessions
[i], &lsess, sizeof(lsess));
i++;
/* Reset struct for next pass */
memset(&lsess, 0, sizeof(lsess));
i++;
/* Reset struct for next pass */
memset(&lsess, 0, sizeof(lsess));
This page took
0.034083 seconds
and
5
git commands to generate.