projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix tests: link libpause_consumer on liblttng-ctl
[lttng-tools.git]
/
tests
/
unit
/
test_session.c
diff --git
a/tests/unit/test_session.c
b/tests/unit/test_session.c
index 7c925908d326f18443c3e2184a50a8c430abb723..5db1e758fc8fcbe5641ca6b4498d99eb8fe875cb 100644
(file)
--- a/
tests/unit/test_session.c
+++ b/
tests/unit/test_session.c
@@
-24,11
+24,15
@@
#include <unistd.h>
#include <time.h>
#include <sys/types.h>
#include <unistd.h>
#include <time.h>
#include <sys/types.h>
+#include <urcu.h>
#include <tap/tap.h>
#include <bin/lttng-sessiond/session.h>
#include <bin/lttng-sessiond/ust-app.h>
#include <tap/tap.h>
#include <bin/lttng-sessiond/session.h>
#include <bin/lttng-sessiond/ust-app.h>
+#include <bin/lttng-sessiond/ht-cleanup.h>
+#include <bin/lttng-sessiond/health-sessiond.h>
+#include <bin/lttng-sessiond/thread.h>
#include <common/sessiond-comm/sessiond-comm.h>
#include <common/common.h>
#include <common/sessiond-comm/sessiond-comm.h>
#include <common/common.h>
@@
-40,6
+44,7
@@
/* Number of TAP tests in this file */
#define NUM_TESTS 11
/* Number of TAP tests in this file */
#define NUM_TESTS 11
+struct health_app *health_sessiond;
static struct ltt_session_list *session_list;
/* For error.h */
static struct ltt_session_list *session_list;
/* For error.h */
@@
-107,9
+112,11
@@
static void empty_session_list(void)
{
struct ltt_session *iter, *tmp;
{
struct ltt_session *iter, *tmp;
+ session_lock_list();
cds_list_for_each_entry_safe(iter, tmp, &session_list->head, list) {
session_destroy(iter);
}
cds_list_for_each_entry_safe(iter, tmp, &session_list->head, list) {
session_destroy(iter);
}
+ session_unlock_list();
/* Session list must be 0 */
assert(!session_list_count());
/* Session list must be 0 */
assert(!session_list_count());
@@
-152,22
+159,21
@@
static int destroy_one_session(struct ltt_session *session)
int ret;
char session_name[NAME_MAX];
int ret;
char session_name[NAME_MAX];
- strncpy(session_name, session->name, sizeof(session
->
name));
+ strncpy(session_name, session->name, sizeof(session
_
name));
session_name[sizeof(session_name) - 1] = '\0';
session_name[sizeof(session_name) - 1] = '\0';
- ret = session_destroy(session);
- if (ret == LTTNG_OK) {
- ret = find_session_name(session_name);
- if (ret < 0) {
- /* Success, -1 means that the sesion is NOT found */
- return 0;
- } else {
- /* Fail */
- return -1;
- }
- }
+ session_destroy(session);
+ session_put(session);
- return 0;
+ ret = find_session_name(session_name);
+ if (ret < 0) {
+ /* Success, -1 means that the sesion is NOT found */
+ ret = 0;
+ } else {
+ /* Fail */
+ ret = -1;
+ }
+ return ret;
}
/*
}
/*
@@
-182,17
+188,27
@@
static int two_session_same_name(void)
ret = create_one_session(SESSION1);
if (ret < 0) {
/* Fail */
ret = create_one_session(SESSION1);
if (ret < 0) {
/* Fail */
- return -1;
+ ret = -1;
+ goto end;
}
}
+ session_lock_list();
sess = session_find_by_name(SESSION1);
if (sess) {
/* Success */
sess = session_find_by_name(SESSION1);
if (sess) {
/* Success */
- return 0;
+ session_put(sess);
+ session_unlock_list();
+ ret = 0;
+ goto end_unlock;
+ } else {
+ /* Fail */
+ ret = -1;
+ goto end_unlock;
}
}
-
- /* Fail */
- return -1;
+end_unlock:
+ session_unlock_list();
+end:
+ return ret;
}
void test_session_list(void)
}
void test_session_list(void)
@@
-212,6
+228,7
@@
void test_validate_session(void)
{
struct ltt_session *tmp;
{
struct ltt_session *tmp;
+ session_lock_list();
tmp = session_find_by_name(SESSION1);
ok(tmp != NULL,
tmp = session_find_by_name(SESSION1);
ok(tmp != NULL,
@@
-223,12
+240,15
@@
void test_validate_session(void)
session_lock(tmp);
session_unlock(tmp);
session_lock(tmp);
session_unlock(tmp);
+ session_put(tmp);
+ session_unlock_list();
}
void test_destroy_session(void)
{
struct ltt_session *tmp;
}
void test_destroy_session(void)
{
struct ltt_session *tmp;
+ session_lock_list();
tmp = session_find_by_name(SESSION1);
ok(tmp != NULL,
tmp = session_find_by_name(SESSION1);
ok(tmp != NULL,
@@
-237,6
+257,7
@@
void test_destroy_session(void)
ok(destroy_one_session(tmp) == 0,
"Destroying session: %s destroyed",
SESSION1);
ok(destroy_one_session(tmp) == 0,
"Destroying session: %s destroyed",
SESSION1);
+ session_unlock_list();
}
void test_duplicate_session(void)
}
void test_duplicate_session(void)
@@
-274,8
+295,10
@@
void test_large_session_number(void)
failed = 0;
failed = 0;
+ session_lock_list();
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) {
+ assert(session_get(iter));
ret = destroy_one_session(iter);
if (ret < 0) {
diag("session %d destroy failed", i);
ret = destroy_one_session(iter);
if (ret < 0) {
diag("session %d destroy failed", i);
@@
-283,6
+306,7
@@
void test_large_session_number(void)
}
}
}
}
}
}
+ session_unlock_list();
ok(failed == 0 && session_list_count() == 0,
"Large sessions number: destroyed %u sessions",
ok(failed == 0 && session_list_count() == 0,
"Large sessions number: destroyed %u sessions",
@@
-291,10
+315,19
@@
void test_large_session_number(void)
int main(int argc, char **argv)
{
int main(int argc, char **argv)
{
+ struct lttng_thread *ht_cleanup_thread;
+
plan_tests(NUM_TESTS);
plan_tests(NUM_TESTS);
+ health_sessiond = health_app_create(NR_HEALTH_SESSIOND_TYPES);
+ ht_cleanup_thread = launch_ht_cleanup_thread();
+ assert(ht_cleanup_thread);
+ lttng_thread_put(ht_cleanup_thread);
+
diag("Sessions unit tests");
diag("Sessions unit tests");
+ rcu_register_thread();
+
test_session_list();
test_create_one_session();
test_session_list();
test_create_one_session();
@@
-311,5
+344,8
@@
int main(int argc, char **argv)
test_large_session_number();
test_large_session_number();
+ rcu_unregister_thread();
+ lttng_thread_list_shutdown_orphans();
+
return exit_status();
}
return exit_status();
}
This page took
0.025755 seconds
and
4
git commands to generate.