move output() and friends to trinity.h

step 1 of killing off log.h

This is used pretty much everywhere, so it makes sense to put it in
the 'everything' header.

arg-decoder.c

@@ -166,7 +166,7 @@ static unsigned int render_syscall_postfix(struct syscallrecord *rec, char *buff
 }
 
 /* These next two functions are always called from child_random_syscalls() by a fuzzing child.
- * They render the buffer, and output it (to both stdout and logs).
+ * They render the buffer, and output it to stdout.
  * Other contexts (like post-mortem) directly use the buffers.
  */
 void output_syscall_prefix(struct syscallrecord *rec)

child.c

@@ -16,7 +16,6 @@
 #include "arch.h"
 #include "child.h"
 #include "list.h"
-#include "log.h"
 #include "maps.h"
 #include "params.h"
 #include "pids.h"

childops/thrash-pid-files.c

@@ -17,6 +17,7 @@
 #include "pathnames.h"
 #include "pids.h"
 #include "random.h"
+#include "shm.h"
 
 static void read_pid_files(pid_t pid, char *buffer)
 {

debug.c

@@ -10,9 +10,9 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <syslog.h>
+#include <unistd.h>
 #include "child.h"
 #include "debug.h"
-#include "log.h"
 #include "params.h"
 #include "pids.h"
 #include "shm.h"

devices.c

@@ -8,8 +8,8 @@
 #include <sys/types.h>
 #include <linux/kdev_t.h>
 #include "files.h"
+#include "trinity.h"
 
-#include "log.h"
 
 static struct {
 	int major;

fds/bpf.c

@@ -16,7 +16,6 @@
 
 #include "bpf.h"
 #include "fd.h"
-#include "log.h"
 #include "objects.h"
 #include "random.h"
 #include "sanitise.h"

fds/drm.c

@@ -2,7 +2,6 @@
 
 #include "config.h"
 #include "fd.h"
-#include "log.h"
 #include "memfd.h"
 #include "objects.h"
 #include "random.h"

fds/epoll.c

@@ -8,7 +8,6 @@
 #include <sys/epoll.h>
 
 #include "fd.h"
-#include "log.h"
 #include "objects.h"
 #include "random.h"
 #include "sanitise.h"

fds/eventfd.c

@@ -9,7 +9,6 @@
 
 #include "fd.h"
 #include "files.h"
-#include "log.h"
 #include "objects.h"
 #include "random.h"
 #include "sanitise.h"

fds/fanotify_init.c

@@ -8,7 +8,6 @@
 #include <unistd.h>
 
 #include "fd.h"
-#include "log.h"
 #include "fanotify.h"
 #include "objects.h"
 #include "random.h"

fds/fds.c

@@ -5,7 +5,6 @@
 #include <unistd.h>
 
 #include "fd.h"
-#include "log.h"
 #include "list.h"
 #include "net.h"
 #include "params.h"

fds/files.c

@@ -10,7 +10,6 @@
 #include "exit.h"
 #include "fd.h"
 #include "files.h"
-#include "log.h"
 #include "objects.h"
 #include "pathnames.h"
 #include "random.h"

fds/inotify.c

@@ -8,7 +8,6 @@
 #include <sys/inotify.h>
 
 #include "fd.h"
-#include "log.h"
 #include "objects.h"
 #include "random.h"
 #include "sanitise.h"

fds/memfd.c

@@ -7,7 +7,6 @@
 #include <unistd.h>
 
 #include "fd.h"
-#include "log.h"
 #include "memfd.h"
 #include "objects.h"
 #include "random.h"

fds/perf.c

@@ -9,7 +9,6 @@
 #include "objects.h"
 #include "perf.h"
 #include "shm.h"
-#include "log.h"
 #include "sanitise.h"
 
 #define MAX_PERF_FDS 10

fds/pipes.c

@@ -9,7 +9,6 @@
 
 #include "fd.h"
 #include "files.h"
-#include "log.h"
 #include "objects.h"
 #include "pipes.h"
 #include "random.h"

fds/sockets.c

@@ -10,7 +10,6 @@
 
 #include "debug.h"
 #include "domains.h"
-#include "log.h"
 #include "net.h"
 #include "objects.h"
 #include "params.h"	// verbose, do_specific_domain

fds/testfiles.c

@@ -10,7 +10,6 @@
 
 #include "fd.h"
 #include "files.h"
-#include "log.h"
 #include "objects.h"
 #include "random.h"
 #include "sanitise.h"

fds/timerfd.c

@@ -9,7 +9,6 @@
 
 #include "fd.h"
 #include "files.h"
-#include "log.h"
 #include "objects.h"
 #include "random.h"
 #include "sanitise.h"

fds/userfaultfd.c

@@ -8,7 +8,6 @@
 #include <unistd.h>
 
 #include "fd.h"
-#include "log.h"
 #include "userfaultfd.h"
 #include "objects.h"
 #include "random.h"

ftrace.c

@@ -5,7 +5,7 @@
 #include <stdlib.h>
 
 #include "ftrace.h"
-#include "log.h"
+#include "trinity.h"
 
 static int trace_fd = -1;
 

generate-args.c

@@ -7,7 +7,6 @@
 #include "arch.h"
 #include "debug.h"
 #include "files.h"
-#include "log.h"
 #include "maps.h"
 #include "net.h"
 #include "pathnames.h"

include/log.h

@@ -1,21 +1,7 @@
 #pragma once
 
-#include <unistd.h>
-#include "child.h"
-#include "config.h"
-#include "exit.h"
-#include "shm.h"
 #include "syscall.h"
-#include "types.h"
-#include "utils.h"
 
-#define MAX_LOGLEVEL 3
-
-void output(unsigned char level, const char *fmt, ...);
-void outputerr(const char *fmt, ...);
-void outputstd(const char *fmt, ...);
+void output_rendered_buffer(char *buffer);
 void output_syscall_prefix(struct syscallrecord *rec);
 void output_syscall_postfix(struct syscallrecord *rec);
-void output_rendered_buffer(char *buffer);
-
-void debugf(const char *fmt, ...);

include/trinity.h

@@ -15,3 +15,10 @@ void panic(int reason);
 
 #define FAIL 0
 #define SUCCESS 1
+
+// output stuff that's used pretty much everywhere, so may as well be here.
+#define MAX_LOGLEVEL 3
+void output(unsigned char level, const char *fmt, ...);
+void outputerr(const char *fmt, ...);
+void outputstd(const char *fmt, ...);
+void debugf(const char *fmt, ...);

ioctls/ioctls.c

@@ -5,7 +5,6 @@
 
 #include "files.h"
 #include "ioctls.h"
-#include "log.h"
 #include "random.h"
 #include "sanitise.h"
 #include "shm.h"

locks.c

@@ -3,9 +3,10 @@
 #include <sys/types.h>
 #include <unistd.h>
 #include "debug.h"
+#include "exit.h"
 #include "locks.h"
-#include "log.h"
 #include "pids.h"
+#include "shm.h"
 #include "trinity.h"
 #include "utils.h"
 

log.c

@@ -1,6 +1,7 @@
 #include <errno.h>
 #include <stdio.h>
 #include <stdarg.h>
+#include <unistd.h>
 #include "log.h"
 #include "pids.h"
 #include "params.h"	// quiet_level

main.c

@@ -12,7 +12,6 @@
 #include "child.h"
 #include "debug.h"
 #include "ftrace.h"
-#include "log.h"
 #include "params.h"
 #include "pids.h"
 #include "post-mortem.h"

mm/maps-initial.c

@@ -14,7 +14,6 @@
 #include <sys/mman.h>
 #include "arch.h"
 #include "list.h"
-#include "log.h"
 #include "maps.h"
 #include "random.h"
 #include "utils.h"

net/bpf.c

@@ -10,7 +10,6 @@
 #include "bpf.h"
 #include "config.h"
 #include "debug.h"
-#include "log.h"
 #include "net.h"
 #include "random.h"
 #include "syscall.h"

net/domains.c

@@ -4,7 +4,6 @@
 #include <unistd.h>
 
 #include "debug.h"
-#include "log.h"
 #include "net.h"
 #include "domains.h"
 #include "params.h"

objects.c

@@ -1,5 +1,4 @@
 #include "list.h"
-#include "log.h"
 #include "objects.h"
 #include "random.h"
 #include "shm.h"

params.c

@@ -9,7 +9,6 @@
 #include "bdevs.h"
 #include "child.h"
 #include "ftrace.h"
-#include "log.h"
 #include "net.h"
 #include "params.h"
 #include "domains.h"

pathnames.c

@@ -10,7 +10,6 @@
 #include <sys/stat.h>
 
 #include "exit.h"
-#include "log.h"
 #include "params.h"
 #include "pathnames.h"
 #include "random.h"

pids.c

@@ -2,7 +2,7 @@
 #include <stdio.h>
 #include <sys/types.h>
 #include <signal.h>
-#include "log.h"
+#include <unistd.h>
 #include "params.h"	// dangerous
 #include "pids.h"
 #include "random.h"

post-mortem.c

@@ -5,7 +5,6 @@
 #include <fcntl.h>
 #include <string.h>
 #include <syslog.h>
-#include "log.h"
 #include "pids.h"
 #include "shm.h"
 #include "taint.h"

rand/random-address.c

@@ -6,7 +6,6 @@
 #include <sys/mman.h>	// mprotect
 
 #include "arch.h"	// KERNEL_ADDR etc
-#include "log.h"
 #include "random.h"
 #include "sanitise.h"
 #include "maps.h"

rand/seed.c

@@ -30,7 +30,6 @@
 #include "shm.h"
 #include "params.h"	// 'user_set_seed'
 #include "pids.h"
-#include "log.h"
 #include "random.h"
 #include "utils.h"
 

shm.c

@@ -9,7 +9,6 @@
 #include <sys/mman.h>
 #include "arch.h"
 #include "child.h"
-#include "log.h"
 #include "params.h"
 #include "pids.h"
 #include "random.h"

stats.c

@@ -1,5 +1,5 @@
 #include <errno.h>
-#include "log.h"
+#include "arch.h"
 #include "stats.h"
 #include "syscall.h"
 #include "tables.h"

syscall.c

@@ -5,6 +5,7 @@
 #include <errno.h>
 #include <string.h>
 #include <signal.h>
+#include <unistd.h>
 #include <sys/prctl.h>
 #include <sys/syscall.h>
 #include <sys/types.h>
@@ -20,9 +21,9 @@
 #include "sanitise.h"
 #include "shm.h"
 #include "syscall.h"
-#include "log.h"
 #include "tables.h"
 #include "taint.h"
+#include "trinity.h"
 #include "uid.h"
 #include "utils.h"
 

syscalls/bind.c

@@ -5,7 +5,6 @@
  * On error, -1 is returned, and errno is set appropriately.
  */
 #include <sys/socket.h>
-#include "log.h"
 #include "sanitise.h"
 #include "shm.h"
 

syscalls/futex.c

@@ -14,7 +14,6 @@
 #include "sanitise.h"
 #include "maps.h"
 #include "futex.h"
-#include "log.h"
 
 #define FUTEX_UNLOCKED (0)
 #define FUTEX_LOCKED (!FUTEX_UNLOCKED)

syscalls/perf_event_open.c

@@ -10,7 +10,6 @@
 #include <sys/types.h>
 #include <dirent.h>
 #include <errno.h>
-#include "log.h"
 #include "maps.h"
 #include "perf.h"
 #include "perf_event.h"

syscalls/socket.c

@@ -6,7 +6,6 @@
 #include <sys/socket.h>
 #include "config.h"
 #include "debug.h"
-#include "log.h"
 #include "net.h"
 #include "params.h"
 #include "domains.h"