+#include "config.h"
#include <stdarg.h>
#include <string.h>
#include <stdio.h>
#include <ccan/failtest/failtest.h>
#include <ccan/build_assert/build_assert.h>
-bool (*failtest_hook)(struct failtest_call *history, unsigned num)
-= failtest_default_hook;
+enum failtest_result (*failtest_hook)(struct failtest_call *, unsigned);
static int tracefd = -1;
static unsigned int history_num = 0;
static int control_fd = -1;
static struct timeval start;
+static unsigned int probe_count = 0;
static struct write_call *child_writes = NULL;
static unsigned int child_writes_num = 0;
#define set_cleanup(call, clean, type) \
(call)->cleanup = (void *)((void)sizeof(clean((type *)NULL)), (clean))
-bool failtest_default_hook(struct failtest_call *history, unsigned num)
-{
- return true;
-}
-
static bool read_write_info(int fd)
{
struct write_call *w;
exit(1);
}
+static void trace(const char *fmt, ...)
+{
+ va_list ap;
+
+ if (tracefd == -1)
+ return;
+
+ va_start(ap, fmt);
+ vdprintf(tracefd, fmt, ap);
+ va_end(ap);
+}
+
static pid_t child;
-static void hand_down(int signal)
+static void hand_down(int signum)
{
- kill(child, signal);
+ kill(child, signum);
}
static void release_locks(void)
lock_owner = getpid();
}
-static void trace_str(const char *str)
-{
- ssize_t ret;
-
- while ((ret = write(tracefd, str, strlen(str))) <= 0) {
- str += ret;
- if (!*str)
- return;
- }
- err(1, "Writing trace.");
-}
-
struct saved_file {
struct saved_file *next;
int fd;
}
}
+/* Free up memory, so valgrind doesn't report leaks. */
+static void free_everything(void)
+{
+ unsigned int i;
+
+ /* We don't do this in cleanup: needed even for failed opens. */
+ for (i = 0; i < history_num; i++) {
+ if (history[i].type == FAILTEST_OPEN)
+ free((char *)history[i].u.open.pathname);
+ }
+ free(history);
+}
+
+static NORETURN void failtest_cleanup(bool forced_cleanup, int status)
+{
+ int i;
+
+ /* For children, we don't care if they "failed" the testing. */
+ if (control_fd != -1)
+ status = 0;
+
+ if (forced_cleanup)
+ history_num--;
+
+ /* Cleanup everything, in reverse order. */
+ for (i = history_num - 1; i >= 0; i--) {
+ if (!history[i].cleanup)
+ continue;
+ if (!forced_cleanup) {
+ printf("Leak at %s:%u: --failpath=%s\n",
+ history[i].file, history[i].line,
+ failpath_string());
+ status = 1;
+ }
+ history[i].cleanup(&history[i].u);
+ }
+
+ free_everything();
+ tell_parent(SUCCESS);
+ exit(status);
+}
+
static bool should_fail(struct failtest_call *call)
{
int status;
size_t outlen = 0;
struct saved_file *files;
+ /* Are we probing? */
+ if (probe_count && --probe_count == 0)
+ failtest_cleanup(true, 0);
+
if (call == &unrecorded_call)
return false;
if (*failpath == '+')
failpath = NULL;
else {
- if (tolower(*failpath) != info_to_arg[call->type])
+ if (tolower((unsigned char)*failpath)
+ != info_to_arg[call->type])
errx(1, "Failpath expected '%c' got '%c'\n",
info_to_arg[call->type], *failpath);
- call->fail = isupper(*(failpath++));
+ call->fail = isupper((unsigned char)*(failpath++));
return call->fail;
}
}
unsigned int i;
for (i = 0; i < history_num; i++) {
- char c = info_to_arg[history[i].type];
+ unsigned char c = info_to_arg[history[i].type];
if (history[i].fail)
c = toupper(c);
if (c != debugpath[i])
}
}
- if (!failtest_hook(history, history_num)) {
- call->fail = false;
- return false;
+ if (failtest_hook) {
+ switch (failtest_hook(history, history_num)) {
+ case FAIL_OK:
+ break;
+ case FAIL_DONT_FAIL:
+ call->fail = false;
+ return false;
+ case FAIL_PROBE:
+ /* Already down probe path? Stop now. */
+ if (probe_count)
+ failtest_cleanup(true, 0);
+ /* FIXME: We should run *parent* and run probe until
+ * calls match up again. */
+ probe_count = 3;
+ break;
+ default:
+ abort();
+ }
}
files = save_files();
if (child == 0) {
if (tracefd != -1) {
struct timeval now;
- char str[50], *p;
+ const char *p;
gettimeofday(&now, NULL);
if (now.tv_usec < start.tv_usec) {
now.tv_sec--;
}
now.tv_usec -= start.tv_usec;
now.tv_sec -= start.tv_sec;
- sprintf(str, "%u (%u.%02u): ", getpid(),
- (int)now.tv_sec, (int)now.tv_usec / 10000);
- trace_str(str);
p = failpath_string();
- trace_str(p);
- free(p);
- trace_str("(");
- p = strchr(history[history_num-1].file, '/');
+ trace("%u->%u (%u.%02u): %s (", getppid(), getpid(),
+ (int)now.tv_sec, (int)now.tv_usec / 10000, p);
+ free((char *)p);
+ p = strrchr(history[history_num-1].file, '/');
if (p)
- trace_str(p+1);
+ trace("%s", p+1);
else
- trace_str(history[history_num-1].file);
- sprintf(str, ":%u)\n", history[history_num-1].line);
- trace_str(str);
+ trace("%s", history[history_num-1].file);
+ trace(":%u)\n", history[history_num-1].line);
}
close(control[0]);
close(output[0]);
}
p = add_history(FAILTEST_FCNTL, file, line, &call);
- get_locks();
if (should_fail(p)) {
p->u.fcntl.ret = -1;
else
p->error = EDEADLK;
} else {
+ get_locks();
p->u.fcntl.ret = fcntl(p->u.fcntl.fd, p->u.fcntl.cmd,
&p->u.fcntl.arg.fl);
if (p->u.fcntl.ret == -1)
gettimeofday(&start, NULL);
}
-/* Free up memory, so valgrind doesn't report leaks. */
-static void free_everything(void)
-{
- unsigned int i;
-
- /* We don't do this in cleanup: needed even for failed opens. */
- for (i = 0; i < history_num; i++) {
- if (history[i].type == FAILTEST_OPEN)
- free((char *)history[i].u.open.pathname);
- }
- free(history);
-}
-
void failtest_exit(int status)
{
- int i;
-
if (failtest_exit_check) {
if (!failtest_exit_check(history, history_num))
child_fail(NULL, 0, "failtest_exit_check failed\n");
}
- if (control_fd == -1) {
- free_everything();
- exit(status);
- }
-
- /* Cleanup everything, in reverse order. */
- for (i = history_num - 1; i >= 0; i--)
- if (history[i].cleanup)
- history[i].cleanup(&history[i].u);
-
- free_everything();
- tell_parent(SUCCESS);
- exit(0);
+ failtest_cleanup(false, status);
}
projects / ccan / blobdiff