commit: r487 - in libspreadutil/trunk: . src

Author: jonathan
Date: 2012-03-05 18:57:49 -0500 (Mon, 05 Mar 2012)
New Revision: 487

Modified:
   libspreadutil/trunk/Changelog
   libspreadutil/trunk/src/memory.c
Log:
Remove Mem_init_status() from memory.c. This function is only called by one app and even that onne does not actually use it.

Modified: libspreadutil/trunk/Changelog
===================================================================
--- libspreadutil/trunk/Changelog	2012-03-05 22:48:30 UTC (rev 486)
+++ libspreadutil/trunk/Changelog	2012-03-05 23:57:49 UTC (rev 487)
@@ -1,3 +1,9 @@
+Mon Mar  5 18:14:22 2012  Jonathan Stanton  <[email protected]>
+
+	* src/memory.c (Mem_init_status): Remove Mem_init_status function as it is hacked in
+	to support only certain code bases and is not even used by them. If detailed memory
+	stats are needed by an application we will add in a better way to access. 
+
 Mon Mar  5 17:21:14 2012  Jonathan Stanton  <[email protected]>
 
 	* src/memory.c (Mem_init_object): Add "obj_name" field to Mem_init_object() to provide a 

Modified: libspreadutil/trunk/src/memory.c
===================================================================
--- libspreadutil/trunk/src/memory.c	2012-03-05 22:48:30 UTC (rev 486)
+++ libspreadutil/trunk/src/memory.c	2012-03-05 23:57:49 UTC (rev 487)
@@ -50,15 +50,6 @@
 #define NO_REF_CNT             -1
 #define MAX_MEM_OBJECTS         200
 
-/* Define SPREAD_STATUS when Memory is compiled with the Spread Status system.
- * If memory is being used outside of Spread then comment the below define out.
- */
-
-
-#ifdef SPREAD_STATUS
-#include "status.h"
-#endif
-
 /************************
  * Global Variables 
  ************************/
@@ -116,10 +107,6 @@
 #endif
 
 
-#ifdef  SPREAD_STATUS
-static bool MemStatus_initialized;
-#endif
-
 /* Declare functions */
 char    *Objnum_to_String(int32u oid);
 
@@ -208,69 +195,7 @@
 
 #define mem_header_ptr(obj)   ( (mem_header *) (((char *)obj) - sizeof(mem_header)) )
 
