projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tracepoint API change: rename TP_ARGS to TP_VARS
[lttng-ust.git]
/
tests
/
hello
/
hello.c
diff --git
a/tests/hello/hello.c
b/tests/hello/hello.c
index 6ba2e61e06963f2ea1478147569725263e2f3cc9..68fca7a721ef06dfb0fe9960edfe177d25cb2803 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
@@
-23,16
+25,15
@@
#include <sys/stat.h>
#include <fcntl.h>
#include <signal.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <signal.h>
+#include <string.h>
+#include <arpa/inet.h>
-#include <ust/marker.h>
-#include <ust/ustctl.h>
-#include "usterr.h"
-#include "tp.h"
+#include "ust_tests_hello.h"
void inthandler(int sig)
{
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)
@@
-40,9
+41,10
@@
int init_int_handler(void)
int result;
struct sigaction act;
int result;
struct sigaction act;
+ memset(&act, 0, sizeof(act));
result = sigemptyset(&act.sa_mask);
result = sigemptyset(&act.sa_mask);
- if(result == -1) {
-
PERROR
("sigemptyset");
+ if
(result == -1) {
+
perror
("sigemptyset");
return -1;
}
return -1;
}
@@
-52,40
+54,40
@@
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) {
-
PERROR
("sigaction");
+ result = sigaction(SIG
USR1
, &act, NULL);
+ if
(result == -1) {
+
perror
("sigaction");
return -1;
}
return 0;
}
return -1;
}
return 0;
}
-int main()
+int main(
int argc, char **argv
)
{
{
- int i;
+ int i, netint;
+ long values[] = { 1, 2, 3 };
+ char text[10] = "test";
+ double dbl = 2.0;
+ float flt = 2222.0;
+ int delay = 0;
init_int_handler();
init_int_handler();
- printf("Hello, World!\n");
+ if (argc == 2)
+ delay = atoi(argv[1]);
- sleep(1);
- for(i=0; i<50; i++) {
- trace_mark(bar, "str %s", "FOOBAZ");
- trace_mark(bar2, "number1 %d number2 %d", 53, 9800);
- trace_hello_tptest(i);
- usleep(100000);
- }
-
- if (scanf("%*s") == EOF)
- PERROR("scanf failed");
+ fprintf(stderr, "Hello, World!\n");
- ustctl_stop_trace(getpid(), "auto");
- ustctl_destroy_trace(getpid(), "auto");
-
- DBG("TRACE STOPPED");
- if (scanf("%*s") == EOF)
- PERROR("scanf failed");
+ sleep(delay);
+ fprintf(stderr, "Tracing... ");
+ for (i = 0; i < 1000000; i++) {
+ netint = htonl(i);
+ tracepoint(ust_tests_hello, tptest, i, netint, values,
+ text, strlen(text), dbl, flt);
+ //usleep(100000);
+ }
+ fprintf(stderr, " done.\n");
return 0;
}
return 0;
}
This page took
0.047465 seconds
and
4
git commands to generate.