[Spread-cvs] commit: r365 - trunk/daemon

[jonathan at spread.org]

Author: jonathan
Date: 2006-11-14 04:50:26 -0500 (Tue, 14 Nov 2006)
New Revision: 365

Modified:
   trunk/daemon/Changelog
   trunk/daemon/arch.h
   trunk/daemon/groups.c
   trunk/daemon/memory.h
Log:
Make memory.h inline function
declarations extern. Move Alarm() in groups to after endian 
flip of data. Define inline correctly for non gcc platforms.



Modified: trunk/daemon/Changelog
===================================================================
--- trunk/daemon/Changelog	2006-11-14 07:56:32 UTC (rev 364)
+++ trunk/daemon/Changelog	2006-11-14 09:50:26 UTC (rev 365)
@@ -1,3 +1,9 @@
+Tue Nov 14 03:40:43 2006  Jonathan Stanton  <jonathan at cnds.jhu.edu>
+
+	* arch.h, groups.c, memory.h: Make memory.h inline function
+	declarations extern. Move Alarm() in groups to after endian 
+	flip of data. Define inline correctly for non gcc platforms.
+
 Tue Nov 14 01:40:43 2006  Jonathan Stanton  <jonathan at cnds.jhu.edu>
 
 	* sp.c (SP_connect_timeout): Rename variables to make more 

Modified: trunk/daemon/arch.h
===================================================================
--- trunk/daemon/arch.h	2006-11-14 07:56:32 UTC (rev 364)
+++ trunk/daemon/arch.h	2006-11-14 09:50:26 UTC (rev 365)
@@ -70,8 +70,12 @@
 #define		ARCH_ENDIAN	0x80000080
 #endif
   
-#define         LOC_INLINE      inline
+#define         LOC_INLINE      __inline__
   
+#ifndef __GNUC__
+#define __inline__ inline
+#endif
+
 /* Need to add special cases, SUNOS gets 64, IRIX gets 512 */  
 #ifdef MSG_MAXIOVLEN
 #define         ARCH_SCATTER_SIZE       MSG_MAXIOVLEN

Modified: trunk/daemon/groups.c
===================================================================
--- trunk/daemon/groups.c	2006-11-14 07:56:32 UTC (rev 364)
+++ trunk/daemon/groups.c	2006-11-14 09:50:26 UTC (rev 365)
@@ -2162,10 +2162,10 @@
                 num_bytes += sizeof(group_id);
 
                 memcpy( &num_dmns, &Temp_buf[num_bytes], sizeof(int16u) );
-                Alarmp( SPLOG_DEBUG, GROUPS, "G_mess_to_groups: \twith %u daemons\n", num_dmns );
                 num_bytes += sizeof(int16u);
                 if( !Same_endian( head_ptr->type ) )
                         num_dmns = Flip_int16( num_dmns );
+                Alarmp( SPLOG_DEBUG, GROUPS, "G_mess_to_groups: \twith %u daemons\n", num_dmns );
 
                 /* For each daemon in the message for this group.
                  *    Create a daemon object, and add it to the DaemonsList.

Modified: trunk/daemon/memory.h
===================================================================
--- trunk/daemon/memory.h	2006-11-14 07:56:32 UTC (rev 364)
+++ trunk/daemon/memory.h	2006-11-14 09:50:26 UTC (rev 365)
@@ -111,19 +111,19 @@
  */
 int32u  Mem_Obj_Type(const void *object);
 
-LOC_INLINE unsigned int Mem_total_bytes(void);
-LOC_INLINE unsigned int Mem_total_max_bytes(void);
-LOC_INLINE unsigned int Mem_total_inuse(void);
-LOC_INLINE unsigned int Mem_total_max_inuse(void);
-LOC_INLINE unsigned int Mem_total_obj(void);
-LOC_INLINE unsigned int Mem_total_max_obj(void);
-LOC_INLINE unsigned int Mem_bytes(int32u objtype);
-LOC_INLINE unsigned int Mem_max_bytes(int32u objtype);
-LOC_INLINE unsigned int Mem_obj_in_pool(int32u objtype);
-LOC_INLINE unsigned int Mem_obj_in_app(int32u objtype);
-LOC_INLINE unsigned int Mem_max_in_app(int32u objtype);
-LOC_INLINE unsigned int Mem_obj_total(int32u objtype);    
-LOC_INLINE unsigned int Mem_max_obj(int32u objtype);
+extern LOC_INLINE unsigned int Mem_total_bytes(void);
+extern LOC_INLINE unsigned int Mem_total_max_bytes(void);
+extern LOC_INLINE unsigned int Mem_total_inuse(void);
+extern LOC_INLINE unsigned int Mem_total_max_inuse(void);
+extern LOC_INLINE unsigned int Mem_total_obj(void);
+extern LOC_INLINE unsigned int Mem_total_max_obj(void);
+extern LOC_INLINE unsigned int Mem_bytes(int32u objtype);
+extern LOC_INLINE unsigned int Mem_max_bytes(int32u objtype);
+extern LOC_INLINE unsigned int Mem_obj_in_pool(int32u objtype);
+extern LOC_INLINE unsigned int Mem_obj_in_app(int32u objtype);
+extern LOC_INLINE unsigned int Mem_max_in_app(int32u objtype);
+extern LOC_INLINE unsigned int Mem_obj_total(int32u objtype);    
+extern LOC_INLINE unsigned int Mem_max_obj(int32u objtype);
 
 #endif /* MEMORY_H */