Conditionalize use of l4 functions on USE_L4.

/

2009-01-16  Neal H. Walfield  <neal@gnu.org>

	* Makefile.am (L4_SUBDIRS): New variable.  Set to l4 directories
	if USE_L4 is true, otherwise leave empty.
	(SUBDIRS): Remove libl4 and laden.  Replace with $(USE_L4).
	Rearrange order.

benchmarks/

2009-01-16  Neal H. Walfield  <neal@gnu.org>

	* activity-distribution.c (main): Use vg_thread_id_t and
	hurd_myself, not l4_thread_id_t and l4_myself.
	[USE_L4]: Only l4_sleep in this case.
	* cache.c (helper_fork): Use hurd_myself, not l4_myself.
	(main) [USE_L4]: Only call _L4_kdb in this case.
	* shared-memory-distribution.c (main): Use vg_thread_id_t and
	hurd_myself, not l4_thread_id_t and l4_myself.

hieronymus/

2009-01-16  Neal H. Walfield  <neal@gnu.org>

	* hieronymus.c (main): Use uint64_t, not l4_uint64_t.
	(main) [USE_L4]: Don't sleep in this case.

hurd/

2009-01-16  Neal H. Walfield  <neal@gnu.org>

	* lock.h (ss_mutex_trace_add) [! USE_L4]: Set SS_LOCK_TRACE[I].TID
	to zero.
	* thread.h (hurd_myself) [USE_L4]: Return l4_myself.
	* trace.h (trace_buffer_add) [! USE_L4 && ! RM_INTERN]: Use
	hurd_myself, not l4_myself.
	[! USE_L4 && RM_INTERN]: Don't print a tid.

libc-parts/

2009-01-16  Neal H. Walfield  <neal@gnu.org>

	* _exit.c (_exit): Use sched_yield, not l4_yield.
	* backtrace.c [USE_L4]: Only include <l4.h> in this case.
	[! RM_INTERN]: Include <hurd/thread.h>.
	(backtrace_print) [! USE_L4 && ! RM_INTERN]: Use hurd_myself to
	get the caller's tid.
	[! USE_L4 && RM_INTERN]: Don't print a tid.
	* ia32-cmain.c [! USE_L4]: Don't include <l4/globals.h>,
	<l4/init.h>, <l4/stubs.h>, or <l4/stubs-init.h>.
	(cmain) [! USE_L4]: Don't call l4_init or l4_init_stubs.
	* loader.c: Don't include <l4.h>.  Include <bits/wordsize.h> and
	<endian.h>.
	(loader_elf_load): Use __WORDSIZE, __BYTE_ORDER, __LITTLE_ENDIAN
	and __BIG_ENDIAN instead of their L4 names.
	* panic.c: Include <viengoos/thread.h>.
	[! RM_INTERN]: Include <hurd/thread.h>.
	(panic_) [! USE_L4 && ! RM_INTERN]: Use hurd_myself, not
	l4_myself.
	[! USE_L4 && RM_INTERN]: Don't print a tid.
	(panic_): Call sched_yield, not l4_yield.
	* process-spawn.c (process_spawn) [! USE_L4]: Don't pass utcb and
	kip information.  Change sp from a l4_word_to to a uintptr_t.
	* profile.c [! USE_L4]: Don't include <l4.h>.
	(now) [__gnu_hurd_viengoos__ && ! USE_L4]: Just return 0.
	(struct profile_block): Change tid to a vg_thread_id_t.
	(MYSELF) [__gnu_hurd_viengoos__ && ! USE_L4]: Just return 0.
	* s_printf.c (io_buffer_flush) [! USE_L4]: Abort.

libhurd-mm/

