/*
- * Copyright (c) 2011 David Goulet <david.goulet@polymtl.ca>
+ * Copyright (C) 2011 David Goulet <david.goulet@polymtl.ca>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * as published by the Free Software Foundation; only version 2
- * of the License.
+ * SPDX-License-Identifier: GPL-2.0-only
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <assert.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>
/* Number of TAP tests in this file */
#define NUM_TESTS 11
-struct health_app *health_sessiond;
static struct ltt_session_list *session_list;
-static pthread_t ht_cleanup_thread;
/* 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"
"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
static int create_one_session(char *name)
{
int ret;
+ enum lttng_error_code ret_code;
+ struct ltt_session *session = NULL;
- ret = session_create(name, geteuid(), getegid());
- if (ret == LTTNG_OK) {
+ session_lock_list();
+ ret_code = session_create(name, geteuid(), getegid(), &session);
+ session_put(session);
+ if (ret_code == LTTNG_OK) {
/* Validate */
ret = find_session_name(name);
if (ret < 0) {
/* Session not found by name */
printf("session not found after creation\n");
- return -1;
+ ret = -1;
} else {
/* Success */
- return 0;
+ ret = 0;
}
} else {
- if (ret == LTTNG_ERR_EXIST_SESS) {
+ if (ret_code == LTTNG_ERR_EXIST_SESS) {
printf("(session already exists) ");
}
- return -1;
+ ret = -1;
}
- return 0;
+ session_unlock_list();
+ return ret;
}
/*
return ret;
}
-void test_session_list(void)
+static void test_session_list(void)
{
session_list = session_get_list();
ok(session_list != NULL, "Session list: not NULL");
}
-void test_create_one_session(void)
+static void test_create_one_session(void)
{
ok(create_one_session(SESSION1) == 0,
"Create session: %s",
SESSION1);
}
-void test_validate_session(void)
+static void test_validate_session(void)
{
struct ltt_session *tmp;
ok(tmp != NULL,
"Validating session: session found");
- ok(tmp->kernel_session == NULL &&
- strlen(tmp->name),
- "Validating session: basic sanity check");
+ if (tmp) {
+ ok(tmp->kernel_session == NULL &&
+ strlen(tmp->name),
+ "Validating session: basic sanity check");
+ } else {
+ skip(1, "Skipping session validation check as session was not found");
+ goto end;
+ }
session_lock(tmp);
session_unlock(tmp);
session_put(tmp);
+end:
session_unlock_list();
}
-void test_destroy_session(void)
+static void test_destroy_session(void)
{
struct ltt_session *tmp;
ok(tmp != NULL,
"Destroying session: session found");
- ok(destroy_one_session(tmp) == 0,
- "Destroying session: %s destroyed",
- SESSION1);
+ if (tmp) {
+ ok(destroy_one_session(tmp) == 0,
+ "Destroying session: %s destroyed",
+ SESSION1);
+ } else {
+ skip(1, "Skipping session destruction as it was not found");
+ }
session_unlock_list();
}
-void test_duplicate_session(void)
+static void test_duplicate_session(void)
{
ok(two_session_same_name() == 0,
"Duplicate session creation");
}
-void test_bogus_session_param(void)
+static void test_session_name_generation(void)
{
- ok(create_one_session(NULL) < 0,
- "Create session with bogus param: NULL should fail");
+ struct ltt_session *session = NULL;
+ enum lttng_error_code ret_code;
+ const char *expected_session_name_prefix = DEFAULT_SESSION_NAME;
- ok(session_list_count() == 0,
- "Create session with bogus param: session list empty");
+ session_lock_list();
+ ret_code = session_create(NULL, geteuid(), getegid(), &session);
+ ok(ret_code == LTTNG_OK,
+ "Create session with a NULL name (auto-generate a name)");
+ if (!session) {
+ skip(1, "Skipping session name generation tests as session_create() failed.");
+ goto end;
+ }
+ diag("Automatically-generated session name: %s", *session->name ?
+ session->name : "ERROR");
+ ok(*session->name && !strncmp(expected_session_name_prefix, session->name,
+ sizeof(DEFAULT_SESSION_NAME) - 1),
+ "Auto-generated session name starts with %s",
+ DEFAULT_SESSION_NAME);
+end:
+ session_put(session);
+ session_unlock_list();
}
-void test_large_session_number(void)
+static void test_large_session_number(void)
{
int ret, i, failed = 0;
struct ltt_session *iter, *tmp;
int main(int argc, char **argv)
{
+ struct lttng_thread *ht_cleanup_thread;
+
plan_tests(NUM_TESTS);
health_sessiond = health_app_create(NR_HEALTH_SESSIOND_TYPES);
- assert(!init_ht_cleanup_thread(&ht_cleanup_thread));
+ ht_cleanup_thread = launch_ht_cleanup_thread();
+ assert(ht_cleanup_thread);
+ lttng_thread_put(ht_cleanup_thread);
diag("Sessions unit tests");
empty_session_list();
- test_bogus_session_param();
+ test_session_name_generation();
test_large_session_number();
rcu_unregister_thread();
- assert(!fini_ht_cleanup_thread(&ht_cleanup_thread));
+ lttng_thread_list_shutdown_orphans();
return exit_status();
}
projects / lttng-tools.git / blobdiff