Handle and preserve segments - kernel bug?

[Christian Helmuth]

Hi,

On Wed, Jun 29, 2005 at 02:37:28PM +0200, Emanuel Thomas wrote:
> The new dmon package in the cvs requires a petze package which is not 
> available (yet ?).

Fixed it in local CVS by disabling Petze support by default (patch
attached). It will be in remote CVS soon.

Regards
-- 
Christian Helmuth

TU Dresden, Dept. of CS
Operating Systems Group
http://os.inf.tu-dresden.de/~ch12
-------------- next part --------------
Index: dmon/server/src/dumper.c
===================================================================
RCS file: /home/cvs/l4/pkg/dmon/server/src/dumper.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- dmon/server/src/dumper.c	1 Oct 2004 13:35:08 -0000	1.1
+++ dmon/server/src/dumper.c	29 Jun 2005 14:40:51 -0000	1.2
@@ -27,13 +27,19 @@
 #define WITH_TMPFS 0
 #endif
 
+#ifndef WITH_PETZE
+#define WITH_PETZE 0
+#endif
+
 /* support these servers */
 #include <l4/rmgr/librmgr.h>
 #include <l4/names/libnames.h>
 #include <l4/events/events.h>
 #include <l4/generic_ts/generic_ts.h>
 #include <l4/loader/loader-client.h>
+#if WITH_PETZE
 #include <l4/petze/petze-client.h>
+#endif
 #if WITH_TMPFS
 #include <l4/tmpfs/tmpfs.h>
 #include <l4/tmpfs/tmpfs-client.h>
@@ -60,8 +66,10 @@ enum {
 static long app_id;
 static int loader_try;
 static l4_threadid_t loader_id = L4_INVALID_ID;
+#if WITH_PETZE
 static int petze_try;
 static l4_threadid_t petze_id = L4_INVALID_ID;
+#endif
 #if WITH_TMPFS
 static int tmpfs_try;
 static l4_threadid_t tmpfs_id = L4_INVALID_ID;
@@ -279,7 +287,9 @@ static void dump_callback(dope_event *ev
 {
 	char *msg = NULL;
 	int what = (int)priv;
+#if WITH_PETZE || WITH_TMPFS
 	CORBA_Environment env = dice_default_environment;
+#endif
 
 	LOG_printf("===] "APP_NAME" [===================="
 	           "======================================\n");
@@ -318,6 +328,8 @@ static void dump_callback(dope_event *ev
 		break;
 
 	case DUMP_PETZE:
+#if WITH_PETZE
+#warning compiling with PETZE support
 		if (petze_try < 3) {
 			names_waitfor_name("Petze", &petze_id, 1000);
 			petze_try++;
@@ -332,6 +344,9 @@ static void dump_callback(dope_event *ev
 		 * void petze_reset_call(const_CORBA_Object _dice_corba_obj,
 		 *                       CORBA_Environment *_dice_corba_env);
 		 */
+#else
+		msg = "Petze not supported by this version";
+#endif
 		break;
 
 	case DUMP_TMPFS: