* remove static inline in atomic.h so that the compiler stops complaining

about undefined static functions.  Someone needs to look at this and
  fix it.
* Fixed missing header files in oob_cofs test

This commit was SVN r247.

src/lam/atomic.h

@@ -23,75 +23,75 @@
  * prototypes (we may not implement all of this interface)
  */
 
-static inline int lam_atomic_cmpset_acq_int(volatile int *p, int old, int new);
-static inline int lam_atomic_cmpset_rel_int(volatile int *p, int old, int new);
-static inline int lam_atomic_load_acq_int(volatile int *p);
-static inline int lam_atomic_readandclear_int(volatile int *p);
-static inline void lam_atomic_add_acq_int(volatile int *p, int v);
-static inline void lam_atomic_add_rel_int(volatile int *p, int v);
-static inline void lam_atomic_clear_acq_int(volatile int *p, int v);
-static inline void lam_atomic_clear_rel_int(volatile int *p, int v);
-static inline void lam_atomic_set_acq_int(volatile int *p, int v);
-static inline void lam_atomic_set_rel_int(volatile int *p, int v);
-static inline void lam_atomic_store_rel_int(volatile int *p, int v);
-static inline void lam_atomic_subtract_acq_int(volatile int *p, int v);
-static inline void lam_atomic_subtract_rel_int(volatile int *p, int v);
+int lam_atomic_cmpset_acq_int(volatile int *p, int old, int new);
+int lam_atomic_cmpset_rel_int(volatile int *p, int old, int new);
+int lam_atomic_load_acq_int(volatile int *p);
+int lam_atomic_readandclear_int(volatile int *p);
+void lam_atomic_add_acq_int(volatile int *p, int v);
+void lam_atomic_add_rel_int(volatile int *p, int v);
+void lam_atomic_clear_acq_int(volatile int *p, int v);
+void lam_atomic_clear_rel_int(volatile int *p, int v);
+void lam_atomic_set_acq_int(volatile int *p, int v);
+void lam_atomic_set_rel_int(volatile int *p, int v);
+void lam_atomic_store_rel_int(volatile int *p, int v);
+void lam_atomic_subtract_acq_int(volatile int *p, int v);
+void lam_atomic_subtract_rel_int(volatile int *p, int v);
 
-static inline int lam_atomic_cmpset_acq_long(volatile long *p, long old, long new);
-static inline int lam_atomic_cmpset_rel_long(volatile long *p, long old, long new);
-static inline long lam_atomic_load_acq_long(volatile long *p);
-static inline long lam_atomic_readandclear_long(volatile long *p);
-static inline void lam_atomic_add_acq_long(volatile long *p, long v);
-static inline void lam_atomic_add_rel_long(volatile long *p, long v);
-static inline void lam_atomic_clear_acq_long(volatile long *p, long v);
-static inline void lam_atomic_clear_rel_long(volatile long *p, long v);
-static inline void lam_atomic_set_acq_long(volatile long *p, long v);
-static inline void lam_atomic_set_rel_long(volatile long *p, long v);
-static inline void lam_atomic_store_rel_long(volatile long *p, long v);
-static inline void lam_atomic_subtract_acq_long(volatile long *p, long v);
-static inline void lam_atomic_subtract_rel_long(volatile long *p, long v);
+int lam_atomic_cmpset_acq_long(volatile long *p, long old, long new);
+int lam_atomic_cmpset_rel_long(volatile long *p, long old, long new);
+long lam_atomic_load_acq_long(volatile long *p);
+long lam_atomic_readandclear_long(volatile long *p);
+void lam_atomic_add_acq_long(volatile long *p, long v);
+void lam_atomic_add_rel_long(volatile long *p, long v);
+void lam_atomic_clear_acq_long(volatile long *p, long v);
+void lam_atomic_clear_rel_long(volatile long *p, long v);
+void lam_atomic_set_acq_long(volatile long *p, long v);
+void lam_atomic_set_rel_long(volatile long *p, long v);
+void lam_atomic_store_rel_long(volatile long *p, long v);
+void lam_atomic_subtract_acq_long(volatile long *p, long v);
+void lam_atomic_subtract_rel_long(volatile long *p, long v);
 