-void    Mem_init_status()
-{
-#ifdef SPREAD_STATUS
-        struct StatGroup *sgroup;
-        int obj_type;
-        char memobj_name[32];
-        char memobj_desc[200];
-        if (!MemStatus_initialized) 
-        {
-                sgroup = Stat_Group_Create("Memory_Summary_0", "Statistics for memory useage summarized over all memory objects");
-                if (!sgroup)
-                {
-                        Alarm(PRINT, "Mem_init_object: Failed to create Memory Status group\n");
-                } else {
-                        Stat_Insert_Record("Memory_Summary_0", "Current Bytes Used", "bytes", STAT_INT, &Mem_Bytes_Allocated );
-                        Stat_Group_Add_Member(sgroup, &Mem_Bytes_Allocated);
-                        Stat_Insert_Record("Memory_Summary_0", "Maximum Bytes Used", "max_bytes", STAT_INT, &Mem_Max_Bytes );
-                        Stat_Group_Add_Member(sgroup, &Mem_Max_Bytes);
-                        Stat_Insert_Record("Memory_Summary_0", "Current Objects Used", "objs", STAT_INT, &Mem_Obj_Allocated );
-                        Stat_Group_Add_Member(sgroup, &Mem_Obj_Allocated);
-                        Stat_Insert_Record("Memory_Summary_0", "Maximum Objects Used", "max_objs", STAT_INT, &Mem_Max_Objects);
-                        Stat_Group_Add_Member(sgroup, &Mem_Max_Objects);
-                        Stat_Insert_Record("Memory_Summary_0", "Current Objects Inuse", "objs_inuse", STAT_INT, &Mem_Obj_Inuse);
-                        Stat_Group_Add_Member(sgroup, &Mem_Obj_Inuse);
-                        Stat_Insert_Record("Memory_Summary_0", "Maximum Objects Inuse", "max_obj_inuse", STAT_INT, &Mem_Max_Obj_Inuse);
-                        Stat_Group_Add_Member(sgroup, &Mem_Max_Obj_Inuse);
-                }
-                MemStatus_initialized = TRUE;
-        }
 
-        for (obj_type = 1; obj_type < MAX_MEM_OBJECTS; obj_type++)
-        {
-                if (Mem[obj_type].exist) {
-                        sprintf(memobj_name, "Memory_%d", obj_type);
-                        sprintf(memobj_desc, "Memory statistics for object: %s", Objnum_to_String(obj_type) );
-                        sgroup = Stat_Group_Create(memobj_name, memobj_desc);
-                        if (!sgroup)
-                                Alarm(PRINT, "Mem_init_object:Failed to create stat group for object: %s\n", Objnum_to_String(obj_type) );
-                        else {
-#ifndef NDEBUG
-                                Stat_Insert_Record(memobj_name, "Current Bytes Used", "bytes", STAT_INT, &(Mem[obj_type].bytes_allocated) );
-                                Stat_Group_Add_Member(sgroup, &(Mem[obj_type].bytes_allocated) );
-                                Stat_Insert_Record(memobj_name, "Maximum Bytes Used", "max_bytes", STAT_INT, &(Mem[obj_type].max_bytes) );
-                                Stat_Group_Add_Member(sgroup, &(Mem[obj_type].max_bytes) );
-                                Stat_Insert_Record(memobj_name, "Current Objects Used", "objs", STAT_INT, &(Mem[obj_type].num_obj) );
-                                Stat_Group_Add_Member(sgroup, &(Mem[obj_type].num_obj) );
-                                Stat_Insert_Record(memobj_name, "Maximum Objects Used", "max_objs", STAT_INT, &(Mem[obj_type].max_obj) );
-                                Stat_Group_Add_Member(sgroup, &(Mem[obj_type].max_obj) );
-                                Stat_Insert_Record(memobj_name, "Current Objects Inuse", "obj_inuse", STAT_INT, &(Mem[obj_type].num_obj_inuse) );
-                                Stat_Group_Add_Member(sgroup, &(Mem[obj_type].num_obj_inuse) );
-                                Stat_Insert_Record(memobj_name, "Maximum Objects Inuse", "max_inuse", STAT_INT, &(Mem[obj_type].max_obj_inuse) );
-                                Stat_Group_Add_Member(sgroup, &(Mem[obj_type].max_obj_inuse) );
-#endif
-                                Stat_Insert_Record(memobj_name, "Current Objects In Pool", "obj_inpool", STAT_INT, &(Mem[obj_type].num_obj_inpool) );
-                                Stat_Group_Add_Member(sgroup, &(Mem[obj_type].num_obj_inpool) );
-                        }
-                } /* if exists */
-        } /* for loop */
-        return;
-#else
-        return;
-#endif
-}
 void            Mem_init_object_abort( int32u obj_type, char *obj_name, int32u size, unsigned int threshold, unsigned int initial )
 {
         int     ret;
@@ -288,11 +213,6 @@
 int            Mem_init_object(int32u obj_type, char *obj_name, int32u size, unsigned int threshold, unsigned int initial)
 {
         int mem_error = 0;
-#ifdef  SPREAD_STATUS
-        char memobj_name[32];
-        char memobj_desc[200];
-        struct StatGroup *sgroup;
-#endif
         assert((obj_type > 0) && (obj_type < MAX_MEM_OBJECTS));
         assert(size > 0 );
 
@@ -411,34 +331,6 @@
 #endif
         }
 
-#ifndef NDEBUG
-#ifdef SPREAD_STATUS
-        if (MemStatus_initialized) {
-                sprintf(memobj_name, "Memory_%d", obj_type);
-                sprintf(memobj_desc, "Memory statistics for object: %s", Objnum_to_String(obj_type) );
-                sgroup = Stat_Group_Create(memobj_name, memobj_desc);
-                if (!sgroup)
-                        Alarm(PRINT, "Mem_init_object:Failed to create stat group for object: %s\n", Objnum_to_String(obj_type) );
-                else {
-                        Stat_Insert_Record(memobj_name, "Current Bytes Used", "bytes", STAT_INT, &(Mem[obj_type].bytes_allocated) );
-                        Stat_Group_Add_Member(sgroup, &(Mem[obj_type].bytes_allocated) );
-                        Stat_Insert_Record(memobj_name, "Maximum Bytes Used", "max_bytes", STAT_INT, &(Mem[obj_type].max_bytes) );
-                        Stat_Group_Add_Member(sgroup, &(Mem[obj_type].max_bytes) );
-                        Stat_Insert_Record(memobj_name, "Current Objects Used", "objs", STAT_INT, &(Mem[obj_type].num_obj) );
-                        Stat_Group_Add_Member(sgroup, &(Mem[obj_type].num_obj) );
-                        Stat_Insert_Record(memobj_name, "Maximum Objects Used", "max_objs", STAT_INT, &(Mem[obj_type].max_obj) );
-                        Stat_Group_Add_Member(sgroup, &(Mem[obj_type].max_obj) );
-                        Stat_Insert_Record(memobj_name, "Current Objects Inuse", "obj_inuse", STAT_INT, &(Mem[obj_type].num_obj_inuse) );
-                        Stat_Group_Add_Member(sgroup, &(Mem[obj_type].num_obj_inuse) );
-                        Stat_Insert_Record(memobj_name, "Maximum Objects Inuse", "max_inuse", STAT_INT, &(Mem[obj_type].max_obj_inuse) );
-                        Stat_Group_Add_Member(sgroup, &(Mem[obj_type].max_obj_inuse) );
-                        Stat_Insert_Record(memobj_name, "Current Objects In Pool", "obj_inpool", STAT_INT, &(Mem[obj_type].num_obj_inpool) );
-                        Stat_Group_Add_Member(sgroup, &(Mem[obj_type].num_obj_inpool) );
-                }
-        } /* if memstatus_init */
-#endif
-#endif
-
         if (mem_error) { return(-1); }
         return(0);
 }