2009-01-16  Neal H. Walfield  <neal@gnu.org>

	* anonymous.h: Don't include <l4/thread.h>.  Include
	<viengoos/thread.h>.
	(struct anonymous_pager): Change fill_thread's type to
	vg_thread_id_t.
	* anonymous.c (fault): Use hurd_myself and vg_niltid, not
	l4_myself and l4_nilthread.
	* as-build.c: Don't include <l4.h>.
	* as.h: Include <hurd/thread.h>.  Don't include <l4/types.h>.
	(as_lock): Change as_rwlock_owner's type to vg_thread_id_t.  Use
	hurd_myself, not l4_myself.
	(as_lock_readonly): Likewise.
	(as_unlock): Likewise.
	* as.c [! USE_L4]: Don't include <l4/types.h> or <l4/kip.h>.
	Include <bits/wordsize.h>.
	(DATA_ADDR_MAX): Define for 64-bit virtual address spaces.
	(as_rwlock_owner): Change type to vg_thread_id_t.
	(as_alloc_slow) [USE_L4]: Only check for conflicts with the kip
	and utcb in this case.
	(as_init) [USE_L4]: Only reserve the kip and utcb in this case.
	* exceptions.c [USE_L4]: Only include <l4/thread.h> in this case.
	(l4_utcb_state_save) [! USE_L4]: Make a no-op.
	(l4_utcb_state_restore) [! USE_L4]: Likewise.
	(hurd_activation_handler_normal): Use hurd_myself, not l4_myself.
	* map.c: Don't include <l4.h>.
	(map_fault): Use VG_WRITE, not L4_FPAGE_WRITABLE.
	* storage.c (storage_check_reserve_internal): Change
	as_rwlock_owner's type to vg_thread_id_t.

libpthread/

2009-01-16  Neal H. Walfield  <neal@gnu.org>

	* sysdeps/viengoos/pt-spin.c [USE_L4]: Only include <l4.h> in this
	case.
	(_pthread_spin_lock): Only implement exponential back off if a
	sleep function is available.
	* sysdeps/viengoos/pt-stack-alloc.c: Don't include <l4.h>.
	* sysdeps/viengoos/pt-sysdep.c (sched_yield) [! USE_L4]: Just
	return.
	(init_routine) [USE_L4]: Abort.
	* sysdeps/viengoos/pt-sysdep.h [USE_L4]: Only include <l4.h> in
	this case.
	(_pthread_self) [! USE_L4]: Abort.
	* sysdeps/viengoos/pt-thread-alloc.c (__pthread_thread_alloc): Use
	hurd_myself, not l4_myself.
	[! USE_L4]: Abort.
	* sysdeps/viengoos/pt-thread-start.c (__pthread_thread_start): Use
	hurd_myself, not l4_myself.  use uintptr_t, not l4_word_t.
	* sysdeps/viengoos/sig-sysdep.h (SIGNAL_DISPATCH_ENTRY)
	[! USE_L4]: Abort.
	(SIGNAL_DISPATCH_EXIT) [! USE_L4]: Likewise.

libviengoos/

2009-01-16  Neal H. Walfield  <neal@gnu.org>

	* viengoos/thread.h (VG_READ): Define.
	(VG_WRITE): Define.
	(VG_EXECUTE): Likewise.
	(VG_ACTIVATION_FAULT_INFO_PRINTF): Use them.

ruth/

2009-01-16  Neal H. Walfield  <neal@gnu.org>

	* ruth.c [USE_L4]: Only include <l4.h> in this case.
	(main) [! USE_L4]: Don't print resource manager's thread id.
	(main): Use uintptr_t, not l4_word_t.  Use hurd_myself, not
	l4_myself.  Use sched_yield, not l4_yield.  Improve
	synchronization for object_reply_on_destruction test in case
	sched_yield is a no-op.

viengoos/

