Changeset 85523 in vbox for trunk

Timestamp:

Jul 29, 2020 11:54:52 AM (4 years ago)

Author:

vboxsync

Message:

SUPDrv/linux: Use two combined-agnostic.c files to undo the build time regression on systems with lots of cores. bugref:9798

Location:

trunk/src/VBox/HostDrivers/Support/linux

Files:

• Makefile (modified) (1 diff)
• combined-agnostic1.c (copied) (copied from trunk/src/VBox/HostDrivers/Support/linux/combined-agnostic.c ) (1 diff)
• combined-agnostic2.c (moved) (moved from trunk/src/VBox/HostDrivers/Support/linux/combined-agnostic.c ) (2 diffs)
• files_vboxdrv (modified) (1 diff)

trunk/src/VBox/HostDrivers/Support/linux/Makefile

@@ -44 +44 @@
 ifndef VBOX_WITHOUT_COMBINED_SOURCES
 VBOXMOD_OBJS += \
-        combined-agnostic.o \
+        combined-agnostic1.o \
+        combined-agnostic2.o \
         combined-os-specific.o
 else  # VBOX_WITHOUT_COMBINED_SOURCES

trunk/src/VBox/HostDrivers/Support/linux/combined-agnostic1.c

@@ -85 +85 @@
 #undef LOG_GROUP
 #include "common/misc/thread.c"
-#undef LOG_GROUP
-#include "common/string/RTStrCat.c"
-#undef LOG_GROUP
-#include "common/string/RTStrCopy.c"
-#undef LOG_GROUP
-#include "common/string/RTStrCopyEx.c"
-#undef LOG_GROUP
-#include "common/string/RTStrCopyP.c"
-#undef LOG_GROUP
-#include "common/string/RTStrEnd.c"
-#undef LOG_GROUP
-#include "common/string/RTStrNCmp.c"
-#undef LOG_GROUP
-#include "common/string/RTStrNLen.c"
-#undef LOG_GROUP
-#include "common/string/stringalloc.c"
-#undef LOG_GROUP
-#include "common/string/strformat.c"
-#undef LOG_GROUP
-#include "common/string/strformatnum.c"
-#undef LOG_GROUP
-#include "common/string/strformattype.c"
-#undef LOG_GROUP
-#include "common/string/strprintf.c"
-#undef LOG_GROUP
-#include "common/string/strtonum.c"
-#undef LOG_GROUP
-#include "common/table/avlpv.c"
-#undef LOG_GROUP
-#include "common/time/time.c"
-#undef LOG_GROUP
-#include "generic/RTAssertShouldPanic-generic.c"
-#undef LOG_GROUP
-#include "generic/RTLogWriteStdErr-stub-generic.c"
-#undef LOG_GROUP
-#include "generic/RTLogWriteStdOut-stub-generic.c"
-#undef LOG_GROUP
-#include "generic/RTLogWriteUser-generic.c"
-#undef LOG_GROUP
-#include "generic/RTMpGetArraySize-generic.c"
-#undef LOG_GROUP
-#include "generic/RTMpGetCoreCount-generic.c"
-#undef LOG_GROUP
-#include "generic/RTSemEventWait-2-ex-generic.c"
-#undef LOG_GROUP
-#include "generic/RTSemEventWaitNoResume-2-ex-generic.c"
-#undef LOG_GROUP
-#include "generic/RTSemEventMultiWait-2-ex-generic.c"
-#undef LOG_GROUP
-#include "generic/RTSemEventMultiWaitNoResume-2-ex-generic.c"
-#undef LOG_GROUP
-#include "generic/RTTimerCreate-generic.c"
-#undef LOG_GROUP
-#include "generic/errvars-generic.c"
-#undef LOG_GROUP
-#include "generic/mppresent-generic.c"
-#undef LOG_GROUP
-#include "generic/uuid-generic.c"
-#undef LOG_GROUP
-#include "VBox/log-vbox.c"
 
-#ifdef RT_ARCH_AMD64
-# undef LOG_GROUP
-# include "common/alloc/heapsimple.c"
-#endif
-
-#if 0 /*def RT_ARCH_X86 - iprt/nocrt/limit.h clashes.*/
-# include "common/math/gcc/divdi3.c"
-# include "common/math/gcc/moddi3.c"
-# include "common/math/gcc/udivdi3.c"
-# include "common/math/gcc/udivmoddi4.c"
-# include "common/math/gcc/umoddi3.c"
-# include "common/math/gcc/qdivrem.c"
-#endif
-
-
-

