X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Funit%2Ftest_session.c;h=5db1e758fc8fcbe5641ca6b4498d99eb8fe875cb;hp=41c907c1876a180b451b00c12be1f55a2cb9545d;hb=a3707772aa2b063a321dd6d7dfb2ea369bc02c43;hpb=5d2e1e66a968d9e555f9b8b00d0589ebfaf3de32 diff --git a/tests/unit/test_session.c b/tests/unit/test_session.c index 41c907c18..5db1e758f 100644 --- a/tests/unit/test_session.c +++ b/tests/unit/test_session.c @@ -16,7 +16,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#define _GNU_SOURCE #include #include #include @@ -25,29 +24,36 @@ #include #include #include +#include #include #include +#include +#include +#include +#include #include #include #define SESSION1 "test1" -/* This path will NEVER be created in this test */ -#define PATH1 "/tmp/.test-junk-lttng" - #define MAX_SESSIONS 10000 #define RANDOM_STRING_LEN 11 /* Number of TAP tests in this file */ -#define NUM_TESTS 12 +#define NUM_TESTS 11 +struct health_app *health_sessiond; static struct ltt_session_list *session_list; -/* For lttngerr.h */ +/* For error.h */ int lttng_opt_quiet = 1; int lttng_opt_verbose = 0; +int lttng_opt_mi; + +int ust_consumerd32_fd; +int ust_consumerd64_fd; static const char alphanum[] = "0123456789" @@ -106,10 +112,11 @@ static void empty_session_list(void) { struct ltt_session *iter, *tmp; + session_lock_list(); cds_list_for_each_entry_safe(iter, tmp, &session_list->head, list) { - cds_list_del(&iter->list); - free(iter); + session_destroy(iter); } + session_unlock_list(); /* Session list must be 0 */ assert(!session_list_count()); @@ -118,11 +125,11 @@ static void empty_session_list(void) /* * Test creation of 1 session */ -static int create_one_session(char *name, char *path) +static int create_one_session(char *name) { int ret; - ret = session_create(name, path, geteuid(), getegid()); + ret = session_create(name, geteuid(), getegid()); if (ret == LTTNG_OK) { /* Validate */ ret = find_session_name(name); @@ -150,25 +157,23 @@ static int create_one_session(char *name, char *path) static int destroy_one_session(struct ltt_session *session) { int ret; + char session_name[NAME_MAX]; - ret = session_destroy(session); + strncpy(session_name, session->name, sizeof(session_name)); + session_name[sizeof(session_name) - 1] = '\0'; - if (ret == LTTNG_OK) { - /* Validate */ - 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; - } 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; } /* @@ -180,20 +185,30 @@ static int two_session_same_name(void) int ret; struct ltt_session *sess; - ret = create_one_session(SESSION1, PATH1); + 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 */ - 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) @@ -204,7 +219,7 @@ void test_session_list(void) void test_create_one_session(void) { - ok(create_one_session(SESSION1, PATH1) == 0, + ok(create_one_session(SESSION1) == 0, "Create session: %s", SESSION1); } @@ -213,24 +228,27 @@ void test_validate_session(void) { struct ltt_session *tmp; + session_lock_list(); tmp = session_find_by_name(SESSION1); ok(tmp != NULL, "Validating session: session found"); ok(tmp->kernel_session == NULL && - strlen(tmp->path) && strlen(tmp->name), "Validating session: basic sanity check"); session_lock(tmp); session_unlock(tmp); + session_put(tmp); + session_unlock_list(); } void test_destroy_session(void) { struct ltt_session *tmp; + session_lock_list(); tmp = session_find_by_name(SESSION1); ok(tmp != NULL, @@ -239,6 +257,7 @@ void test_destroy_session(void) ok(destroy_one_session(tmp) == 0, "Destroying session: %s destroyed", SESSION1); + session_unlock_list(); } void test_duplicate_session(void) @@ -249,12 +268,8 @@ void test_duplicate_session(void) void test_bogus_session_param(void) { - ok(create_one_session(NULL, NULL) < 0, - "Create session with bogus param: NULL, NULL should fail"); - - ok(create_one_session(NULL, PATH1) < 0, - "Create session with bogus param: NULL, %s should fail", - PATH1); + ok(create_one_session(NULL) < 0, + "Create session with bogus param: NULL should fail"); ok(session_list_count() == 0, "Create session with bogus param: session list empty"); @@ -267,7 +282,7 @@ void test_large_session_number(void) for (i = 0; i < MAX_SESSIONS; i++) { char *tmp_name = get_random_string(); - ret = create_one_session(tmp_name, PATH1); + ret = create_one_session(tmp_name); if (ret < 0) { diag("session %d (name: %s) creation failed", i, tmp_name); ++failed; @@ -280,15 +295,18 @@ void test_large_session_number(void) failed = 0; + session_lock_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 (name: %s) destroy failed", i, iter->name); + diag("session %d destroy failed", i); ++failed; } } } + session_unlock_list(); ok(failed == 0 && session_list_count() == 0, "Large sessions number: destroyed %u sessions", @@ -297,10 +315,19 @@ void test_large_session_number(void) int main(int argc, char **argv) { - diag("Sessions unit tests"); + struct lttng_thread *ht_cleanup_thread; 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"); + + rcu_register_thread(); + test_session_list(); test_create_one_session(); @@ -317,5 +344,8 @@ int main(int argc, char **argv) test_large_session_number(); + rcu_unregister_thread(); + lttng_thread_list_shutdown_orphans(); + return exit_status(); }