[svn:parrot] r40567 - branches/pmc_sans_unionval/src/gc

[whiteknight at svn.parrot.org]

Author: whiteknight
Date: Sat Aug 15 14:18:11 2009
New Revision: 40567
URL: https://trac.parrot.org/parrot/changeset/40567

Log:
[pmc_sans_unionval] reheaderize things for great justice

Modified:
   branches/pmc_sans_unionval/src/gc/alloc_resources.c
   branches/pmc_sans_unionval/src/gc/gc_private.h

Modified: branches/pmc_sans_unionval/src/gc/alloc_resources.c
==============================================================================
--- branches/pmc_sans_unionval/src/gc/alloc_resources.c	Sat Aug 15 14:11:44 2009	(r40566)
+++ branches/pmc_sans_unionval/src/gc/alloc_resources.c	Sat Aug 15 14:18:11 2009	(r40567)
@@ -54,6 +54,17 @@
         __attribute__nonnull__(1)
         __attribute__nonnull__(2);
 
+static void check_memory_pool(ARGMOD(Memory_Pool *pool))
+        __attribute__nonnull__(1)
+        FUNC_MODIFIES(*pool);
+
+static void check_memory_system(PARROT_INTERP)
+        __attribute__nonnull__(1);
+
+static void check_small_object_pool(ARGMOD(Small_Object_Pool * pool))
+        __attribute__nonnull__(1)
+        FUNC_MODIFIES(* pool);
+
 static void debug_print_buf(PARROT_INTERP, ARGIN(const Buffer *b))
         __attribute__nonnull__(1)
         __attribute__nonnull__(2);
@@ -71,6 +82,12 @@
 #define ASSERT_ARGS_buffer_location __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(b)
+#define ASSERT_ARGS_check_memory_pool __attribute__unused__ int _ASSERT_ARGS_CHECK = \
+       PARROT_ASSERT_ARG(pool)
+#define ASSERT_ARGS_check_memory_system __attribute__unused__ int _ASSERT_ARGS_CHECK = \
+       PARROT_ASSERT_ARG(interp)
+#define ASSERT_ARGS_check_small_object_pool __attribute__unused__ int _ASSERT_ARGS_CHECK = \
+       PARROT_ASSERT_ARG(pool)
 #define ASSERT_ARGS_debug_print_buf __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(b)
@@ -727,7 +744,7 @@
 
 /*
 
-=item C<void check_memory_system(PARROT_INTERP)>
+=item C<static void check_memory_system(PARROT_INTERP)>
 
 Checks the memory system of parrot on any corruptions, including
 the string system.
@@ -759,7 +776,7 @@
 
 /*
 
-=item C<void check_small_object_pool(Small_Object_Pool * pool)>
+=item C<static void check_small_object_pool(Small_Object_Pool * pool)>
 
 Checks a small object pool, if it contains buffer it checks the buffers also.
 
@@ -838,7 +855,7 @@
 
 /*
 
-=item C<void check_memory_pool(Memory_Pool *pool)>
+=item C<static void check_memory_pool(Memory_Pool *pool)>
 
 Checks a memory pool, containing buffer data
 
@@ -871,7 +888,7 @@
 
 /*
 
-=item C<void check_buffer_ptr(Buffer * pobj,Memory_Pool * pool)>
+=item C<void check_buffer_ptr(Buffer * pobj, Memory_Pool * pool)>
 
 Checks wether the buffer is within the bounds of the memory pool
 

Modified: branches/pmc_sans_unionval/src/gc/gc_private.h
==============================================================================
--- branches/pmc_sans_unionval/src/gc/gc_private.h	Sat Aug 15 14:11:44 2009	(r40566)
+++ branches/pmc_sans_unionval/src/gc/gc_private.h	Sat Aug 15 14:18:11 2009	(r40567)
@@ -528,12 +528,12 @@
 PARROT_WARN_UNUSED_RESULT
 size_t aligned_string_size(size_t len);
 
-void check_buffer_ptr(Buffer * pobj, Memory_Pool * pool);
-void check_memory_pool(Memory_Pool *pool);
-void check_memory_system(PARROT_INTERP)
-        __attribute__nonnull__(1);
+void check_buffer_ptr(ARGMOD(Buffer * pobj), ARGMOD(Memory_Pool * pool))
+        __attribute__nonnull__(1)
+        __attribute__nonnull__(2)
+        FUNC_MODIFIES(* pobj)
+        FUNC_MODIFIES(* pool);
 
-void check_small_object_pool(Small_Object_Pool * pool);
 void compact_pool(PARROT_INTERP, ARGMOD(Memory_Pool *pool))
         __attribute__nonnull__(1)
         __attribute__nonnull__(2)
@@ -561,11 +561,9 @@
 #define ASSERT_ARGS_aligned_size __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(buffer)
 #define ASSERT_ARGS_aligned_string_size __attribute__unused__ int _ASSERT_ARGS_CHECK = 0
-#define ASSERT_ARGS_check_buffer_ptr __attribute__unused__ int _ASSERT_ARGS_CHECK = 0
-#define ASSERT_ARGS_check_memory_pool __attribute__unused__ int _ASSERT_ARGS_CHECK = 0
-#define ASSERT_ARGS_check_memory_system __attribute__unused__ int _ASSERT_ARGS_CHECK = \
-       PARROT_ASSERT_ARG(interp)
-#define ASSERT_ARGS_check_small_object_pool __attribute__unused__ int _ASSERT_ARGS_CHECK = 0
+#define ASSERT_ARGS_check_buffer_ptr __attribute__unused__ int _ASSERT_ARGS_CHECK = \
+       PARROT_ASSERT_ARG(pobj) \
+    || PARROT_ASSERT_ARG(pool)
 #define ASSERT_ARGS_compact_pool __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(pool)