Skip to content

Commit 0c115a4

Browse files
committed
fix dependency in state logging + fix child double signaling.
1 parent f41d017 commit 0c115a4

File tree

4 files changed

+13
-4
lines changed

4 files changed

+13
-4
lines changed

fio-stl.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11705,7 +11705,7 @@ SFUNC void fio_state_callback_force(fio_state_event_type_e e) {
1170511705
}
1170611706

1170711707
FIO_LOG_DEBUG2("(%d) scheduling %s callbacks (%zu tasks).",
11708-
(int)(fio_thread_getpid()),
11708+
(int)(fio_getpid()),
1170911709
FIO___STATE_TASKS_NAMES[e],
1171011710
(size_t)FIO___STATE_TASKS_ARRAY[e].count);
1171111711
if (!FIO___STATE_TASKS_ARRAY[e].count)
@@ -36969,7 +36969,8 @@ static void fio___io_signal_crash(int sig, void *flg) {
3696936969
static void fio___io_signal_stop(int sig, void *flg) {
3697036970
FIO_LOG_INFO("(%d) stop signal detected.", FIO___IO.pid);
3697136971
fio_io_stop();
36972-
fio_signal_monitor(sig, fio___io_signal_crash, flg, 0);
36972+
if (fio_io_is_master())
36973+
fio_signal_monitor(sig, fio___io_signal_crash, flg, 0);
3697336974
(void)sig, (void)flg;
3697436975
}
3697536976

fio-stl/004 state callbacks.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ SFUNC void fio_state_callback_force(fio_state_event_type_e e) {
257257
}
258258

259259
FIO_LOG_DEBUG2("(%d) scheduling %s callbacks (%zu tasks).",
260-
(int)(fio_thread_getpid()),
260+
(int)(fio_getpid()),
261261
FIO___STATE_TASKS_NAMES[e],
262262
(size_t)FIO___STATE_TASKS_ARRAY[e].count);
263263
if (!FIO___STATE_TASKS_ARRAY[e].count)

fio-stl/402 io reactor.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ static void fio___io_signal_crash(int sig, void *flg) {
3939
static void fio___io_signal_stop(int sig, void *flg) {
4040
FIO_LOG_INFO("(%d) stop signal detected.", FIO___IO.pid);
4141
fio_io_stop();
42-
fio_signal_monitor(sig, fio___io_signal_crash, flg, 0);
42+
if (fio_io_is_master())
43+
fio_signal_monitor(sig, fio___io_signal_crash, flg, 0);
4344
(void)sig, (void)flg;
4445
}
4546

tests/url.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
#define FIO_URL
2+
#define FIO_STR
23
#include "fio-stl.h"
34

45
int main(int argc, char const *argv[]) {
56
char *to_parse =
67
(char *)"http://anon:[email protected]:443/my/path?answer=42#target";
78
if (argc >= 2)
89
to_parse = (char *)argv[1];
10+
FIO_STR_INFO_TMP_VAR(path, 1024);
911
fio_url_s u = fio_url_parse(to_parse, strlen(to_parse));
1012
fprintf(stderr,
1113
"Parsed URL:\n"
@@ -43,5 +45,10 @@ int main(int argc, char const *argv[]) {
4345
i.value.buf);
4446
}
4547
}
48+
if (u.path.len < 1024) {
49+
fio_string_write_url_dec(&path, NULL, u.path.buf, u.path.len);
50+
if (!FIO_STR_INFO_IS_EQ(path, u.path))
51+
printf("\tdecoded path:\t%s\n", path.buf);
52+
}
4653
return 0;
4754
}

0 commit comments

Comments
 (0)