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

	* staprun.h (VERSION_CMD): Command to use for version check.
	Changes to support runtime decision on new or old transport.
	* mainloop.c (init_staprun): Check the kernel version at runtime
	instead of at compile time.
	(cleanup_and_exit): Call the correct relayfs close function.
	(stp_main_loop): Call the correct relayfs init function.
	* relay.c: Remove ifdef wrapper. File is always compiled and used
	if the kernel version is appropriate.
	* relay_old.c: Ditto.

1 files changed, 0 insertions, 119 deletions

diff --git a/runtime/staprun/stp_merge.c~ b/runtime/staprun/stp_merge.c~
deleted file mode 100644
index b67b4171..00000000
--- a/runtime/staprun/stp_merge.c~
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * stp_merge.c - stp merge program
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * Copyright (C) Red Hat Inc, 2005
- *
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <errno.h>
-
-static void usage (char *prog)
-{
-	fprintf(stderr, "%s [-o output_filename] input_files ...\n", prog);
-	exit(1);
-}
-
-#define TIMESTAMP_SIZE (sizeof(int))
-#define NR_CPUS 256
-
-int main (int argc, char *argv[])
-{
-	char *outfile_name = NULL;
-	char buf[8192];
-	int c, i, j, dropped=0;
-	long count=0, min, num[NR_CPUS];
-	FILE *ofp, *fp[NR_CPUS];
-	int ncpus, len;
-
-	while ((c = getopt (argc, argv, "o:")) != EOF)  {
-		switch (c) {
-		case 'o':
-			outfile_name = optarg;
-			break;
-		default:
-			usage(argv[0]);
-		}
-	}
-	
-	if (optind == argc)
-		usage (argv[0]);
-
-	i = 0;
-	while (optind < argc) {
-		fp[i] = fopen(argv[optind++], "r");
-		if (!fp[i]) {
-			fprintf(stderr, "error opening file %s.\n", argv[optind - 1]);
-			return -1;
-		}
-		if (fread (buf, TIMESTAMP_SIZE, 1, fp[i]))
-			num[i] = *((int *)buf);
-		else
-			num[i] = 0;
-		i++;
-	}
-	ncpus = i;
-
-	if (!outfile_name)
-		ofp = stdout;
-	else {
-		ofp = fopen(outfile_name, "w");	
-		if (!ofp) {
-			fprintf(stderr, "ERROR: couldn't open output file %s: errcode = %s\n", 
-				outfile_name, strerror(errno));
-			return -1;
-		}
-	}
-	
-	do {
-		min = num[0];
-		j = 0;
-		for (i = 1; i < ncpus; i++) {
-			if (min == 0 || (num[i] && num[i] < min)) {
-				min = num[i];
-				j = i;
-			}
-		}
-
-		if (fread(&len, sizeof(int), 1, fp[j])) {
-		  fread(buf, len, 1, fp[j]);
-		  fwrite(buf, len, 1, ofp);
-		}
-
-		if (min && ++count != min) {
-			fprintf(stderr, "got %ld. expected %ld\n", min, count);
-			dropped += min - count ;
-			count = min;
-		}
-
-		if (fread (buf, TIMESTAMP_SIZE, 1, fp[j]))
-			num[j] = *((int *)buf);
-		else
-			num[j] = 0;
-	} while (min);
-
-	fputs ("\n", ofp);
-
-	for (i = 0; i < ncpus; i++)
-		fclose (fp[i]);
-	fclose (ofp);
-	printf ("sequence had %d drops\n", dropped);
-	return 0;
-}