remove mem.shared

ChangeLog

@@ -1,3 +1,7 @@
+2006-06-30  Doug MacEachern  <dougm@hyperic.com>
+
+        * Remove mem.shared, gone in Linux 2.6 and which only left Solaris and Win32
+
 2006-06-21  Doug MacEachern  <dougm@hyperic.com>
 
         * [SIGAR-7] Convert sectors to bytes in Linux file system

bindings/java/src/jni/generate.pl

@@ -116,20 +116,6 @@ my %classes = (
              Win32   => 'taskman',
          },
       },
-      {
-         name => 'shared', type => 'Long',
-         desc => 'Total shared system memory',
-         plat => 'LSW',
-         cmd  => {
-             AIX     => '',
-             Darwin  => '',
-             FreeBSD => '',
-             HPUX    => '',
-             Linux   => 'free',
-             Solaris => '',
-             Win32   => '',
-         },
-      },
     ],
     Swap => [
       {
@@ -1177,8 +1163,7 @@ EOF
             "Mem: " +
             (this.total / 1024) + "K av, " +
             (this.used / 1024) + "K used, " +
-            (this.free / 1024) + "K free, " +
+            (this.free / 1024) + "K free";
-            (this.shared / 1024) + "K shrd";
     }
 EOF
     ResourceLimit => <<'EOF',

include/sigar.h

@@ -76,7 +76,6 @@ typedef struct {
         total,
         used, 
         free,
-        shared,
         actual_used,
         actual_free;
 } sigar_mem_t;

src/os/aix/aix_sigar.c

@@ -422,8 +422,6 @@ int sigar_mem_get(sigar_t *sigar, sigar_mem_t *mem)
     mem->actual_used = mem->used;
     mem->actual_free = mem->free;
     
-    mem->shared = SIGAR_FIELD_NOTIMPL;
-    
     sigar_mem_calc_ram(sigar, mem);
 
     return SIGAR_OK;

src/os/darwin/darwin_sigar.c

@@ -277,7 +277,6 @@ int sigar_mem_get(sigar_t *sigar, sigar_mem_t *mem)
 #endif
 
     mem->used = mem->total - mem->free;
-    mem->shared = SIGAR_FIELD_NOTIMPL; /*XXX*/
 
     sigar_mem_calc_ram(sigar, mem);
 

src/os/hpux/hpux_sigar.c

@@ -65,9 +65,6 @@ int sigar_mem_get(sigar_t *sigar, sigar_mem_t *mem)
     mem->free = stats.psd_free * pagesize;
     mem->used = mem->total - mem->free;
 
-    /*XXX*/
-    mem->shared = SIGAR_FIELD_NOTIMPL;
-
     mem->actual_free = mem->free;
     mem->actual_used = mem->used;
     

src/os/linux/linux_sigar.c

@@ -370,8 +370,6 @@ int sigar_mem_get(sigar_t *sigar, sigar_mem_t *mem)
     mem->actual_free = mem->free + kern;
     mem->actual_used = mem->used - kern;
 
-    mem->shared = SIGAR_FIELD_NOTIMPL; /* XXX where did this go in 2.6?? */
-
     if (get_ram(sigar, mem) != SIGAR_OK) {
         /* XXX other options on failure? */
         sigar_mem_calc_ram(sigar, mem);

src/os/netware/netware_sigar.c

@@ -93,7 +93,6 @@ int sigar_mem_get(sigar_t *sigar, sigar_mem_t *mem)
     mem->total  = info.TotalKnownSystemMemoryUnder4Gb;
     mem->used   = info.TotalWorkMemory;
     mem->free   = mem->total - mem->used;
-    mem->shared = -1;
     mem->actual_free = mem->free;
     mem->actual_used = mem->used;
 

src/os/osf1/osf1_sigar.c

@@ -49,8 +49,6 @@ int sigar_mem_get(sigar_t *sigar, sigar_mem_t *mem)
 
     sigar_mem_calc_ram(sigar, mem);
 
-    mem->shared = SIGAR_FIELD_NOTIMPL;
-
     mem->actual_free = mem->free;
     mem->actual_used = mem->used;
 

src/os/solaris/solaris_sigar.c

@@ -191,10 +191,6 @@ int sigar_mem_get(sigar_t *sigar, sigar_mem_t *mem)
 
     if ((ksp = sigar->ks.mempages) && kstat_read(kc, ksp, NULL) >= 0) {
         sigar_koffsets_init_mempages(sigar, ksp);
-        
-        mem->shared = KPAGE_SHIFT(kMEMPAGES(KSTAT_MEMPAGES_EXEC));
-
-        /*mem->buffer = KPAGE_SHIFT(kMEMPAGES(KSTAT_MEMPAGES_VNODE));*/
     }
 
     mem->actual_free = mem->free;

src/os/stub/stub_sigar.c

@@ -27,7 +27,6 @@ int sigar_mem_get(sigar_t *sigar, sigar_mem_t *mem)
     mem->ram    = -1;
     mem->used   = -1;
     mem->free   = -1;
-    mem->shared = -1;
     mem->actual_free = mem->free;
     mem->actual_used = mem->used;
     return SIGAR_OK;

src/os/win32/win32_sigar.c

@@ -412,7 +412,6 @@ SIGAR_DECLARE(int) sigar_mem_get(sigar_t *sigar, sigar_mem_t *mem)
 
     mem->total  = memstat.dwTotalPhys;
     mem->free   = memstat.dwAvailPhys;
-    mem->shared = memstat.dwTotalVirtual - memstat.dwAvailVirtual;
     mem->used   = mem->total - mem->free;
 
     sigar_mem_calc_ram(sigar, mem);