projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
libust 2.0 + ringbuffer + TRACEPOINT_EVENT builds and runs
[lttng-ust.git]
/
tests
/
hello
/
hello.c
diff --git
a/tests/hello/hello.c
b/tests/hello/hello.c
index 7eecf69e83f0bbaf23949a71e191806bf884687a..d30901a5517108a5e6c67135e2b279a25a9e181b 100644
(file)
--- a/
tests/hello/hello.c
+++ b/
tests/hello/hello.c
@@
-1,9
+1,11
@@
-/* Copyright (C) 2009 Pierre-Marc Fournier
+/*
+ * Copyright (C) 2009 Pierre-Marc Fournier
+ * Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
either
- *
version 2.1 of the License, or (at your option) any later version
.
+ * License as published by the Free Software Foundation;
version 2.1 of
+ *
the License
.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-24,15
+26,13
@@
#include <fcntl.h>
#include <signal.h>
#include <fcntl.h>
#include <signal.h>
-#include <ust/marker.h>
#include "usterr.h"
#include "usterr.h"
-#include "tracer.h"
#include "tp.h"
void inthandler(int sig)
{
#include "tp.h"
void inthandler(int sig)
{
- printf("in handler\n");
-
exit(0
);
+ printf("in
SIGUSR1
handler\n");
+
tracepoint(ust_tests_hello_tptest_sighandler
);
}
int init_int_handler(void)
}
int init_int_handler(void)
@@
-41,7
+41,7
@@
int init_int_handler(void)
struct sigaction act;
result = sigemptyset(&act.sa_mask);
struct sigaction act;
result = sigemptyset(&act.sa_mask);
- if(result == -1) {
+ if
(result == -1) {
PERROR("sigemptyset");
return -1;
}
PERROR("sigemptyset");
return -1;
}
@@
-52,8
+52,8
@@
int init_int_handler(void)
/* Only defer ourselves. Also, try to restart interrupted
* syscalls to disturb the traced program as little as possible.
*/
/* Only defer ourselves. Also, try to restart interrupted
* syscalls to disturb the traced program as little as possible.
*/
- result = sigaction(SIG
INT
, &act, NULL);
- if(result == -1) {
+ result = sigaction(SIG
USR1
, &act, NULL);
+ if
(result == -1) {
PERROR("sigaction");
return -1;
}
PERROR("sigaction");
return -1;
}
@@
-61,7
+61,7
@@
int init_int_handler(void)
return 0;
}
return 0;
}
-int main()
+int main(
int argc, char **argv
)
{
int i;
{
int i;
@@
-70,22
+70,10
@@
int main()
printf("Hello, World!\n");
sleep(1);
printf("Hello, World!\n");
sleep(1);
- for(i=0; i<50; i++) {
- trace_mark(ust, bar, "str %s", "FOOBAZ");
- trace_mark(ust, bar2, "number1 %d number2 %d", 53, 9800);
- trace_hello_tptest(i);
+
+ for (i = 0; i < 50; i++) {
+ tracepoint(ust_tests_hello_tptest, i);
usleep(100000);
}
usleep(100000);
}
-
- if (scanf("%*s") == EOF)
- PERROR("scanf failed");
-
- ltt_trace_stop("auto");
- ltt_trace_destroy("auto", 0);
-
- DBG("TRACE STOPPED");
- if (scanf("%*s") == EOF)
- PERROR("scanf failed");
-
return 0;
}
return 0;
}
This page took
0.024284 seconds
and
4
git commands to generate.