1 files changed, 4 insertions, 44 deletions

diff --git a/runtime/stpd/stpd.c b/runtime/stpd/stpd.c
index 881556cc..c31019d7 100644
--- a/runtime/stpd/stpd.c
+++ b/runtime/stpd/stpd.c
@@ -25,65 +25,39 @@
 #include <unistd.h>
 #include "librelay.h"
 
- /* packet logging output written here, filebase0...N */
-static char *stpd_outfilebase = "stpd_cpu";
-
-#define DEFAULT_SUBBUF_SIZE (262144)
-#define DEFAULT_N_SUBBUFS (4)
-static unsigned subbuf_size = DEFAULT_SUBBUF_SIZE;
-static unsigned n_subbufs = DEFAULT_N_SUBBUFS;
-
 extern char *optarg;
 extern int optopt;
 extern int optind;
 
 int print_only = 0;
 int quiet = 0;
-int streaming = 1;
+int transport_mode = 0;
 
  /* relayfs base file name */
 static char stpd_filebase[1024];
 
 static void usage(char *prog)
 {
-	fprintf(stderr, "%s [-p] [-q] [-b subbuf_size -n n_subbufs] kmod-name\n", prog);
+	fprintf(stderr, "%s [-p] [-q] kmod-name\n", prog);
 	fprintf(stderr, "-p  Print only.  Don't log to files.\n");
 	fprintf(stderr, "-q  Quiet. Don't display trace to stdout.\n");
-	fprintf(stderr, "-r  Use relayfs for buffering i.e. non-streaming mode.\n");
-	fprintf(stderr, "-b subbuf_size  (default is %d)\n", DEFAULT_SUBBUF_SIZE);
-	fprintf(stderr, "-n subbufs  (default is %d)\n", DEFAULT_N_SUBBUFS);
 	exit(1);
 }
 
 int main(int argc, char **argv)
 {
 	int c;
-	unsigned opt_subbuf_size = 0;
-	unsigned opt_n_subbufs = 0;
 	char *modname = NULL;
 
-	while ((c = getopt(argc, argv, "b:n:pqr")) != EOF) 
+	while ((c = getopt(argc, argv, "pq")) != EOF) 
 	{
 		switch (c) {
-		case 'b':
-			opt_subbuf_size = (unsigned)atoi(optarg);
-			if (!opt_subbuf_size)
-				usage(argv[0]);
-			break;
-		case 'n':
-			opt_n_subbufs = (unsigned)atoi(optarg);
-			if (!opt_n_subbufs)
-				usage(argv[0]);
-			break;
 		case 'p':
 			print_only = 1;
 			break;
 		case 'q':
 			quiet = 1;
 			break;
-		case 'r':
-			streaming = 0;
-			break;
 		default:
 			usage(argv[0]);
 		}
@@ -101,27 +75,13 @@ int main(int argc, char **argv)
 		fprintf (stderr, "Cannot do \"-p\" and \"-q\" both.\n");
 		usage(argv[0]);
 	}
-  
-	if ((opt_n_subbufs && !opt_subbuf_size) ||
-	    (!opt_n_subbufs && opt_subbuf_size))
-		usage(argv[0]);
-	
-	if (opt_n_subbufs && opt_n_subbufs) {
-		subbuf_size = opt_subbuf_size;
-		n_subbufs = opt_n_subbufs;
-	}
 
 	sprintf(stpd_filebase, "/mnt/relay/%d/cpu", getpid());
-	if (init_stp(modname, stpd_filebase, stpd_outfilebase,
-		     subbuf_size, n_subbufs, 1)) {
+	if (init_stp(modname, stpd_filebase, 1)) {
 		fprintf(stderr, "Couldn't initialize stpd. Exiting.\n");
 		exit(1);
 	}
 
-	if (!streaming)
-		printf("Creating channel with %u sub-buffers of size %u.\n",
-		       n_subbufs, subbuf_size);
-
 	if (quiet)
 		printf("Logging... Press Control-C to stop.\n");
 	else