projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Major changes of command processing for sessiond
[lttng-tools.git]
/
ltt-sessiond
/
session.c
diff --git
a/ltt-sessiond/session.c
b/ltt-sessiond/session.c
index 9e93d89cef07814fffa795fdfac74ad59f2ed63d..069213655323a978eb0c355f482782be2e0f2fe6 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"
@@
-115,7
+113,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;
}
@@
-144,6
+142,7
@@
int destroy_session(uuid_t *uuid)
cds_list_for_each_entry(iter, <t_session_list.head, list) {
if (uuid_compare(iter->uuid, *uuid) == 0) {
cds_list_for_each_entry(iter, <t_session_list.head, list) {
if (uuid_compare(iter->uuid, *uuid) == 0) {
+ DBG("Destroying session %s", iter->name);
del_session_list(iter);
free(iter);
found = 1;
del_session_list(iter);
free(iter);
found = 1;
@@
-164,6
+163,8
@@
int create_session(char *name, uuid_t *session_id)
{
struct ltt_session *new_session;
{
struct ltt_session *new_session;
+ DBG("Creating session %s", name);
+
new_session = find_session_by_name(name);
if (new_session != NULL) {
goto error;
new_session = find_session_by_name(name);
if (new_session != NULL) {
goto error;
@@
-195,11
+196,15
@@
int create_session(char *name, uuid_t *session_id)
* 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->
lttng
_consumer = 0;
+ new_session->
kernel
_consumer = 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->lttng_traces);
+ CDS_INIT_LIST_HEAD(&new_session->kernel_traces);
+
+ /* 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);
@@
-219,21
+224,23
@@
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;
struct lttng_session lsess;
{
int i = 0;
struct ltt_session *iter;
struct lttng_session lsess;
+ DBG("Getting all available session");
+
/* Iterate over session list and append data after
* the control struct in the buffer.
*/
cds_list_for_each_entry(iter, <t_session_list.head, list) {
/* Copy name and uuid */
/* Iterate over session list and append data after
* the control struct in the buffer.
*/
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.031885 seconds
and
5
git commands to generate.