projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: consumerd: crash occurs when taking snapshot of ust channel
[lttng-tools.git]
/
tests
/
utils
/
testapp
/
gen-ust-events
/
gen-ust-events.c
diff --git
a/tests/utils/testapp/gen-ust-events/gen-ust-events.c
b/tests/utils/testapp/gen-ust-events/gen-ust-events.c
index 3be0f0f1130958769e8d9298a1945fd441af6742..1ce34423b330ab14cccf50597b2fa1d0e469148c 100644
(file)
--- a/
tests/utils/testapp/gen-ust-events/gen-ust-events.c
+++ b/
tests/utils/testapp/gen-ust-events/gen-ust-events.c
@@
-28,25
+28,15
@@
#include <sys/types.h>
#include <unistd.h>
#include <stdbool.h>
#include <sys/types.h>
#include <unistd.h>
#include <stdbool.h>
+#include <signal.h>
+#include <poll.h>
+#include <errno.h>
+#include "utils.h"
+#include "signal-helper.h"
#define TRACEPOINT_DEFINE
#include "tp.h"
#define TRACEPOINT_DEFINE
#include "tp.h"
-void create_file(const char *path)
-{
- int ret;
-
- assert(path);
-
- ret = creat(path, S_IRWXU);
- if (ret < 0) {
- fprintf(stderr, "Failed to create file %s\n", path);
- return;
- }
-
- (void) close(ret);
-}
-
int main(int argc, char **argv)
{
unsigned int i, netint;
int main(int argc, char **argv)
{
unsigned int i, netint;
@@
-54,10
+44,15
@@
int main(int argc, char **argv)
char text[10] = "test";
double dbl = 2.0;
float flt = 2222.0;
char text[10] = "test";
double dbl = 2.0;
float flt = 2222.0;
- int nr_iter = 100;
+ int nr_iter = 100
, ret = 0, first_event_file_created = 0
;
useconds_t nr_usec = 0;
useconds_t nr_usec = 0;
- char *tmp_file_path = NULL;
- bool file_created = false;
+ char *after_first_event_file_path = NULL;
+ char *before_last_event_file_path = NULL;
+
+ if (set_signal_handler()) {
+ ret = -1;
+ goto end;
+ }
if (argc >= 2) {
/*
if (argc >= 2) {
/*
@@
-72,24
+67,55
@@
int main(int argc, char **argv)
}
if (argc >= 4) {
}
if (argc >= 4) {
- tmp_file_path = argv[3];
+ after_first_event_file_path = argv[3];
+ }
+
+ if (argc >= 5) {
+ before_last_event_file_path = argv[4];
}
for (i = 0; nr_iter < 0 || i < nr_iter; i++) {
}
for (i = 0; nr_iter < 0 || i < nr_iter; i++) {
+ if (nr_iter >= 0 && i == nr_iter - 1) {
+ /*
+ * Wait on synchronization before writing last
+ * event.
+ */
+ if (before_last_event_file_path) {
+ ret = wait_on_file(before_last_event_file_path);
+ if (ret != 0) {
+ goto end;
+ }
+ }
+ }
netint = htonl(i);
netint = htonl(i);
- tracepoint(tp, tptest, i, netint, values, text,
strlen(text), dbl,
-
flt);
+ tracepoint(tp, tptest, i, netint, values, text,
+
strlen(text), dbl,
flt);
/*
/*
- * First loop we create the file if asked to indicate
that at least one
- * tracepoint has been hit.
+ * First loop we create the file if asked to indicate
+ * t
hat at least one t
racepoint has been hit.
*/
*/
- if (!file_created && tmp_file_path) {
- create_file(tmp_file_path);
- file_created = true;
+ if (after_first_event_file_path && first_event_file_created == 0) {
+ ret = create_file(after_first_event_file_path);
+
+ if (ret != 0) {
+ goto end;
+ } else {
+ first_event_file_created = 1;
+ }
+ }
+
+ if (nr_usec) {
+ if (usleep_safe(nr_usec)) {
+ ret = -1;
+ goto end;
+ }
+ }
+ if (should_quit) {
+ break;
}
}
- usleep(nr_usec);
}
}
- return 0;
+end:
+ exit(!ret ? EXIT_SUCCESS : EXIT_FAILURE);
}
}
This page took
0.026085 seconds
and
4
git commands to generate.