projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename syscalls -> syscall in UI/API/ABI
[lttng-tools.git]
/
tests
/
test_sessions.c
diff --git
a/tests/test_sessions.c
b/tests/test_sessions.c
index f3ffe6a43932d8b03ca8c833bcce7753b077da27..8ea365fed684f5d2ee09d08d79ab3400390ee8a2 100644
(file)
--- a/
tests/test_sessions.c
+++ b/
tests/test_sessions.c
@@
-25,7
+25,9
@@
#include <unistd.h>
#include <time.h>
#include <unistd.h>
#include <time.h>
+#include <lttng-sessiond-comm.h>
#include "ltt-sessiond/session.h"
#include "ltt-sessiond/session.h"
+#include "utils.h"
#define SESSION1 "test1"
#define SESSION1 "test1"
@@
-115,8
+117,8
@@
static int create_one_session(char *name, char *path)
{
int ret;
{
int ret;
- ret =
create_session
(name, path);
- if (ret
>= 0
) {
+ ret =
session_create
(name, path);
+ if (ret
== LTTCOMM_OK
) {
/* Validate */
ret = find_session_name(name);
if (ret < 0) {
/* Validate */
ret = find_session_name(name);
if (ret < 0) {
@@
-127,8
+129,8
@@
static int create_one_session(char *name, char *path)
/* Success */
return 0;
}
/* Success */
return 0;
}
- } else
if (ret < 0)
{
- if (ret ==
-EEXIST
) {
+ } else {
+ if (ret ==
LTTCOMM_EXIST_SESS
) {
printf("(session already exists) ");
}
return -1;
printf("(session already exists) ");
}
return -1;
@@
-144,8
+146,9
@@
static int destroy_one_session(char *name)
{
int ret;
{
int ret;
- ret = destroy_session(name);
- if (ret == 1) {
+ ret = session_destroy(name);
+
+ if (ret == LTTCOMM_OK) {
/* Validate */
ret = find_session_name(name);
if (ret < 0) {
/* Validate */
ret = find_session_name(name);
if (ret < 0) {
@@
-155,11
+158,6
@@
static int destroy_one_session(char *name)
/* Fail */
return -1;
}
/* Fail */
return -1;
}
- } else if (ret < 0) {
- if (ret == -EEXIST) {
- printf("(session already exists) ");
- }
- return -1;
}
return 0;
}
return 0;
@@
-170,19
+168,19
@@
static int fuzzing_create_args(void)
int ret;
ret = create_one_session(NULL, NULL);
int ret;
ret = create_one_session(NULL, NULL);
- if (ret >
=
0) {
+ if (ret > 0) {
printf("Session created with (null),(null)\n");
return -1;
}
ret = create_one_session(NULL, PATH1);
printf("Session created with (null),(null)\n");
return -1;
}
ret = create_one_session(NULL, PATH1);
- if (ret >
=
0) {
+ if (ret > 0) {
printf("Session created with (null), %s)\n", PATH1);
return -1;
}
ret = create_one_session(SESSION1, NULL);
printf("Session created with (null), %s)\n", PATH1);
return -1;
}
ret = create_one_session(SESSION1, NULL);
- if (ret >
=
0) {
+ if (ret > 0) {
printf("Session created with %s, (null)\n", SESSION1);
return -1;
}
printf("Session created with %s, (null)\n", SESSION1);
return -1;
}
@@
-198,13
+196,13
@@
static int fuzzing_destroy_args(void)
int ret;
ret = destroy_one_session(NULL);
int ret;
ret = destroy_one_session(NULL);
- if (ret >
=
0) {
+ if (ret > 0) {
printf("Session destroyed with (null)\n");
return -1;
}
ret = destroy_one_session(OVERFLOW_SESSION_NAME);
printf("Session destroyed with (null)\n");
return -1;
}
ret = destroy_one_session(OVERFLOW_SESSION_NAME);
- if (ret >
=
0) {
+ if (ret > 0) {
printf("Session destroyed with %s\n", OVERFLOW_SESSION_NAME);
return -1;
}
printf("Session destroyed with %s\n", OVERFLOW_SESSION_NAME);
return -1;
}
@@
-249,7
+247,7
@@
int main(int argc, char **argv)
printf("\nTesting Sessions:\n-----------\n");
printf("\nTesting Sessions:\n-----------\n");
- session_list =
get_session
_list();
+ session_list =
session_get
_list();
if (session_list == NULL) {
return -1;
}
if (session_list == NULL) {
return -1;
}
@@
-259,36
+257,36
@@
int main(int argc, char **argv)
if (ret < 0) {
return -1;
}
if (ret < 0) {
return -1;
}
-
printf("Success\n"
);
+
PRINT_OK(
);
printf("Validating created session %s: ", SESSION1);
printf("Validating created session %s: ", SESSION1);
- tmp =
find_session
_by_name(SESSION1);
+ tmp =
session_find
_by_name(SESSION1);
if (tmp == NULL) {
return -1;
}
/* Basic init session values */
assert(tmp->kernel_session == NULL);
if (tmp == NULL) {
return -1;
}
/* Basic init session values */
assert(tmp->kernel_session == NULL);
- assert(tmp->ust_
trace_
count == 0);
+ assert(tmp->ust_
session_list.
count == 0);
assert(strlen(tmp->path));
assert(strlen(tmp->name));
assert(strlen(tmp->path));
assert(strlen(tmp->name));
-
lock_session
(tmp);
-
unlock_session
(tmp);
+
session_lock
(tmp);
+
session_unlock
(tmp);
-
printf("Success\n"
);
+
PRINT_OK(
);
printf("Destroy 1 session %s: ", SESSION1);
ret = destroy_one_session(SESSION1);
if (ret < 0) {
return -1;
}
printf("Destroy 1 session %s: ", SESSION1);
ret = destroy_one_session(SESSION1);
if (ret < 0) {
return -1;
}
-
printf("Success\n"
);
+
PRINT_OK(
);
printf("Two session with same name: ");
ret = two_session_same_name();
if (ret < 0) {
return -1;
}
printf("Two session with same name: ");
ret = two_session_same_name();
if (ret < 0) {
return -1;
}
-
printf("Success\n"
);
+
PRINT_OK(
);
empty_session_list();
empty_session_list();
@@
-297,14
+295,14
@@
int main(int argc, char **argv)
if (ret < 0) {
return -1;
}
if (ret < 0) {
return -1;
}
-
printf("Success\n"
);
+
PRINT_OK(
);
printf("Fuzzing destroy_session argument: ");
ret = fuzzing_destroy_args();
if (ret < 0) {
return -1;
}
printf("Fuzzing destroy_session argument: ");
ret = fuzzing_destroy_args();
if (ret < 0) {
return -1;
}
-
printf("Success\n"
);
+
PRINT_OK(
);
printf("Creating %d sessions: ", MAX_SESSIONS);
for (i = 0; i < MAX_SESSIONS; i++) {
printf("Creating %d sessions: ", MAX_SESSIONS);
for (i = 0; i < MAX_SESSIONS; i++) {
@@
-316,7
+314,7
@@
int main(int argc, char **argv)
}
free(tmp_name);
}
}
free(tmp_name);
}
-
printf("Success\n"
);
+
PRINT_OK(
);
printf("Destroying %d sessions: ", MAX_SESSIONS);
for (i = 0; i < MAX_SESSIONS; i++) {
printf("Destroying %d sessions: ", MAX_SESSIONS);
for (i = 0; i < MAX_SESSIONS; i++) {
@@
-328,7
+326,7
@@
int main(int argc, char **argv)
}
}
}
}
}
}
-
printf("Success\n"
);
+
PRINT_OK(
);
/* Session list must be 0 */
assert(!session_list->count);
/* Session list must be 0 */
assert(!session_list->count);
This page took
0.02766 seconds
and
4
git commands to generate.