2007-03-14 Martin Hunt <hunt@redhat.com>

	* staprun.c: Renamed from stpd.c. Removed quiet and print_only
	options. Added "-x" option as an alias for "-t". Removed "-m"
	option. Updated arg processing to leave 4 slots for modoptions[].
	Bump the priority of staprun.
	* ctl.c: New. Transport control channel functions.
	* relay.c: New. Relayfs control functions for new transport.
	* relay_old.c: New. Relayfs control functions for older
	versions of relayfs.
	* mainloop.c: New. Staprun main loop.
	* staprun.h: Renamed from librelay.h. Cleaned up.

	* stap_merge.c: Renamed. Updated for modified save format.

1 files changed, 91 insertions, 0 deletions

diff --git a/runtime/staprun/staprun.h b/runtime/staprun/staprun.h
new file mode 100644
index 00000000..d8664802
--- /dev/null
+++ b/runtime/staprun/staprun.h
@@ -0,0 +1,91 @@
+/* -*- linux-c -*-
+ *
+ * staprun.h - include file for staprun
+ *
+ * This file is part of systemtap, and is free software.  You can
+ * redistribute it and/or modify it under the terms of the GNU General
+ * Public License (GPL); either version 2, or (at your option) any
+ * later version.
+ *
+ * Copyright (C) 2005-2007 Red Hat Inc.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include <unistd.h>
+#include <dirent.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <string.h>
+#include <stdint.h>
+#include <signal.h>
+#include <sys/ioctl.h>
+#include <errno.h>
+#include <linux/fd.h>
+#include <sys/mman.h>
+#include <sys/poll.h>
+#include <pthread.h>
+#include <sys/socket.h>
+#include <linux/types.h>
+#include <linux/limits.h>
+#include <sys/wait.h>
+#include <sys/statfs.h>
+#include <linux/version.h>
+
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15)
+#define STP_OLD_TRANSPORT
+#endif
+#include "../transport/transport_msgs.h"
+
+
+#define RELAYFS_MAGIC			0xF0B4A981
+#define DEBUGFS_MAGIC			0x64626720
+
+#ifdef DEBUG
+#define dbug(args...) {fprintf(stderr,"%s:%d ",__FUNCTION__, __LINE__); fprintf(stderr,args); }
+#else
+#define dbug(args...) ;
+#endif /* DEBUG */
+
+/*
+ * function prototypes
+ */
+int init_staprun(void);
+int stp_main_loop(void);
+int send_request(int type, void *data, int len);
+void cleanup_and_exit (int);
+int do_module(void *);
+void do_kernel_symbols(void);
+int init_ctl_channel(void);
+int init_relayfs(struct _stp_msg_trans *);
+void close_relayfs(void);
+void close_ctl_channel(void);
+
+/*
+ * variables 
+ */
+extern int control_channel;
+extern int ncpus;
+
+/* flags */
+extern int verbose;
+extern unsigned int buffer_size;
+extern char *modname;
+extern char *modpath;
+extern char *modoptions[];
+extern int target_pid;
+extern int driver_pid;
+extern char *target_cmd;
+extern char *outfile_name;
+
+/* uid/gid to use when execing external programs */
+extern uid_t cmd_uid;
+extern gid_t cmd_gid;
+
+/* maximum number of CPUs we can handle */
+#define NR_CPUS 256
+
+/* output fd's (percpu) */
+extern int out_fd[NR_CPUS];