projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix error.h non-static variables for liblttng-ctl
[lttng-tools.git]
/
tests
/
test_kernel_data_trace.c
diff --git
a/tests/test_kernel_data_trace.c
b/tests/test_kernel_data_trace.c
index e46d9018696417000f325ddf8a0d8111ce48a79b..6d7f291beefbf56217ce36bbed30fdc6ec195f54 100644
(file)
--- a/
tests/test_kernel_data_trace.c
+++ b/
tests/test_kernel_data_trace.c
@@
-25,15
+25,19
@@
#include <unistd.h>
#include <time.h>
#include <unistd.h>
#include <time.h>
-#include "ltt-sessiond/trace-kernel.h"
+#include <bin/lttng-sessiond/trace-kernel.h>
+#include <common/defaults.h>
+
#include "utils.h"
/* This path will NEVER be created in this test */
#define PATH1 "/tmp/.test-junk-lttng"
#include "utils.h"
/* This path will NEVER be created in this test */
#define PATH1 "/tmp/.test-junk-lttng"
+#define RANDOM_STRING_LEN 11
+
/* For lttngerr.h */
/* For lttngerr.h */
-int opt_quiet = 1;
-int
opt_verbose = 0
;
+int
lttng_
opt_quiet = 1;
+int
lttng_opt_verbose
;
static const char alphanum[] =
"0123456789"
static const char alphanum[] =
"0123456789"
@@
-41,22
+45,23
@@
static const char alphanum[] =
"abcdefghijklmnopqrstuvwxyz";
static struct ltt_kernel_session *kern;
"abcdefghijklmnopqrstuvwxyz";
static struct ltt_kernel_session *kern;
+static char random_string[RANDOM_STRING_LEN];
/*
* Return random string of 10 characters.
/*
* Return random string of 10 characters.
+ * Not thread-safe.
*/
static char *get_random_string(void)
{
int i;
*/
static char *get_random_string(void)
{
int i;
- char *str = malloc(11);
- for (i = 0; i <
10
; i++) {
-
str
[i] = alphanum[rand() % (sizeof(alphanum) - 1)];
+ for (i = 0; i <
RANDOM_STRING_LEN - 1
; i++) {
+
random_string
[i] = alphanum[rand() % (sizeof(alphanum) - 1)];
}
}
-
str[10
] = '\0';
+
random_string[RANDOM_STRING_LEN - 1
] = '\0';
- return
str
;
+ return
random_string
;
}
static void create_one_kernel_session(void)
}
static void create_one_kernel_session(void)
@@
-67,13
+72,13
@@
static void create_one_kernel_session(void)
PRINT_OK();
printf("Validating kernel session: ");
PRINT_OK();
printf("Validating kernel session: ");
- assert(kern->fd ==
0
);
- assert(kern->metadata_stream_fd ==
0
);
- assert(kern->
k
consumer_fds_sent == 0);
+ assert(kern->fd ==
-1
);
+ assert(kern->metadata_stream_fd ==
-1
);
+ assert(kern->consumer_fds_sent == 0);
assert(kern->channel_count == 0);
assert(kern->stream_count_global == 0);
assert(kern->metadata == NULL);
assert(kern->channel_count == 0);
assert(kern->stream_count_global == 0);
assert(kern->metadata == NULL);
- assert(kern->consumer_fd ==
0
);
+ assert(kern->consumer_fd ==
-1
);
PRINT_OK();
/* Init list in order to avoid sefaults from cds_list_del */
PRINT_OK();
/* Init list in order to avoid sefaults from cds_list_del */
@@
-90,7
+95,7
@@
static void create_kernel_metadata(void)
PRINT_OK();
printf("Validating kernel session metadata: ");
PRINT_OK();
printf("Validating kernel session metadata: ");
- assert(kern->metadata->fd ==
0
);
+ assert(kern->metadata->fd ==
-1
);
assert(strlen(kern->metadata->pathname));
assert(kern->metadata->conf != NULL);
assert(kern->metadata->conf->attr.overwrite
assert(strlen(kern->metadata->pathname));
assert(kern->metadata->conf != NULL);
assert(kern->metadata->conf->attr.overwrite
@@
-115,13
+120,15
@@
static void create_kernel_channel(void)
struct ltt_kernel_channel *chan;
struct lttng_channel attr;
struct ltt_kernel_channel *chan;
struct lttng_channel attr;
+ memset(&attr, 0, sizeof(attr));
+
printf("Creating kernel channel: ");
chan = trace_kernel_create_channel(&attr, PATH1);
assert(chan != NULL);
PRINT_OK();
printf("Validating kernel channel: ");
printf("Creating kernel channel: ");
chan = trace_kernel_create_channel(&attr, PATH1);
assert(chan != NULL);
PRINT_OK();
printf("Validating kernel channel: ");
- assert(chan->fd ==
0
);
+ assert(chan->fd ==
-1
);
assert(chan->enabled == 1);
assert(strcmp(PATH1, chan->pathname) == 0);
assert(chan->stream_count == 0);
assert(chan->enabled == 1);
assert(strcmp(PATH1, chan->pathname) == 0);
assert(chan->stream_count == 0);
@@
-139,8
+146,10
@@
static void create_kernel_event(void)
struct ltt_kernel_event *event;
struct lttng_event ev;
struct ltt_kernel_event *event;
struct lttng_event ev;
- strncpy(ev.name, get_random_string(), LTTNG_SYM_NAME_LEN);
+ memset(&ev, 0, sizeof(ev));
+ strncpy(ev.name, get_random_string(), LTTNG_KERNEL_SYM_NAME_LEN);
ev.type = LTTNG_EVENT_TRACEPOINT;
ev.type = LTTNG_EVENT_TRACEPOINT;
+ ev.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL;
printf("Creating kernel event: ");
event = trace_kernel_create_event(&ev);
printf("Creating kernel event: ");
event = trace_kernel_create_event(&ev);
@@
-148,7
+157,7
@@
static void create_kernel_event(void)
PRINT_OK();
printf("Validating kernel event: ");
PRINT_OK();
printf("Validating kernel event: ");
- assert(event->fd ==
0
);
+ assert(event->fd ==
-1
);
assert(event->enabled == 1);
assert(event->ctx == NULL);
assert(event->event->instrumentation == LTTNG_KERNEL_TRACEPOINT);
assert(event->enabled == 1);
assert(event->ctx == NULL);
assert(event->event->instrumentation == LTTNG_KERNEL_TRACEPOINT);
@@
-170,7
+179,7
@@
static void create_kernel_stream(void)
PRINT_OK();
printf("Validating kernel stream: ");
PRINT_OK();
printf("Validating kernel stream: ");
- assert(stream->fd ==
0
);
+ assert(stream->fd ==
-1
);
assert(stream->pathname == NULL);
assert(stream->state == 0);
PRINT_OK();
assert(stream->pathname == NULL);
assert(stream->state == 0);
PRINT_OK();
This page took
0.027018 seconds
and
4
git commands to generate.