-#include "config.h"
+/* Licensed under LGPL - see LICENSE file for details */
+#include <ccan/failtest/failtest.h>
#include <stdarg.h>
#include <string.h>
#include <stdio.h>
#include <sys/wait.h>
#include <sys/stat.h>
#include <sys/time.h>
+#include <signal.h>
#include <assert.h>
#include <ccan/read_write_all/read_write_all.h>
#include <ccan/failtest/failtest_proto.h>
-#include <ccan/failtest/failtest.h>
#include <ccan/build_assert/build_assert.h>
enum failtest_result (*failtest_hook)(struct failtest_call *, unsigned);
static struct lock_info *locks = NULL;
static unsigned int lock_num = 0;
+static pid_t orig_pid;
+
static const char info_to_arg[] = "mceoxprwf";
/* Dummy call used for failtest_undo wrappers. */
#define add_history(type, file, line, elem) \
add_history_((type), (file), (line), (elem), sizeof(*(elem)))
+/* We do a fake call inside a sizeof(), to check types. */
#define set_cleanup(call, clean, type) \
- (call)->cleanup = (void *)((void)sizeof(clean((type *)NULL)), (clean))
+ (call)->cleanup = (void *)((void)sizeof(clean((type *)NULL),1), (clean))
static bool read_write_info(int fd)
{
s->len = lseek(fd, 0, SEEK_END);
lseek(fd, 0, SEEK_SET);
s->contents = malloc(s->len);
- read(fd, s->contents, s->len);
+ if (read(fd, s->contents, s->len) != s->len)
+ err(1, "Failed to save %zu bytes", (size_t)s->len);
lseek(fd, s->off, SEEK_SET);
return s;
}
struct saved_file *next = s->next;
lseek(s->fd, 0, SEEK_SET);
- write(s->fd, s->contents, s->len);
- ftruncate(s->fd, s->len);
+ if (write(s->fd, s->contents, s->len) != s->len)
+ err(1, "Failed to restore %zu bytes", (size_t)s->len);
+ if (ftruncate(s->fd, s->len) != 0)
+ err(1, "Failed to trim file to length %zu",
+ (size_t)s->len);
free(s->contents);
lseek(s->fd, s->off, SEEK_SET);
free(s);
}
}
+static void free_files(struct saved_file *s)
+{
+ while (s) {
+ struct saved_file *next = s->next;
+ free(s->contents);
+ free(s);
+ s = next;
+ }
+}
+
/* Free up memory, so valgrind doesn't report leaks. */
static void free_everything(void)
{
if (!history[i].cleanup)
continue;
if (!forced_cleanup) {
- printf("Leak at %s:%u\n",
- history[i].file, history[i].line);
+ printf("Leak at %s:%u: --failpath=%s\n",
+ history[i].file, history[i].line,
+ failpath_string());
status = 1;
}
history[i].cleanup(&history[i].u);
struct saved_file *files;
/* Are we probing? */
- if (probe_count && --probe_count == 0)
+ if (probe_count && --probe_count == 0 && control_fd != -1)
failtest_cleanup(true, 0);
if (call == &unrecorded_call)
/* + means continue after end, like normal. */
if (*failpath == '+')
failpath = NULL;
- else {
- if (tolower(*failpath) != info_to_arg[call->type])
+ else if (*failpath == '\0') {
+ /* Continue, but don't inject errors. */
+ return call->fail = false;
+ } else {
+ 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])
signal(SIGUSR1, SIG_IGN);
sprintf(str, "xterm -e gdb /proc/%d/exe %d &",
getpid(), getpid());
- system(str);
- sleep(5);
+ if (system(str) == 0)
+ sleep(5);
}
}
switch (failtest_hook(history, history_num)) {
case FAIL_OK:
break;
+ case FAIL_PROBE:
+ /* Already down probe path? Stop now. */
+ if (!probe_count) {
+ /* FIXME: We should run *parent* and
+ * run probe until calls match up again. */
+ probe_count = 3;
+ break;
+ } else {
+ /* Child should give up now. */
+ if (control_fd != -1)
+ failtest_cleanup(true, 0);
+ /* Parent, don't fail again. */
+ }
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();
}
if (child == 0) {
if (tracefd != -1) {
struct timeval now;
- char *p;
+ const char *p;
gettimeofday(&now, NULL);
if (now.tv_usec < start.tv_usec) {
now.tv_sec--;
p = failpath_string();
trace("%u->%u (%u.%02u): %s (", getppid(), getpid(),
(int)now.tv_sec, (int)now.tv_usec / 10000, p);
- free(p);
+ free((char *)p);
p = strrchr(history[history_num-1].file, '/');
if (p)
trace("%s", p+1);
if (output[1] != STDOUT_FILENO && output[1] != STDERR_FILENO)
close(output[1]);
control_fd = control[1];
+ /* Valgrind spots the leak if we don't free these. */
+ free_files(files);
return true;
}
else
ret = poll(pfd, 2, failtest_timeout_ms);
- if (ret <= 0)
+ if (ret == 0)
hand_down(SIGUSR1);
+ if (ret < 0) {
+ if (errno == EINTR)
+ continue;
+ err(1, "Poll returned %i", ret);
+ }
if (pfd[0].revents & POLLIN) {
ssize_t len;
va_start(ap, line);
call.flags = va_arg(ap, int);
if (call.flags & O_CREAT) {
- call.mode = va_arg(ap, mode_t);
+ call.mode = va_arg(ap, int);
va_end(ap);
}
p = add_history(FAILTEST_OPEN, file, line, &call);
return p->u.fcntl.ret;
}
+pid_t failtest_getpid(const char *file, unsigned line)
+{
+ /* You must call failtest_init first! */
+ assert(orig_pid);
+ return orig_pid;
+}
+
void failtest_init(int argc, char *argv[])
{
unsigned int i;
+ orig_pid = getpid();
+
for (i = 1; i < argc; i++) {
if (!strncmp(argv[i], "--failpath=", strlen("--failpath="))) {
failpath = argv[i] + strlen("--failpath=");
gettimeofday(&start, NULL);
}
+bool failtest_has_failed(void)
+{
+ return control_fd != -1;
+}
+
void failtest_exit(int status)
{
if (failtest_exit_check) {
projects / ccan / blobdiff