Changeset 28736 in vbox for trunk/src/VBox/Additions/common/VBoxService

Timestamp:

Apr 26, 2010 9:24:35 AM (15 years ago)

Author:

vboxsync

Message:

VBoxService: Compilable/runnable without memory ballooning.

Location:

trunk/src/VBox/Additions/common/VBoxService

Files:

• Makefile.kmk (modified) (4 diffs)
• VBoxService.cpp (modified) (1 diff)
• VBoxServiceStats.cpp (modified) (3 diffs)

trunk/src/VBox/Additions/common/VBoxService/Makefile.kmk

@@ -29 +29 @@
 PROGRAMS.win.x86 += VBoxServiceNT
 
+# Hack. Should be in Config.kmk later!
+VBOX_WITH_MEMBALLOON     := 1
+
 #
 # VBoxService
@@ -41 +44 @@
   VBoxService_DEFS       += VBOXSERVICE_EXEC
  endif
-ifdef VBOX_WITH_GUEST_CONTROL
+ ifdef VBOX_WITH_GUEST_CONTROL
   VBoxService_DEFS       += VBOX_WITH_GUEST_CONTROL VBOXSERVICE_CONTROL
+ endif
 endif
+ifdef VBOX_WITH_MEMBALLOON
+ VBoxService_DEFS        += VBOX_WITH_MEMBALLOON
 endif
 ifdef VBOX_WITH_PAGE_SHARING
-  VBoxService_DEFS       += VBOX_WITH_PAGE_SHARING
+ VBoxService_DEFS        += VBOX_WITH_PAGE_SHARING
 endif
 if1of ($(KBUILD_TARGET), linux)
@@ -56 +62 @@
         VBoxServiceTimeSync.cpp \
         VBoxServiceUtils.cpp \
-        VBoxServiceBalloon.cpp \
         VBoxServiceStats.cpp
 ifdef VBOX_WITH_GUEST_CONTROL
@@ -62 +67 @@
         VBoxServiceControl.cpp \
         VBoxServiceControlExec.cpp
+endif
+ifdef VBOX_WITH_MEMBALLOON
+ VBoxService_SOURCES    += \
+        VBoxServiceBalloon.cpp
 endif
 ifdef VBOX_WITH_PAGE_SHARING

trunk/src/VBox/Additions/common/VBoxService/VBoxService.cpp

@@ -99 +99 @@
 #endif
 #ifdef VBOXSERVICE_MANAGEMENT
+ #ifdef VBOX_WITH_MEMBALLOON
     { &g_MemBalloon, NIL_RTTHREAD, false, false, false, true },
+ #endif    
     { &g_VMStatistics, NIL_RTTHREAD, false, false, false, true },
 #endif

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceStats.cpp

@@ -208 +208 @@
     req.guestStats.u32PageFileSize      = (uint32_t)(memStatus.ullTotalPageFile / _4K) - req.guestStats.u32PhysMemTotal;
     req.guestStats.u32MemoryLoad        = memStatus.dwMemoryLoad;
+        req.guestStats.u32StatCaps          = VBOX_GUEST_STAT_PHYS_MEM_TOTAL | VBOX_GUEST_STAT_PHYS_MEM_AVAIL | VBOX_GUEST_STAT_PAGE_FILE_SIZE
+                                                                                | VBOX_GUEST_STAT_MEMORY_LOAD;
+#ifdef VBOX_WITH_MEMBALLOON
     req.guestStats.u32PhysMemBalloon    = VBoxServiceBalloonQueryPages(_4K);
-    req.guestStats.u32StatCaps          = VBOX_GUEST_STAT_PHYS_MEM_TOTAL | VBOX_GUEST_STAT_PHYS_MEM_AVAIL | VBOX_GUEST_STAT_PAGE_FILE_SIZE
-                                        | VBOX_GUEST_STAT_MEMORY_LOAD | VBOX_GUEST_STAT_PHYS_MEM_BALLOON;
+    req.guestStats.u32StatCaps         |= VBOX_GUEST_STAT_PHYS_MEM_BALLOON;
+#else
+        req.guestStats.u32PhysMemBalloon    = 0;
+#endif
 
     if (gCtx.pfnGetPerformanceInfo)
@@ -348 +353 @@
 
     req.guestStats.u32PageSize = getpagesize();
-    req.guestStats.u32PhysMemBalloon = VBoxServiceBalloonQueryPages(_4K);
-    req.guestStats.u32StatCaps = VBOX_GUEST_STAT_PHYS_MEM_TOTAL \
-                               | VBOX_GUEST_STAT_PHYS_MEM_AVAIL \
-                               | VBOX_GUEST_STAT_PHYS_MEM_BALLOON \
-                               | VBOX_GUEST_STAT_PAGE_FILE_SIZE;
+        req.guestStats.u32StatCaps  = VBOX_GUEST_STAT_PHYS_MEM_TOTAL \
+                                                            | VBOX_GUEST_STAT_PHYS_MEM_AVAIL \
+                                                            | VBOX_GUEST_STAT_PAGE_FILE_SIZE;
+#ifdef VBOX_WITH_MEMBALLOON
+    req.guestStats.u32PhysMemBalloon  = VBoxServiceBalloonQueryPages(_4K);
+    req.guestStats.u32StatCaps       |= VBOX_GUEST_STAT_PHYS_MEM_BALLOON;
+#else
+    req.guestStats.u32PhysMemBalloon  = 0;
+#endif
+
 
     /** @todo req.guestStats.u32Threads */
@@ -519 +529 @@
         /** @todo req.guestStats.u32MemKernelNonPaged */
         req.guestStats.u32PageSize = getpagesize();
-        req.guestStats.u32PhysMemBalloon = VBoxServiceBalloonQueryPages(_4K);
+
         req.guestStats.u32StatCaps = VBOX_GUEST_STAT_PHYS_MEM_TOTAL \
                                    | VBOX_GUEST_STAT_PHYS_MEM_AVAIL \
-                                   | VBOX_GUEST_STAT_PHYS_MEM_BALLOON \
                                    | VBOX_GUEST_STAT_PAGE_FILE_SIZE;
+#ifdef VBOX_WITH_MEMBALLOON
+                req.guestStats.u32PhysMemBalloon  = VBoxServiceBalloonQueryPages(_4K);
+                req.guestStats.u32StatCaps       |= VBOX_GUEST_STAT_PHYS_MEM_BALLOON;
+#else
+                req.guestStats.u32PhysMemBalloon  = 0;
+#endif
 
         /*