-static inline int lam_atomic_cmpset_acq_ptr(volatile uintptr_t *p, uintptr_t old, uintptr_t new);
-static inline int lam_atomic_cmpset_rel_ptr(volatile uintptr_t *p, uintptr_t old, uintptr_t new);
-static inline uintptr_t lam_atomic_load_acq_ptr(volatile uintptr_t *p);
-static inline uintptr_t lam_atomic_readandclear_ptr(volatile uintptr_t *p);
-static inline void lam_atomic_add_acq_ptr(volatile uintptr_t *p, uintptr_t v);
-static inline void lam_atomic_add_rel_ptr(volatile uintptr_t *p, uintptr_t v);
-static inline void lam_atomic_clear_acq_ptr(volatile uintptr_t *p, uintptr_t v);
-static inline void lam_atomic_clear_rel_ptr(volatile uintptr_t *p, uintptr_t v);
-static inline void lam_atomic_set_acq_ptr(volatile uintptr_t *p, uintptr_t v);
-static inline void lam_atomic_set_rel_ptr(volatile uintptr_t *p, uintptr_t v);
-static inline void lam_atomic_store_rel_ptr(volatile uintptr_t *p, uintptr_t v);
-static inline void lam_atomic_subtract_acq_ptr(volatile uintptr_t *p, uintptr_t v);
-static inline void lam_atomic_subtract_rel_ptr(volatile uintptr_t *p, uintptr_t v);
+int lam_atomic_cmpset_acq_ptr(volatile uintptr_t *p, uintptr_t old, uintptr_t new);
+int lam_atomic_cmpset_rel_ptr(volatile uintptr_t *p, uintptr_t old, uintptr_t new);
+uintptr_t lam_atomic_load_acq_ptr(volatile uintptr_t *p);
+uintptr_t lam_atomic_readandclear_ptr(volatile uintptr_t *p);
+void lam_atomic_add_acq_ptr(volatile uintptr_t *p, uintptr_t v);
+void lam_atomic_add_rel_ptr(volatile uintptr_t *p, uintptr_t v);
+void lam_atomic_clear_acq_ptr(volatile uintptr_t *p, uintptr_t v);
+void lam_atomic_clear_rel_ptr(volatile uintptr_t *p, uintptr_t v);
+void lam_atomic_set_acq_ptr(volatile uintptr_t *p, uintptr_t v);
+void lam_atomic_set_rel_ptr(volatile uintptr_t *p, uintptr_t v);
+void lam_atomic_store_rel_ptr(volatile uintptr_t *p, uintptr_t v);
+void lam_atomic_subtract_acq_ptr(volatile uintptr_t *p, uintptr_t v);
+void lam_atomic_subtract_rel_ptr(volatile uintptr_t *p, uintptr_t v);
 
-static inline int lam_atomic_cmpset_acq_uint32_t(volatile uint32_t *p, uint32_t old, uint32_t new);
-static inline int lam_atomic_cmpset_rel_uint32_t(volatile uint32_t *p, uint32_t old, uint32_t new);
-static inline uint32_t lam_atomic_load_acq_uint32_t(volatile uint32_t *p);
-static inline uint32_t lam_atomic_readandclear_uint32_t(volatile uint32_t *p);
-static inline void lam_atomic_add_acq_uint32_t(volatile uint32_t *p, uint32_t v);
-static inline void lam_atomic_add_rel_uint32_t(volatile uint32_t *p, uint32_t v);
-static inline void lam_atomic_clear_acq_uint32_t(volatile uint32_t *p, uint32_t v);
-static inline void lam_atomic_clear_rel_uint32_t(volatile uint32_t *p, uint32_t v);
-static inline void lam_atomic_set_acq_uint32_t(volatile uint32_t *p, uint32_t v);
-static inline void lam_atomic_set_rel_uint32_t(volatile uint32_t *p, uint32_t v);
-static inline void lam_atomic_store_rel_uint32_t(volatile uint32_t *p, uint32_t v);
-static inline void lam_atomic_subtract_acq_uint32_t(volatile uint32_t *p, uint32_t v);
-static inline void lam_atomic_subtract_rel_uint32_t(volatile uint32_t *p, uint32_t v);
+int lam_atomic_cmpset_acq_uint32_t(volatile uint32_t *p, uint32_t old, uint32_t new);
+int lam_atomic_cmpset_rel_uint32_t(volatile uint32_t *p, uint32_t old, uint32_t new);
+uint32_t lam_atomic_load_acq_uint32_t(volatile uint32_t *p);
+uint32_t lam_atomic_readandclear_uint32_t(volatile uint32_t *p);
+void lam_atomic_add_acq_uint32_t(volatile uint32_t *p, uint32_t v);
+void lam_atomic_add_rel_uint32_t(volatile uint32_t *p, uint32_t v);
+void lam_atomic_clear_acq_uint32_t(volatile uint32_t *p, uint32_t v);
+void lam_atomic_clear_rel_uint32_t(volatile uint32_t *p, uint32_t v);
+void lam_atomic_set_acq_uint32_t(volatile uint32_t *p, uint32_t v);
+void lam_atomic_set_rel_uint32_t(volatile uint32_t *p, uint32_t v);
+void lam_atomic_store_rel_uint32_t(volatile uint32_t *p, uint32_t v);
+void lam_atomic_subtract_acq_uint32_t(volatile uint32_t *p, uint32_t v);
+void lam_atomic_subtract_rel_uint32_t(volatile uint32_t *p, uint32_t v);
 
