projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
clock: add clock description to metadata
[lttng-ust.git]
/
tests
/
libustctl_function_tests
/
libustctl_function_tests.c
diff --git
a/tests/libustctl_function_tests/libustctl_function_tests.c
b/tests/libustctl_function_tests/libustctl_function_tests.c
index 146199713bd24169f302ad770aa350b4782f2f08..56456f03ce0035d0cde723f4f5d382fc40824c91 100644
(file)
--- a/
tests/libustctl_function_tests/libustctl_function_tests.c
+++ b/
tests/libustctl_function_tests/libustctl_function_tests.c
@@
-22,6
+22,7
@@
#include <sys/types.h>
#include <sys/wait.h>
#include <errno.h>
#include <sys/types.h>
#include <sys/wait.h>
#include <errno.h>
+#include <string.h>
#include <ust/marker.h>
#include <ust/ustctl.h>
#include <ust/marker.h>
#include <ust/ustctl.h>
@@
-30,24
+31,27
@@
static void ustctl_function_tests(pid_t pid)
{
static void ustctl_function_tests(pid_t pid)
{
- int result;
+ int result
, sock
;
unsigned int subbuf_size, subbuf_num;
unsigned int new_subbuf_size, new_subbuf_num;
unsigned int subbuf_size, subbuf_num;
unsigned int new_subbuf_size, new_subbuf_num;
- struct marker_status *marker_status, *ms_ptr;
+ struct
ust_
marker_status *marker_status, *ms_ptr;
char *old_socket_path, *new_socket_path;
char *tmp_ustd_socket = "/tmp/tmp_ustd_socket";
char *trace = "auto";
printf("Connecting to pid %d\n", pid);
char *old_socket_path, *new_socket_path;
char *tmp_ustd_socket = "/tmp/tmp_ustd_socket";
char *trace = "auto";
printf("Connecting to pid %d\n", pid);
+ sock = ustctl_connect_pid(pid);
+ tap_ok(sock > 0, "ustctl_connect_pid");
+
/* marker status array functions */
/* marker status array functions */
- result = ustctl_get_cmsf(
&marker_status, pid
);
+ result = ustctl_get_cmsf(
sock, &marker_status
);
tap_ok(!result, "ustctl_get_cmsf");
result = 0;
for (ms_ptr = marker_status; ms_ptr->channel; ms_ptr++) {
if (!strcmp(ms_ptr->channel, "ust") &&
tap_ok(!result, "ustctl_get_cmsf");
result = 0;
for (ms_ptr = marker_status; ms_ptr->channel; ms_ptr++) {
if (!strcmp(ms_ptr->channel, "ust") &&
- !strcmp(ms_ptr->marker, "bar")) {
+ !strcmp(ms_ptr->
ust_
marker, "bar")) {
result = 1;
}
}
result = 1;
}
}
@@
-56,15
+60,15
@@
static void ustctl_function_tests(pid_t pid)
tap_ok(!ustctl_free_cmsf(marker_status), "ustctl_free_cmsf");
/* Get and set the socket path */
tap_ok(!ustctl_free_cmsf(marker_status), "ustctl_free_cmsf");
/* Get and set the socket path */
- tap_ok(!ustctl_get_sock_path(
&old_socket_path, pid
),
+ tap_ok(!ustctl_get_sock_path(
sock, &old_socket_path
),
"ustctl_get_sock_path");
printf("Socket path: %s\n", old_socket_path);
"ustctl_get_sock_path");
printf("Socket path: %s\n", old_socket_path);
- tap_ok(!ustctl_set_sock_path(
tmp_ustd_socket, pid
),
+ tap_ok(!ustctl_set_sock_path(
sock, tmp_ustd_socket
),
"ustctl_set_sock_path - set a new path");
"ustctl_set_sock_path - set a new path");
- tap_ok(!ustctl_get_sock_path(
&new_socket_path, pid
),
+ tap_ok(!ustctl_get_sock_path(
sock, &new_socket_path
),
"ustctl_get_sock_path - get the new path");
tap_ok(!strcmp(new_socket_path, tmp_ustd_socket),
"ustctl_get_sock_path - get the new path");
tap_ok(!strcmp(new_socket_path, tmp_ustd_socket),
@@
-72,90
+76,91
@@
static void ustctl_function_tests(pid_t pid)
free(new_socket_path);
free(new_socket_path);
- tap_ok(!ustctl_set_sock_path(
old_socket_path, pid
),
+ tap_ok(!ustctl_set_sock_path(
sock, old_socket_path
),
"Reset the socket path");
free(old_socket_path);
/* Enable, disable markers */
"Reset the socket path");
free(old_socket_path);
/* Enable, disable markers */
- tap_ok(!ustctl_set_
marker_state(trace, "ust", "bar", 1, pid
),
- "ustctl_set_marker_state - existing marker ust bar");
+ tap_ok(!ustctl_set_
ust_marker_state(sock, trace, "ust", "bar", 1
),
+ "ustctl_set_
ust_
marker_state - existing marker ust bar");
/* Create and allocate a trace */
/* Create and allocate a trace */
- tap_ok(!ustctl_create_trace(
trace, pid
), "ustctl_create_trace");
+ tap_ok(!ustctl_create_trace(
sock, trace
), "ustctl_create_trace");
- tap_ok(!ustctl_alloc_trace(
trace, pid
), "ustctl_alloc_trace");
+ tap_ok(!ustctl_alloc_trace(
sock, trace
), "ustctl_alloc_trace");
/* Get subbuf size and number */
/* Get subbuf size and number */
- subbuf_num = ustctl_get_subbuf_num(
trace, "ust", pid
);
+ subbuf_num = ustctl_get_subbuf_num(
sock, trace, "ust"
);
tap_ok(subbuf_num > 0, "ustctl_get_subbuf_num - %d sub-buffers",
subbuf_num);
tap_ok(subbuf_num > 0, "ustctl_get_subbuf_num - %d sub-buffers",
subbuf_num);
- subbuf_size = ustctl_get_subbuf_size(
trace, "ust", pid
);
+ subbuf_size = ustctl_get_subbuf_size(
sock, trace, "ust"
);
tap_ok(subbuf_size, "ustctl_get_subbuf_size - sub-buffer size is %d",
subbuf_size);
/* Start the trace */
tap_ok(subbuf_size, "ustctl_get_subbuf_size - sub-buffer size is %d",
subbuf_size);
/* Start the trace */
- tap_ok(!ustctl_start_trace(
trace, pid
), "ustctl_start_trace");
+ tap_ok(!ustctl_start_trace(
sock, trace
), "ustctl_start_trace");
/* Stop the trace and destroy it*/
/* Stop the trace and destroy it*/
- tap_ok(!ustctl_stop_trace(
trace, pid
), "ustctl_stop_trace");
+ tap_ok(!ustctl_stop_trace(
sock, trace
), "ustctl_stop_trace");
- tap_ok(!ustctl_destroy_trace(
trace, pid
), "ustctl_destroy_trace");
+ tap_ok(!ustctl_destroy_trace(
sock, trace
), "ustctl_destroy_trace");
/* Create a new trace */
/* Create a new trace */
- tap_ok(!ustctl_create_trace(
trace, pid
), "ustctl_create_trace - create a new trace");
+ tap_ok(!ustctl_create_trace(
sock, trace
), "ustctl_create_trace - create a new trace");
printf("Setting new subbufer number and sizes (doubling)\n");
new_subbuf_num = 2 * subbuf_num;
new_subbuf_size = 2 * subbuf_size;
printf("Setting new subbufer number and sizes (doubling)\n");
new_subbuf_num = 2 * subbuf_num;
new_subbuf_size = 2 * subbuf_size;
- tap_ok(!ustctl_set_subbuf_num(
trace, "ust", new_subbuf_num, pid
),
+ tap_ok(!ustctl_set_subbuf_num(
sock, trace, "ust", new_subbuf_num
),
"ustctl_set_subbuf_num");
"ustctl_set_subbuf_num");
- tap_ok(!ustctl_set_subbuf_size(
trace, "ust", new_subbuf_size, pid
),
+ tap_ok(!ustctl_set_subbuf_size(
sock, trace, "ust", new_subbuf_size
),
"ustctl_set_subbuf_size");
/* Allocate the new trace */
"ustctl_set_subbuf_size");
/* Allocate the new trace */
- tap_ok(!ustctl_alloc_trace(
trace, pid
), "ustctl_alloc_trace - allocate the new trace");
+ tap_ok(!ustctl_alloc_trace(
sock, trace
), "ustctl_alloc_trace - allocate the new trace");
/* Get subbuf size and number and compare with what was set */
/* Get subbuf size and number and compare with what was set */
- subbuf_num = ustctl_get_subbuf_num(
trace, "ust", pid
);
+ subbuf_num = ustctl_get_subbuf_num(
sock, trace, "ust"
);
- subbuf_size = ustctl_get_subbuf_size(
trace, "ust", pid
);
+ subbuf_size = ustctl_get_subbuf_size(
sock, trace, "ust"
);
tap_ok(subbuf_num == new_subbuf_num, "Set a new subbuf number, %d == %d",
subbuf_num, new_subbuf_num);
tap_ok(subbuf_num == new_subbuf_num, "Set a new subbuf number, %d == %d",
subbuf_num, new_subbuf_num);
- result = ustctl_get_subbuf_size(
trace, "ust", pid
);
+ result = ustctl_get_subbuf_size(
sock, trace, "ust"
);
tap_ok(subbuf_size == new_subbuf_size, "Set a new subbuf size, %d == %d",
subbuf_size, new_subbuf_size);
tap_ok(subbuf_size == new_subbuf_size, "Set a new subbuf size, %d == %d",
subbuf_size, new_subbuf_size);
- tap_ok(!ustctl_destroy_trace(
trace, pid
), "ustctl_destroy_trace - without ever starting");
+ tap_ok(!ustctl_destroy_trace(
sock, trace
), "ustctl_destroy_trace - without ever starting");
/*
* Activate a non-existent marker, this should be possible as the marker
* can be loaded at a later time.
*/
/*
* Activate a non-existent marker, this should be possible as the marker
* can be loaded at a later time.
*/
- tap_ok(ustctl_set_
marker_state(trace, "ustl", "blar", 1, pid
) == 0,
+ tap_ok(ustctl_set_
ust_marker_state(sock, trace, "ustl", "blar", 1
) == 0,
"Enable non-existent marker ustl blar");
printf("##### Tests that definetly should work are completed #####\n");
printf("############## Start expected failure cases ##############\n");
"Enable non-existent marker ustl blar");
printf("##### Tests that definetly should work are completed #####\n");
printf("############## Start expected failure cases ##############\n");
- tap_ok(ustctl_set_
marker_state(trace, "ust","bar", 1, pid
),
+ tap_ok(ustctl_set_
ust_marker_state(sock, trace, "ust","bar", 1
),
"Enable already enabled marker ust/bar");
"Enable already enabled marker ust/bar");
+
tap_ok(EEXIST == errno,
"Right error code for enabling an already enabled marker");
tap_ok(EEXIST == errno,
"Right error code for enabling an already enabled marker");
- tap_ok(ustctl_start_trace(
trace, pid
),
+ tap_ok(ustctl_start_trace(
sock, trace
),
"Start a non-existent trace");
"Start a non-existent trace");
- tap_ok(ustctl_destroy_trace(
trace, pid
),
+ tap_ok(ustctl_destroy_trace(
sock, trace
),
"Destroy non-existent trace");
exit(tap_status() ? EXIT_FAILURE : EXIT_SUCCESS);
"Destroy non-existent trace");
exit(tap_status() ? EXIT_FAILURE : EXIT_SUCCESS);
@@
-167,7
+172,7
@@
int main(int argc, char **argv)
int i, status;
pid_t parent_pid, child_pid;
int i, status;
pid_t parent_pid, child_pid;
- tap_plan(2
8
);
+ tap_plan(2
9
);
printf("Function tests for ustctl\n");
printf("Function tests for ustctl\n");
@@
-175,8
+180,8
@@
int main(int argc, char **argv)
child_pid = fork();
if (child_pid) {
for(i=0; i<10; i++) {
child_pid = fork();
if (child_pid) {
for(i=0; i<10; i++) {
-
trace_mark(ust,
bar, "str %s", "FOOBAZ");
-
trace_mark(ust,
bar2, "number1 %d number2 %d", 53, 9800);
+
ust_marker(
bar, "str %s", "FOOBAZ");
+
ust_marker(
bar2, "number1 %d number2 %d", 53, 9800);
usleep(100000);
}
usleep(100000);
}
This page took
0.026632 seconds
and
4
git commands to generate.