2009-01-16  Neal H. Walfield  <neal@gnu.org>

	* cap.h: Don't include <l4.h>.
	* mutex.h [USE_L4]: Only include <l4/thread.h> in this case.
	(ss_mutex_t) [! USE_L4]: Define to be an int.
	(ss_mutex_lock) [! USE_L4]: Make a no-op.
	(ss_mutex_unlock) [! USE_L4]: Likewise.
	(ss_mutex_trylock) [! USE_L4]: Likewise.
	* object.h [USE_L4]: Only include <l4.h> in this case.
	(object_desc_unmap) [! USE_L4]: Make a no-op.
	(object_desc_flush) [! USE_L4]: Likewise.
	* thread.h: Don't include <l4.h>.
	(struct thread): Make tid a vg_thread_id_t, not an l4_thread_id_t.
	(thread_lookup): Make threadid a vg_thread_id_t, not an
	l4_thread_id_t.

1 files changed, 15 insertions, 24 deletions

diff --git a/libhurd-mm/storage.c b/libhurd-mm/storage.c
index 585b9d9..433bf4c 100644
--- a/libhurd-mm/storage.c
+++ b/libhurd-mm/storage.c
@@ -390,7 +390,7 @@ storage_check_reserve_internal (bool force_allocate,
        pages and if not to call some as-yet unwritten function
        which forces the reserve to grow.  */
     {
-      extern l4_thread_id_t as_rwlock_owner;
+      extern vg_thread_id_t as_rwlock_owner;
       if (as_rwlock_owner)
 	{
 	  if (as_rwlock_owner == hurd_myself ())
@@ -738,23 +738,6 @@ storage_free_ (vg_addr_t object, bool unmap_now)
 
   ss_mutex_lock (&storage_descs_lock);
 
-  {
-    int cnt = 0;
-    struct storage_desc *desc;
-    for (desc = hurd_btree_storage_desc_first (&storage_descs);
-	 desc;
-	 desc = hurd_btree_storage_desc_next (desc))
-      cnt += desc->free;
-
-    if (cnt != free_count)
-      for (desc = hurd_btree_storage_desc_first (&storage_descs);
-	   desc;
-	   desc = hurd_btree_storage_desc_next (desc))
-	debug (0, "Folio at " VG_ADDR_FMT " %d free",
-	       VG_ADDR_PRINTF (desc->folio), desc->free);
-    assertx (cnt == free_count, "%d != %d", cnt, free_count);
-  }
-
   /* Find the storage descriptor.  */
   struct storage_desc *storage;
   storage = hurd_btree_storage_desc_find (&storage_descs, &folio);
@@ -810,7 +793,8 @@ storage_free_ (vg_addr_t object, bool unmap_now)
 	      vg_addr_t shadow_addr = vg_addr_chop (VG_PTR_TO_ADDR (shadow),
 					      PAGESIZE_LOG2);
 
-	      if (VG_ADDR_EQ (vg_addr_chop (shadow_addr, VG_FOLIO_OBJECTS_LOG2), folio))
+	      if (VG_ADDR_EQ (vg_addr_chop (shadow_addr,
+					    VG_FOLIO_OBJECTS_LOG2), folio))
 		{
 		  /* The shadow was allocate from ourself, which we
 		     already freed.  */
@@ -848,11 +832,18 @@ storage_free_ (vg_addr_t object, bool unmap_now)
   int idx = vg_addr_extract (object, VG_FOLIO_OBJECTS_LOG2);
   bit_dealloc (storage->alloced, idx);
 
-  error_t err = vg_folio_object_alloc (meta_data_activity,
-				       folio, idx, vg_cap_void,
-				       VG_OBJECT_POLICY_DEFAULT, 0,
-				       NULL, NULL);
-  assert (err == 0);
+  if (unmap_now
+#ifndef NDEBUG
+      || 1
+#endif
+      )
+    {
+      error_t err = vg_folio_object_alloc (meta_data_activity,
+					   folio, idx, vg_cap_void,
+					   VG_OBJECT_POLICY_DEFAULT, 0,
+					   NULL, NULL);
+      assert (err == 0);
+    }
 
   if (likely (!! shadow))
     {