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: register thread for RCU operations.
[lttng-tools.git]
/
tests
/
unit
/
test_session.c
diff --git
a/tests/unit/test_session.c
b/tests/unit/test_session.c
index 8e1da214806d105975bc5853270a68444246da03..1e633187f8299c6b9d49af3b9d245384fd9612a9 100644
(file)
--- 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.
*/
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#define _GNU_SOURCE
#include <assert.h>
#include <errno.h>
#include <stdio.h>
#include <assert.h>
#include <errno.h>
#include <stdio.h>
@@
-25,6
+24,7
@@
#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 <tap/tap.h>
@@
-43,9
+43,10
@@
static struct ltt_session_list *session_list;
static struct ltt_session_list *session_list;
-/* For
lttnger
r.h */
+/* For
erro
r.h */
int lttng_opt_quiet = 1;
int lttng_opt_verbose = 0;
int lttng_opt_quiet = 1;
int lttng_opt_verbose = 0;
+int lttng_opt_mi;
int ust_consumerd32_fd;
int ust_consumerd64_fd;
int ust_consumerd32_fd;
int ust_consumerd64_fd;
@@
-108,8
+109,7
@@
static void empty_session_list(void)
struct ltt_session *iter, *tmp;
cds_list_for_each_entry_safe(iter, tmp, &session_list->head, list) {
struct ltt_session *iter, *tmp;
cds_list_for_each_entry_safe(iter, tmp, &session_list->head, list) {
- cds_list_del(&iter->list);
- free(iter);
+ session_destroy(iter);
}
/* Session list must be 0 */
}
/* Session list must be 0 */
@@
-151,15
+151,14
@@
static int create_one_session(char *name)
static int destroy_one_session(struct ltt_session *session)
{
int ret;
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';
+ ret = session_destroy(session);
if (ret == LTTNG_OK) {
if (ret == LTTNG_OK) {
- /* Validate */
- if (session == NULL) {
- return 0;
- }
- ret = find_session_name(session->name);
+ 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;
@@
-280,7
+279,7
@@
void test_large_session_number(void)
cds_list_for_each_entry_safe(iter, tmp, &session_list->head, list) {
ret = destroy_one_session(iter);
if (ret < 0) {
cds_list_for_each_entry_safe(iter, tmp, &session_list->head, list) {
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;
}
}
++failed;
}
}
@@
-297,6
+296,8
@@
int main(int argc, char **argv)
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();
@@
-313,5
+314,7
@@
int main(int argc, char **argv)
test_large_session_number();
test_large_session_number();
+ rcu_unregister_thread();
+
return exit_status();
}
return exit_status();
}
This page took
0.025327 seconds
and
4
git commands to generate.