-static inline int lam_atomic_cmpset_acq_uint64_t(volatile uint64_t *p, uint64_t old, uint64_t new);
-static inline int lam_atomic_cmpset_rel_uint64_t(volatile uint64_t *p, uint64_t old, uint64_t new);
-static inline uint64_t lam_atomic_load_acq_uint64_t(volatile uint64_t *p);
-static inline uint64_t lam_atomic_readandclear_uint64_t(volatile uint64_t *p);
-static inline void lam_atomic_add_acq_uint64_t(volatile uint64_t *p, uint64_t v);
-static inline void lam_atomic_add_rel_uint64_t(volatile uint64_t *p, uint64_t v);
-static inline void lam_atomic_clear_acq_uint64_t(volatile uint64_t *p, uint64_t v);
-static inline void lam_atomic_clear_rel_uint64_t(volatile uint64_t *p, uint64_t v);
-static inline void lam_atomic_set_acq_uint64_t(volatile uint64_t *p, uint64_t v);
-static inline void lam_atomic_set_rel_uint64_t(volatile uint64_t *p, uint64_t v);
-static inline void lam_atomic_store_rel_uint64_t(volatile uint64_t *p, uint64_t v);
-static inline void lam_atomic_subtract_acq_uint64_t(volatile uint64_t *p, uint64_t v);
-static inline void lam_atomic_subtract_rel_uint64_t(volatile uint64_t *p, uint64_t v);
+int lam_atomic_cmpset_acq_uint64_t(volatile uint64_t *p, uint64_t old, uint64_t new);
+int lam_atomic_cmpset_rel_uint64_t(volatile uint64_t *p, uint64_t old, uint64_t new);
+uint64_t lam_atomic_load_acq_uint64_t(volatile uint64_t *p);
+uint64_t lam_atomic_readandclear_uint64_t(volatile uint64_t *p);
+void lam_atomic_add_acq_uint64_t(volatile uint64_t *p, uint64_t v);
+void lam_atomic_add_rel_uint64_t(volatile uint64_t *p, uint64_t v);
+void lam_atomic_clear_acq_uint64_t(volatile uint64_t *p, uint64_t v);
+void lam_atomic_clear_rel_uint64_t(volatile uint64_t *p, uint64_t v);
+void lam_atomic_set_acq_uint64_t(volatile uint64_t *p, uint64_t v);
+void lam_atomic_set_rel_uint64_t(volatile uint64_t *p, uint64_t v);
+void lam_atomic_store_rel_uint64_t(volatile uint64_t *p, uint64_t v);
+void lam_atomic_subtract_acq_uint64_t(volatile uint64_t *p, uint64_t v);
+void lam_atomic_subtract_rel_uint64_t(volatile uint64_t *p, uint64_t v);
 
 /*
  * implementation (system specific)

test/unit/lam/oob_cofs/oob_cofs_test.c

@@ -3,6 +3,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 int
 main(int argc, char* argv[])
@@ -66,7 +67,7 @@ main(int argc, char* argv[])
       exit(1);
     }
     printf("%d %d: %s\n", source_vpid, source_tag, source_data);
-    lam_free(source_data);
+    free(source_data);
   }
 
   printf("#\n# Finished\n#\n");