projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bsd compat: add missing #elif -> #elif defined()
[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 7a1f076c6e354fa21f34d505342c29f0c9d99a12..0a534699c5444552669f7c0d9043a528d6579949 100644
(file)
--- a/
tests/test_kernel_data_trace.c
+++ b/
tests/test_kernel_data_trace.c
@@
-25,12
+25,16
@@
#include <unistd.h>
#include <time.h>
#include <unistd.h>
#include <time.h>
-#include "ltt-sessiond/trace.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 */
int opt_quiet = 1;
int opt_verbose = 0;
/* For lttngerr.h */
int opt_quiet = 1;
int opt_verbose = 0;
@@
-41,35
+45,36
@@
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)
{
printf("Create kernel session: ");
}
static void create_one_kernel_session(void)
{
printf("Create kernel session: ");
- kern = trace_
create_kernel_session(
);
+ kern = trace_
kernel_create_session(PATH1
);
assert(kern != NULL);
PRINT_OK();
printf("Validating kernel session: ");
assert(kern->fd == 0);
assert(kern->metadata_stream_fd == 0);
assert(kern != NULL);
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->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);
@@
-77,7
+82,7
@@
static void create_one_kernel_session(void)
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 */
- trace_
destroy_kernel
_session(kern);
+ trace_
kernel_destroy
_session(kern);
}
static void create_kernel_metadata(void)
}
static void create_kernel_metadata(void)
@@
-85,7
+90,7
@@
static void create_kernel_metadata(void)
assert(kern != NULL);
printf("Create kernel metadata: ");
assert(kern != NULL);
printf("Create kernel metadata: ");
- kern->metadata = trace_
create_kernel
_metadata(PATH1);
+ kern->metadata = trace_
kernel_create
_metadata(PATH1);
assert(kern->metadata != NULL);
PRINT_OK();
assert(kern->metadata != NULL);
PRINT_OK();
@@
-96,9
+101,9
@@
static void create_kernel_metadata(void)
assert(kern->metadata->conf->attr.overwrite
== DEFAULT_CHANNEL_OVERWRITE);
assert(kern->metadata->conf->attr.subbuf_size
assert(kern->metadata->conf->attr.overwrite
== DEFAULT_CHANNEL_OVERWRITE);
assert(kern->metadata->conf->attr.subbuf_size
- == DEFAULT_
CHANNEL
_SUBBUF_SIZE);
+ == DEFAULT_
METADATA
_SUBBUF_SIZE);
assert(kern->metadata->conf->attr.num_subbuf
assert(kern->metadata->conf->attr.num_subbuf
- == DEFAULT_
CHANNEL
_SUBBUF_NUM);
+ == DEFAULT_
METADATA
_SUBBUF_NUM);
assert(kern->metadata->conf->attr.switch_timer_interval
== DEFAULT_CHANNEL_SWITCH_TIMER);
assert(kern->metadata->conf->attr.read_timer_interval
assert(kern->metadata->conf->attr.switch_timer_interval
== DEFAULT_CHANNEL_SWITCH_TIMER);
assert(kern->metadata->conf->attr.read_timer_interval
@@
-107,7
+112,7
@@
static void create_kernel_metadata(void)
== DEFAULT_KERNEL_CHANNEL_OUTPUT);
PRINT_OK();
== DEFAULT_KERNEL_CHANNEL_OUTPUT);
PRINT_OK();
- trace_
destroy_kernel
_metadata(kern->metadata);
+ trace_
kernel_destroy
_metadata(kern->metadata);
}
static void create_kernel_channel(void)
}
static void create_kernel_channel(void)
@@
-115,8
+120,10
@@
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: ");
printf("Creating kernel channel: ");
- chan = trace_
create_kernel
_channel(&attr, PATH1);
+ chan = trace_
kernel_create
_channel(&attr, PATH1);
assert(chan != NULL);
PRINT_OK();
assert(chan != NULL);
PRINT_OK();
@@
-131,7
+138,7
@@
static void create_kernel_channel(void)
/* Init list in order to avoid sefaults from cds_list_del */
CDS_INIT_LIST_HEAD(&chan->list);
/* Init list in order to avoid sefaults from cds_list_del */
CDS_INIT_LIST_HEAD(&chan->list);
- trace_
destroy_kernel
_channel(chan);
+ trace_
kernel_destroy
_channel(chan);
}
static void create_kernel_event(void)
}
static void create_kernel_event(void)
@@
-139,11
+146,13
@@
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: ");
printf("Creating kernel event: ");
- event = trace_
create_kernel
_event(&ev);
+ event = trace_
kernel_create
_event(&ev);
assert(event != NULL);
PRINT_OK();
assert(event != NULL);
PRINT_OK();
@@
-157,7
+166,7
@@
static void create_kernel_event(void)
/* Init list in order to avoid sefaults from cds_list_del */
CDS_INIT_LIST_HEAD(&event->list);
/* Init list in order to avoid sefaults from cds_list_del */
CDS_INIT_LIST_HEAD(&event->list);
- trace_
destroy_kernel
_event(event);
+ trace_
kernel_destroy
_event(event);
}
static void create_kernel_stream(void)
}
static void create_kernel_stream(void)
@@
-165,7
+174,7
@@
static void create_kernel_stream(void)
struct ltt_kernel_stream *stream;
printf("Creating kernel stream: ");
struct ltt_kernel_stream *stream;
printf("Creating kernel stream: ");
- stream = trace_
create_kernel
_stream();
+ stream = trace_
kernel_create
_stream();
assert(stream != NULL);
PRINT_OK();
assert(stream != NULL);
PRINT_OK();
@@
-177,7
+186,7
@@
static void create_kernel_stream(void)
/* Init list in order to avoid sefaults from cds_list_del */
CDS_INIT_LIST_HEAD(&stream->list);
/* Init list in order to avoid sefaults from cds_list_del */
CDS_INIT_LIST_HEAD(&stream->list);
- trace_
destroy_kernel
_stream(stream);
+ trace_
kernel_destroy
_stream(stream);
}
int main(int argc, char **argv)
}
int main(int argc, char **argv)
This page took
0.025244 seconds
and
4
git commands to generate.