Add a "vg_" to public viengoos identifiers.

2008-12-17  Neal H. Walfield  <neal@gnu.org>

	* viengoos/activity.h: Add a "vg_" to public viengoos identifiers.
	Update users.
	* viengoos/addr-trans.h: Likewise.
	* viengoos/addr.h: Likewise.
	* viengoos/cap.h: Likewise.
	* viengoos/folio.h: Likewise.
	* viengoos/futex.h: Likewise.
	* viengoos/rpc.h: Likewise.
	* viengoos/thread.h: Likewise.

9 files changed, 33 insertions, 33 deletions

diff --git a/libpthread/sysdeps/viengoos/bits/pthread-np.h b/libpthread/sysdeps/viengoos/bits/pthread-np.h
index 9986a62..a38f4a7 100644
--- a/libpthread/sysdeps/viengoos/bits/pthread-np.h
+++ b/libpthread/sysdeps/viengoos/bits/pthread-np.h
@@ -27,7 +27,7 @@
 #include <viengoos/addr.h>
 #include <hurd/thread.h>
 
-int pthread_setactivity_np (addr_t activity);
+int pthread_setactivity_np (vg_addr_t activity);
 
 /* Returns the caller's activation state block.  */
 struct hurd_utcb *pthread_hurd_utcb_np (void) __attribute__ ((pure));
