[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    icecream/daemon
From:       Stephan Kulow <coolo () kde ! org>
Date:       2007-04-26 17:55:30
Message-ID: 1177610130.052503.7505.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 658324 by coolo:

compile


 M  +5 -8      load.cpp  
 M  +8 -0      main.cpp  


--- trunk/icecream/daemon/load.cpp #658323:658324
@@ -215,7 +215,7 @@
 
 static unsigned int calculateMemLoad( unsigned long int &NetMemFree )
 {
-    unsigned long long MemFree;
+    unsigned long long MemFree = 0, Buffers = 0, Cached = 0;
 
 #ifdef USE_MACH
     /* Get VM statistics. */
@@ -232,18 +232,15 @@
     unsigned long long MemInactive = (unsigned long long) vm_stat.inactive_count * pagesize;
     MemFree = (unsigned long long) vm_stat.free_count * pagesize;
 
-    NetMemFree = (MemFree + MemInactive / 3) / 1024;
-    if ( NetMemFree > 128 * 1024 )
-        return 0;
-    else
-        return 1000 - ( NetMemFree * 1000 / ( 128 * 1024 ) );
-
+    // blunt lie - but when's sche macht
+    Buffers = MemInactive;
+  
 #elif defined( USE_SYSCTL )
     size_t len = sizeof (MemFree);
     if ((sysctlbyname("vm.stats.vm.v_free_count", &MemFree, &len, NULL, 0) == -1) || !len)
         MemFree = 0; /* Doesn't work under FreeBSD v2.2.x */
 
-    unsigned long int Buffers;
+  
     len = sizeof (Buffers);
     if ((sysctlbyname("vfs.bufspace", &Buffers, &len, NULL, 0) == -1) || !len)
         Buffers = 0; /* Doesn't work under FreeBSD v2.2.x */
--- trunk/icecream/daemon/main.cpp #658323:658324
@@ -515,6 +515,14 @@
         machine_name = os + '_' + uname_buf.machine;
     else // Linux
         machine_name = uname_buf.machine;
+   
+    while (true)
+    {
+        string::size_type pos = machine_name.find(" ");
+        if (pos == string::npos)
+           break;
+        machine_name.erase(pos, 1);
+    }
 }
 
 string Daemon::determine_nodename()
[prev in list] [next in list] [prev in thread] [next in thread]