From 5b2bb5eb687441555f28f336f22d283e41d079fa Mon Sep 17 00:00:00 2001
From: hunt <hunt>
Date: Mon, 18 Sep 2006 16:52:14 +0000
Subject: 2006-09-18  Martin Hunt  <hunt@redhat.com>

	* transport_msgs.h (struct transport_info): Add merge field.
	* transport.c (_stp_transport_open): Set merge field.
---
 runtime/transport/ChangeLog        | 5 +++++
 runtime/transport/transport.c      | 9 ++++++++-
 runtime/transport/transport_msgs.h | 1 +
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/runtime/transport/ChangeLog b/runtime/transport/ChangeLog
index 693df55d..81618d7b 100644
--- a/runtime/transport/ChangeLog
+++ b/runtime/transport/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-18  Martin Hunt  <hunt@redhat.com>
+
+	* transport_msgs.h (struct transport_info): Add merge field.
+	* transport.c (_stp_transport_open): Set merge field.
+
 2006-06-21  Josh Stone  <joshua.i.stone@intel.com>
 
 	PR 2525
diff --git a/runtime/transport/transport.c b/runtime/transport/transport.c
index 55bb4ca2..c9be3311 100644
--- a/runtime/transport/transport.c
+++ b/runtime/transport/transport.c
@@ -152,8 +152,9 @@ static void _stp_cleanup_and_exit (int dont_rmmod)
 		kbug("transport_send STP_EXIT\n");
 		_stp_transport_send(STP_EXIT, &dont_rmmod, sizeof(int));
 		kbug("done with transport_send STP_EXIT\n");
+
+		_stp_kill_time();
 	}
-	_stp_kill_time();
 }
 
 /*
@@ -227,6 +228,8 @@ int _stp_transport_open(struct transport_info *info)
 	kbug ("stp_transport_open: %d Mb buffer. target=%d\n", info->buf_size, info->target);
 
 	info->transport_mode = _stp_transport_mode;
+	info->merge = 0;
+
 	kbug("transport_mode=%d\n", info->transport_mode);
 	_stp_target = info->target;
 
@@ -240,6 +243,10 @@ int _stp_transport_open(struct transport_info *info)
 		info->n_subbufs = n_subbufs;
 		info->subbuf_size = subbuf_size;
 
+#ifdef STP_RELAYFS_MERGE
+		info->merge = 1;
+#endif
+
 #if defined (CONFIG_RELAY)
 		_stp_chan = _stp_relayfs_open(n_subbufs, subbuf_size, _stp_pid, &_stp_dir, module_dir_dentry);
 #else
diff --git a/runtime/transport/transport_msgs.h b/runtime/transport/transport_msgs.h
index c27b8002..a060b414 100644
--- a/runtime/transport/transport_msgs.h
+++ b/runtime/transport/transport_msgs.h
@@ -38,6 +38,7 @@ struct transport_info
 	unsigned subbuf_size;
 	unsigned n_subbufs;
 	int transport_mode;
+	int merge;		// merge relayfs output?
 	int target;		// target pid
 #if 0
 	char cmd[256];		// cmd to process data
-- 
cgit