diff --git a/libpthread/sysdeps/viengoos/ia32/signal-dispatch-lowlevel.c b/libpthread/sysdeps/viengoos/ia32/signal-dispatch-lowlevel.c
index 091815b..bbb4ae4 100644
--- a/libpthread/sysdeps/viengoos/ia32/signal-dispatch-lowlevel.c
+++ b/libpthread/sysdeps/viengoos/ia32/signal-dispatch-lowlevel.c
@@ -125,14 +125,14 @@ signal_dispatch_lowlevel (struct signal_state *ss, pthread_t tid,
       struct hurd_thread_exregs_out out;
 
       error_t err;
-      err = rm_thread_exregs (ADDR_VOID, thread->object,
+      err = rm_thread_exregs (VG_ADDR_VOID, thread->object,
 			      HURD_EXREGS_STOP | HURD_EXREGS_ABORT_IPC
 			      | HURD_EXREGS_GET_REGS,
-			      in, ADDR_VOID, ADDR_VOID, ADDR_VOID, ADDR_VOID,
+			      in, VG_ADDR_VOID, VG_ADDR_VOID, VG_ADDR_VOID, VG_ADDR_VOID,
 			      &out, NULL, NULL, NULL, NULL);
       if (err)
-	panic ("Failed to modify thread " ADDR_FMT,
-	       ADDR_PRINTF (thread->object));
+	panic ("Failed to modify thread " VG_ADDR_FMT,
+	       VG_ADDR_PRINTF (thread->object));
 
       intr_sp = out.sp;
 
@@ -207,10 +207,10 @@ signal_dispatch_lowlevel (struct signal_state *ss, pthread_t tid,
       in.sp = sp;
       in.ip = (uintptr_t) &_signal_dispatch_entry;
 
-      rm_thread_exregs (ADDR_VOID, thread->object,
+      rm_thread_exregs (VG_ADDR_VOID, thread->object,
 			HURD_EXREGS_SET_SP_IP
 			| HURD_EXREGS_START | HURD_EXREGS_ABORT_IPC,
-			in, ADDR_VOID, ADDR_VOID, ADDR_VOID, ADDR_VOID,
+			in, VG_ADDR_VOID, VG_ADDR_VOID, VG_ADDR_VOID, VG_ADDR_VOID,
 			&out, NULL, NULL, NULL, NULL);
     }
 }
diff --git a/libpthread/sysdeps/viengoos/pt-block.c b/libpthread/sysdeps/viengoos/pt-block.c
index 8e6a17f..e9a82ff 100644
--- a/libpthread/sysdeps/viengoos/pt-block.c
+++ b/libpthread/sysdeps/viengoos/pt-block.c
@@ -34,7 +34,7 @@ __pthread_block (struct __pthread *thread)
   thread->lock_message_buffer = NULL;
 #endif
 
-  futex_wait_using (mb, &thread->threadid, thread->threadid);
+  vg_futex_wait_using (mb, &thread->threadid, thread->threadid);
 
 #ifndef NDEBUG
   thread->lock_message_buffer = mb;
diff --git a/libpthread/sysdeps/viengoos/pt-setactivity-np.c b/libpthread/sysdeps/viengoos/pt-setactivity-np.c
index db695b9..5894ad7 100644
--- a/libpthread/sysdeps/viengoos/pt-setactivity-np.c
+++ b/libpthread/sysdeps/viengoos/pt-setactivity-np.c
@@ -23,15 +23,15 @@
 #include <viengoos/thread.h>
 
 int
-pthread_setactivity_np (addr_t activity)
+pthread_setactivity_np (vg_addr_t activity)
 {
   struct __pthread *self = _pthread_self ();
 
   struct hurd_thread_exregs_in in;
   struct hurd_thread_exregs_out out;
-  int err = rm_thread_exregs (ADDR_VOID, self->object,
+  int err = rm_thread_exregs (VG_ADDR_VOID, self->object,
 			      HURD_EXREGS_SET_ACTIVITY,
-			      in, ADDR_VOID, activity, ADDR_VOID, ADDR_VOID,
+			      in, VG_ADDR_VOID, activity, VG_ADDR_VOID, VG_ADDR_VOID,
 			      &out, NULL, NULL, NULL, NULL);
 
   return err;
diff --git a/libpthread/sysdeps/viengoos/pt-sysdep.h b/libpthread/sysdeps/viengoos/pt-sysdep.h
index 15e0a03..b276b87 100644
--- a/libpthread/sysdeps/viengoos/pt-sysdep.h
+++ b/libpthread/sysdeps/viengoos/pt-sysdep.h
@@ -34,7 +34,7 @@
 #include <hurd/message-buffer.h>
 
 #define PTHREAD_SYSDEP_MEMBERS					\
-  addr_t object;						\
+  vg_addr_t object;						\
   vg_thread_id_t threadid;					\
   struct hurd_utcb *utcb;					\
   struct hurd_message_buffer *lock_message_buffer;		\
diff --git a/libpthread/sysdeps/viengoos/pt-thread-alloc.c b/libpthread/sysdeps/viengoos/pt-thread-alloc.c
index 3c7df34..a65024f 100644
--- a/libpthread/sysdeps/viengoos/pt-thread-alloc.c
+++ b/libpthread/sysdeps/viengoos/pt-thread-alloc.c
@@ -31,7 +31,7 @@
 
 extern struct hurd_startup_data *__hurd_startup_data;
 
-extern addr_t meta_data_activity;
+extern vg_addr_t meta_data_activity;
 
 int
 __pthread_thread_alloc (struct __pthread *thread)
@@ -58,11 +58,11 @@ __pthread_thread_alloc (struct __pthread *thread)
   else
     {
       struct storage storage;
-      storage = storage_alloc (meta_data_activity, cap_thread,
+      storage = storage_alloc (meta_data_activity, vg_cap_thread,
 			       /* Threads are rarely shortly lived.  */
-			       STORAGE_MEDIUM_LIVED, OBJECT_POLICY_DEFAULT,
-			       ADDR_VOID);
-      if (ADDR_IS_VOID (storage.addr))
+			       STORAGE_MEDIUM_LIVED, VG_OBJECT_POLICY_DEFAULT,
+			       VG_ADDR_VOID);
+      if (VG_ADDR_IS_VOID (storage.addr))
 	{
 	  debug (0, DEBUG_BOLD ("Out of memory"));
 	  return EAGAIN;
@@ -75,20 +75,20 @@ __pthread_thread_alloc (struct __pthread *thread)
       if (unlikely (err))
 	panic ("Failed to initialize thread's activation state: %d", err);
 
-      err = rm_cap_copy (ADDR_VOID,
+      err = rm_cap_copy (VG_ADDR_VOID,
 			 thread->lock_message_buffer->receiver,
-			 ADDR (VG_MESSENGER_THREAD_SLOT,
+			 VG_ADDR (VG_MESSENGER_THREAD_SLOT,
 			       VG_MESSENGER_SLOTS_LOG2),
-			 ADDR_VOID, thread->object,
-			 0, CAP_PROPERTIES_DEFAULT);
+			 VG_ADDR_VOID, thread->object,
+			 0, VG_CAP_PROPERTIES_DEFAULT);
       if (err)
 	panic ("Failed to set lock messenger's thread");
 
       /* Unblock the lock messenger.  */
       err = vg_ipc (VG_IPC_RECEIVE | VG_IPC_RECEIVE_ACTIVATE
 		    | VG_IPC_RETURN,
-		    ADDR_VOID, thread->lock_message_buffer->receiver, ADDR_VOID,
-		    ADDR_VOID, ADDR_VOID, ADDR_VOID, ADDR_VOID);
+		    VG_ADDR_VOID, thread->lock_message_buffer->receiver, VG_ADDR_VOID,
+		    VG_ADDR_VOID, VG_ADDR_VOID, VG_ADDR_VOID, VG_ADDR_VOID);
       if (err)
 	panic ("Failed to unblock messenger's thread");
     }
diff --git a/libpthread/sysdeps/viengoos/pt-thread-halt.c b/libpthread/sysdeps/viengoos/pt-thread-halt.c
index d721500..ba9f2b0 100644
--- a/libpthread/sysdeps/viengoos/pt-thread-halt.c
+++ b/libpthread/sysdeps/viengoos/pt-thread-halt.c
@@ -42,10 +42,10 @@ __pthread_thread_halt (struct __pthread *thread)
 	}
       else
 	{
-	  error_t err = thread_stop (thread->object);
+	  error_t err = vg_thread_stop (thread->object);
 	  if (err)
-	    panic ("Failed to halt " ADDR_FMT ": %d",
-		   ADDR_PRINTF (thread->object), err);
+	    panic ("Failed to halt " VG_ADDR_FMT ": %d",
+		   VG_ADDR_PRINTF (thread->object), err);
 	}
     }
 }
diff --git a/libpthread/sysdeps/viengoos/pt-thread-start.c b/libpthread/sysdeps/viengoos/pt-thread-start.c
index f4478ac..6a9fc90 100644
--- a/libpthread/sysdeps/viengoos/pt-thread-start.c
+++ b/libpthread/sysdeps/viengoos/pt-thread-start.c
@@ -41,24 +41,24 @@ __pthread_thread_start (struct __pthread *thread)
       struct hurd_thread_exregs_in in;
       struct hurd_thread_exregs_out out;
 
-      addr_t aspace = ADDR (0, 0);
-      in.aspace_cap_properties = CAP_PROPERTIES_VOID;
-      in.aspace_cap_properties_flags = CAP_COPY_COPY_SOURCE_GUARD;
+      vg_addr_t aspace = VG_ADDR (0, 0);
+      in.aspace_cap_properties = VG_CAP_PROPERTIES_VOID;
+      in.aspace_cap_properties_flags = VG_CAP_COPY_COPY_SOURCE_GUARD;
 
-      addr_t activity = ADDR_VOID;
+      vg_addr_t activity = VG_ADDR_VOID;
 
       in.sp = (l4_word_t) thread->mcontext.sp;
       in.ip = (l4_word_t) thread->mcontext.pc;
 
       in.user_handle = (l4_word_t) thread;
-      err = rm_thread_exregs (ADDR_VOID, thread->object,
+      err = rm_thread_exregs (VG_ADDR_VOID, thread->object,
 			      HURD_EXREGS_SET_ASPACE
 			      | HURD_EXREGS_SET_ACTIVITY
 			      | HURD_EXREGS_SET_SP_IP
 			      | HURD_EXREGS_SET_USER_HANDLE
 			      | HURD_EXREGS_START
 			      | HURD_EXREGS_ABORT_IPC,
-			      in, aspace, activity, ADDR_VOID, ADDR_VOID,
+			      in, aspace, activity, VG_ADDR_VOID, VG_ADDR_VOID,
 			      &out, NULL, NULL, NULL, NULL);
       assert (err == 0);
     }
diff --git a/libpthread/sysdeps/viengoos/pt-wakeup.c b/libpthread/sysdeps/viengoos/pt-wakeup.c
index 6435689..4bd51b4 100644
--- a/libpthread/sysdeps/viengoos/pt-wakeup.c
+++ b/libpthread/sysdeps/viengoos/pt-wakeup.c
@@ -40,7 +40,7 @@ __pthread_wakeup (struct __pthread *thread)
   long ret;
   do
     {
-      ret = futex_wake_using (self->lock_message_buffer,
+      ret = vg_futex_wake_using (self->lock_message_buffer,
 			      &thread->threadid, INT_MAX);
       assertx (ret <= 1, "tid: %x, ret: %d", thread->threadid, ret);