projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add libdir and bindir outputs to configure
[lttng-tools.git]
/
tests
/
test_sessions.c
diff --git
a/tests/test_sessions.c
b/tests/test_sessions.c
index 422c4160387575fff6e6929cf15685ceb9f8f393..5b17e63911eeb8c45fdd05723978d79eae209313 100644
(file)
--- a/
tests/test_sessions.c
+++ b/
tests/test_sessions.c
@@
-24,8
+24,11
@@
#include <string.h>
#include <unistd.h>
#include <time.h>
#include <string.h>
#include <unistd.h>
#include <time.h>
+#include <sys/types.h>
-#include "ltt-sessiond/session.h"
+#include <lttng-sessiond-comm.h>
+
+#include <lttng-sessiond/session.h>
#include "utils.h"
#define SESSION1 "test1"
#include "utils.h"
#define SESSION1 "test1"
@@
-116,8
+119,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, geteuid(), getegid()
);
+ if (ret
== LTTCOMM_OK
) {
/* Validate */
ret = find_session_name(name);
if (ret < 0) {
/* Validate */
ret = find_session_name(name);
if (ret < 0) {
@@
-128,8
+131,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;
@@
-141,14
+144,18
@@
static int create_one_session(char *name, char *path)
/*
* Test deletion of 1 session
*/
/*
* Test deletion of 1 session
*/
-static int destroy_one_session(
char *name
)
+static int destroy_one_session(
struct ltt_session *session
)
{
int ret;
{
int ret;
- ret = destroy_session(name);
- if (ret == 1) {
+ ret = session_destroy(session);
+
+ if (ret == LTTCOMM_OK) {
/* Validate */
/* Validate */
- ret = find_session_name(name);
+ if (session == NULL) {
+ return 0;
+ }
+ ret = find_session_name(session->name);
if (ret < 0) {
/* Success, -1 means that the sesion is NOT found */
return 0;
if (ret < 0) {
/* Success, -1 means that the sesion is NOT found */
return 0;
@@
-156,11
+163,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;
@@
-171,19
+173,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;
}
@@
-199,17
+201,11
@@
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;
}
printf("Session destroyed with (null)\n");
return -1;
}
- ret = destroy_one_session(OVERFLOW_SESSION_NAME);
- if (ret >= 0) {
- printf("Session destroyed with %s\n", OVERFLOW_SESSION_NAME);
- return -1;
- }
-
/* Session list must be 0 */
assert(!session_list->count);
/* Session list must be 0 */
assert(!session_list->count);
@@
-250,12
+246,13
@@
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;
}
printf("Create 1 session %s: ", SESSION1);
if (session_list == NULL) {
return -1;
}
printf("Create 1 session %s: ", SESSION1);
+ fflush(stdout);
ret = create_one_session(SESSION1, PATH1);
if (ret < 0) {
return -1;
ret = create_one_session(SESSION1, PATH1);
if (ret < 0) {
return -1;
@@
-263,28
+260,30
@@
int main(int argc, char **argv)
PRINT_OK();
printf("Validating created session %s: ", SESSION1);
PRINT_OK();
printf("Validating created session %s: ", SESSION1);
- tmp = find_session_by_name(SESSION1);
+ fflush(stdout);
+ 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(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);
PRINT_OK();
printf("Destroy 1 session %s: ", SESSION1);
PRINT_OK();
printf("Destroy 1 session %s: ", SESSION1);
- ret = destroy_one_session(SESSION1);
+ fflush(stdout);
+ ret = destroy_one_session(tmp);
if (ret < 0) {
return -1;
}
PRINT_OK();
printf("Two session with same name: ");
if (ret < 0) {
return -1;
}
PRINT_OK();
printf("Two session with same name: ");
+ fflush(stdout);
ret = two_session_same_name();
if (ret < 0) {
return -1;
ret = two_session_same_name();
if (ret < 0) {
return -1;
@@
-294,6
+293,7
@@
int main(int argc, char **argv)
empty_session_list();
printf("Fuzzing create_session arguments: ");
empty_session_list();
printf("Fuzzing create_session arguments: ");
+ fflush(stdout);
ret = fuzzing_create_args();
if (ret < 0) {
return -1;
ret = fuzzing_create_args();
if (ret < 0) {
return -1;
@@
-301,6
+301,7
@@
int main(int argc, char **argv)
PRINT_OK();
printf("Fuzzing destroy_session argument: ");
PRINT_OK();
printf("Fuzzing destroy_session argument: ");
+ fflush(stdout);
ret = fuzzing_destroy_args();
if (ret < 0) {
return -1;
ret = fuzzing_destroy_args();
if (ret < 0) {
return -1;
@@
-308,6
+309,7
@@
int main(int argc, char **argv)
PRINT_OK();
printf("Creating %d sessions: ", MAX_SESSIONS);
PRINT_OK();
printf("Creating %d sessions: ", MAX_SESSIONS);
+ fflush(stdout);
for (i = 0; i < MAX_SESSIONS; i++) {
tmp_name = get_random_string();
ret = create_one_session(tmp_name, PATH1);
for (i = 0; i < MAX_SESSIONS; i++) {
tmp_name = get_random_string();
ret = create_one_session(tmp_name, PATH1);
@@
-320,9
+322,10
@@
int main(int argc, char **argv)
PRINT_OK();
printf("Destroying %d sessions: ", MAX_SESSIONS);
PRINT_OK();
printf("Destroying %d sessions: ", MAX_SESSIONS);
+ fflush(stdout);
for (i = 0; i < MAX_SESSIONS; i++) {
cds_list_for_each_entry_safe(iter, tmp, &session_list->head, list) {
for (i = 0; i < MAX_SESSIONS; i++) {
cds_list_for_each_entry_safe(iter, tmp, &session_list->head, list) {
- ret = destroy_one_session(iter
->name
);
+ ret = destroy_one_session(iter);
if (ret < 0) {
printf("session %d (name: %s) creation failed\n", i, iter->name);
return -1;
if (ret < 0) {
printf("session %d (name: %s) creation failed\n", i, iter->name);
return -1;
This page took
0.043007 seconds
and
5
git commands to generate.