trunk/src/VBox/HostDrivers/Support/linux/combined-agnostic2.c

@@ -29 +29 @@
 #include <VBox/log.h>
 
-#undef LOG_GROUP
-#include "r0drv/alloc-r0drv.c"
-#undef LOG_GROUP
-#include "r0drv/initterm-r0drv.c"
-#undef LOG_GROUP
-#include "r0drv/memobj-r0drv.c"
-#undef LOG_GROUP
-#include "r0drv/mpnotification-r0drv.c"
-#undef LOG_GROUP
-#include "r0drv/powernotification-r0drv.c"
-#undef LOG_GROUP
-#include "r0drv/generic/semspinmutex-r0drv-generic.c"
-#undef LOG_GROUP
-#include "common/alloc/alloc.c"
-#undef LOG_GROUP
-#include "common/checksum/crc32.c"
-#undef LOG_GROUP
-#include "common/checksum/ipv4.c"
-#undef LOG_GROUP
-#include "common/checksum/ipv6.c"
-#undef LOG_GROUP
-#include "common/err/errinfo.c"
-#undef LOG_GROUP
-#include "common/log/log.c"
-#undef LOG_GROUP
-#include "common/log/logellipsis.c"
-#undef LOG_GROUP
-#include "common/log/logrel.c"
-#undef LOG_GROUP
-#include "common/log/logrelellipsis.c"
-#undef LOG_GROUP
-#include "common/log/logcom.c"
-#undef LOG_GROUP
-#include "common/log/logformat.c"
-#undef LOG_GROUP
-#include "common/misc/RTAssertMsg1Weak.c"
-#undef LOG_GROUP
-#include "common/misc/RTAssertMsg2.c"
-#undef LOG_GROUP
-#include "common/misc/RTAssertMsg2Add.c"
-#undef LOG_GROUP
-#include "common/misc/RTAssertMsg2AddWeak.c"
-#undef LOG_GROUP
-#include "common/misc/RTAssertMsg2AddWeakV.c"
-#undef LOG_GROUP
-#include "common/misc/RTAssertMsg2Weak.c"
-#undef LOG_GROUP
-#include "common/misc/RTAssertMsg2WeakV.c"
-#undef LOG_GROUP
-#include "common/misc/assert.c"
-#undef LOG_GROUP
-#include "common/misc/handletable.c"
-#undef LOG_GROUP
-#include "common/misc/handletablectx.c"
-#undef LOG_GROUP
-#include "common/misc/thread.c"
 #undef LOG_GROUP
 #include "common/string/RTStrCat.c"
@@ -151 +95 @@
 #endif
 
-#if 0 /*def RT_ARCH_X86 - iprt/nocrt/limit.h clashes.*/
-# include "common/math/gcc/divdi3.c"
-# include "common/math/gcc/moddi3.c"
-# include "common/math/gcc/udivdi3.c"
-# include "common/math/gcc/udivmoddi4.c"
-# include "common/math/gcc/umoddi3.c"
-# include "common/math/gcc/qdivrem.c"
-#endif
-
-
-

trunk/src/VBox/HostDrivers/Support/linux/files_vboxdrv

@@ -85 +85 @@
     ${PATH_ROOT}/include/VBox/vmm/hm_svm.h=>include/VBox/vmm/hm_svm.h \
     ${PATH_ROOT}/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c=>linux/SUPDrv-linux.c \
-    ${PATH_ROOT}/src/VBox/HostDrivers/Support/linux/combined-agnostic.c=>combined-agnostic.c \
+    ${PATH_ROOT}/src/VBox/HostDrivers/Support/linux/combined-agnostic1.c=>combined-agnostic1.c \
+    ${PATH_ROOT}/src/VBox/HostDrivers/Support/linux/combined-agnostic2.c=>combined-agnostic2.c \
     ${PATH_ROOT}/src/VBox/HostDrivers/Support/linux/combined-os-specific.c=>combined-os-specific.c \
     ${PATH_ROOT}/src/VBox/HostDrivers/Support/SUPDrv.cpp=>SUPDrv.c \