Index: /trunk/Config.kmk =================================================================== --- /trunk/Config.kmk (revision 55094) +++ /trunk/Config.kmk (revision 55095) @@ -727,5 +727,5 @@ #VBOX_WITH_DTRACE_GST = 1 # Set this to indicate that the host ships with DTrace. -if1of ($(KBUILD_TARGET), darwin solaris freebsd) +if1of ($(KBUILD_TARGET), darwin solaris) VBOX_WITH_NATIVE_DTRACE = 1 endif @@ -3697,5 +3697,5 @@ -Wstrict-prototypes -Wmissing-prototypes -Wstrict-prototypes \ -Wimplicit-function-declaration -Werror-implicit-function-declaration \ - -O2 -fformat-extensions -ffreestanding -fno-strict-aliasing -fno-common -finline-limit=8000 \ + -O2 -ffreestanding -fno-strict-aliasing -fno-common -finline-limit=8000 \ $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \ -nostdinc -std=c99 @@ -3706,5 +3706,5 @@ TEMPLATE_VBOXR0DRV_CXXFLAGS = -fno-exceptions -fno-rtti \ $(VBOX_GCC_WARN) -Wpointer-arith -Winline \ - -O2 -fno-format-extensions -fno-strict-aliasing -fno-common -finline-limit=8000 \ + -O2 -fno-strict-aliasing -fno-common -finline-limit=8000 \ $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \ -nostdinc Index: /trunk/src/VBox/Devices/Network/slirp/resolv_conf_parser.c =================================================================== --- /trunk/src/VBox/Devices/Network/slirp/resolv_conf_parser.c (revision 55094) +++ /trunk/src/VBox/Devices/Network/slirp/resolv_conf_parser.c (revision 55095) @@ -22,4 +22,8 @@ #include #include + +#ifdef RT_OS_FREEBSD +# include +#endif #include Index: /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk (revision 55094) +++ /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk (revision 55095) @@ -191,5 +191,5 @@ VirtualBox_LIBS = $(LIB_DDU) -if1of ($(KBUILD_TARGET), linux freebsd netbsd openbsd) +if1of ($(KBUILD_TARGET), linux netbsd openbsd) VirtualBox_LIBS += dl endif Index: /trunk/src/VBox/HostDrivers/Support/freebsd/Makefile =================================================================== --- /trunk/src/VBox/HostDrivers/Support/freebsd/Makefile (revision 55094) +++ /trunk/src/VBox/HostDrivers/Support/freebsd/Makefile (revision 55095) @@ -83,4 +83,5 @@ handletablectx.c \ once.c \ + term.c \ thread.c @@ -90,4 +91,5 @@ RTStrNLen.c \ RTStrCopy.c \ + RTStrCopyEx.c \ RTStrCopyP.c \ strformat.c \ @@ -173,4 +175,5 @@ semspinmutex-r0drv-generic.c \ mpnotification-r0drv-generic.c \ + threadctxhooks-r0drv-generic.c \ RTMpIsCpuWorkPending-r0drv-generic.c Index: /trunk/src/VBox/HostDrivers/Support/freebsd/files_vboxdrv =================================================================== --- /trunk/src/VBox/HostDrivers/Support/freebsd/files_vboxdrv (revision 55094) +++ /trunk/src/VBox/HostDrivers/Support/freebsd/files_vboxdrv (revision 55095) @@ -116,7 +116,9 @@ ${PATH_ROOT}/src/VBox/Runtime/common/misc/handletablectx.cpp=>common/misc/handletablectx.c \ ${PATH_ROOT}/src/VBox/Runtime/common/misc/once.cpp=>common/misc/once.c \ + ${PATH_ROOT}/src/VBox/Runtime/common/misc/term.cpp=>common/misc/term.c \ ${PATH_ROOT}/src/VBox/Runtime/common/misc/thread.cpp=>common/misc/thread.c \ ${PATH_ROOT}/src/VBox/Runtime/common/string/RTStrCopyP.cpp=>common/string/RTStrCopyP.c \ ${PATH_ROOT}/src/VBox/Runtime/common/string/RTStrCopy.cpp=>common/string/RTStrCopy.c \ + ${PATH_ROOT}/src/VBox/Runtime/common/string/RTStrCopyEx.cpp=>common/string/RTStrCopyEx.c \ ${PATH_ROOT}/src/VBox/Runtime/common/string/RTStrNCmp.cpp=>common/string/RTStrNCmp.c \ ${PATH_ROOT}/src/VBox/Runtime/common/string/RTStrNLen.cpp=>common/string/RTStrNLen.c \ Index: /trunk/src/VBox/Main/Makefile.kmk =================================================================== --- /trunk/src/VBox/Main/Makefile.kmk (revision 55094) +++ /trunk/src/VBox/Main/Makefile.kmk (revision 55095) @@ -440,5 +440,6 @@ VBoxSVC_SOURCES.freebsd = \ - src-server/freebsd/HostHardwareFreeBSD.cpp + src-server/freebsd/HostHardwareFreeBSD.cpp \ + src-server/HostDnsServiceResolvConf.cpp Index: /trunk/src/VBox/Main/src-server/freebsd/HostHardwareFreeBSD.cpp =================================================================== --- /trunk/src/VBox/Main/src-server/freebsd/HostHardwareFreeBSD.cpp (revision 55094) +++ /trunk/src/VBox/Main/src-server/freebsd/HostHardwareFreeBSD.cpp (revision 55095) @@ -39,4 +39,5 @@ # include # include +# include # include # include Index: /trunk/src/VBox/Main/src-server/freebsd/USBProxyServiceFreeBSD.cpp =================================================================== --- /trunk/src/VBox/Main/src-server/freebsd/USBProxyServiceFreeBSD.cpp (revision 55094) +++ /trunk/src/VBox/Main/src-server/freebsd/USBProxyServiceFreeBSD.cpp (revision 55095) @@ -115,10 +115,10 @@ AutoReadLock devLock(aDevice COMMA_LOCKVAL_SRC_POS); - LogFlowThisFunc(("aDevice=%s\n", aDevice->getName().c_str())); + LogFlowThisFunc(("aDevice=%s\n", aDevice->i_getName().c_str())); /* * Don't think we need to do anything when the device is held... fake it. */ - Assert(aDevice->getUnistate() == kHostUSBDeviceState_Capturing); + Assert(aDevice->i_getUnistate() == kHostUSBDeviceState_Capturing); devLock.release(); interruptWait(); @@ -134,10 +134,10 @@ AutoReadLock devLock(aDevice COMMA_LOCKVAL_SRC_POS); - LogFlowThisFunc(("aDevice=%s\n", aDevice->getName().c_str())); + LogFlowThisFunc(("aDevice=%s\n", aDevice->i_getName().c_str())); /* * We're not really holding it atm., just fake it. */ - Assert(aDevice->getUnistate() == kHostUSBDeviceState_ReleasingToHost); + Assert(aDevice->i_getUnistate() == kHostUSBDeviceState_ReleasingToHost); devLock.release(); interruptWait(); Index: /trunk/src/VBox/RDP/client/Makefile.kmk =================================================================== --- /trunk/src/VBox/RDP/client/Makefile.kmk (revision 55094) +++ /trunk/src/VBox/RDP/client/Makefile.kmk (revision 55095) @@ -122,4 +122,6 @@ rdesktop-vrdp_LIBS.solaris = \ nsl +rdesktop-vrdp_LIBS.freebsd = \ + iconv # Index: /trunk/src/VBox/Runtime/Makefile.kmk =================================================================== --- /trunk/src/VBox/Runtime/Makefile.kmk (revision 55094) +++ /trunk/src/VBox/Runtime/Makefile.kmk (revision 55095) @@ -1026,4 +1026,5 @@ generic/RTThreadGetNativeState-generic.cpp \ r3/freebsd/mp-freebsd.cpp \ + r3/freebsd/systemmem-freebsd.cpp \ r3/freebsd/rtProcInitExePath-freebsd.cpp \ r3/generic/allocex-r3-generic.cpp \ @@ -1033,5 +1034,4 @@ r3/posix/RTPathUserHome-posix.cpp \ r3/posix/RTSystemQueryOSInfo-posix.cpp \ - r3/posix/RTSystemQueryTotalRam-posix.cpp \ r3/posix/RTTimeNow-posix.cpp \ r3/posix/RTTimeSet-posix.cpp \ Index: /trunk/src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c =================================================================== --- /trunk/src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c (revision 55094) +++ /trunk/src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c (revision 55095) @@ -169,5 +169,7 @@ #endif vm_page_t pPage = vm_page_find_least(pMemFreeBSD->pObject, 0); +#if __FreeBSD_version < 1000000 vm_page_lock_queues(); +#endif for (vm_page_t pPage = vm_page_find_least(pMemFreeBSD->pObject, 0); pPage != NULL; @@ -176,5 +178,7 @@ vm_page_unwire(pPage, 0); } +#if __FreeBSD_version < 1000000 vm_page_unlock_queues(); +#endif #if __FreeBSD_version >= 1000030 VM_OBJECT_WUNLOCK(pMemFreeBSD->pObject); @@ -292,9 +296,13 @@ { pPage = vm_page_lookup(pObject, iPage); +#if __FreeBSD_version < 1000000 vm_page_lock_queues(); +#endif if (fWire) vm_page_unwire(pPage, 0); vm_page_free(pPage); +#if __FreeBSD_version < 1000000 vm_page_unlock_queues(); +#endif } #if __FreeBSD_version >= 1000030 Index: /trunk/src/VBox/Runtime/r3/freebsd/systemmem-freebsd.cpp =================================================================== --- /trunk/src/VBox/Runtime/r3/freebsd/systemmem-freebsd.cpp (revision 55095) +++ /trunk/src/VBox/Runtime/r3/freebsd/systemmem-freebsd.cpp (revision 55095) @@ -0,0 +1,98 @@ +/* $Id$ */ +/** @file + * IPRT - RTSystemQueryTotalRam, Linux ring-3. + */ + +/* + * Copyright (C) 2012-2013 Oracle Corporation + * + * This file is part of VirtualBox Open Source Edition (OSE), as + * available from http://www.virtualbox.org. This file is free software; + * you can redistribute it and/or modify it under the terms of the GNU + * General Public License (GPL) as published by the Free Software + * Foundation, in version 2 as it comes in the "COPYING" file of the + * VirtualBox OSE distribution. VirtualBox OSE is distributed in the + * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. + * + * The contents of this file may alternatively be used under the terms + * of the Common Development and Distribution License Version 1.0 + * (CDDL) only, as it comes in the "COPYING.CDDL" file of the + * VirtualBox OSE distribution, in which case the provisions of the + * CDDL are applicable instead of those of the GPL. + * + * You may elect to license modified versions of this file under the + * terms and conditions of either the GPL or the CDDL or both. + */ + + +/******************************************************************************* +* Header Files * +*******************************************************************************/ +#include +#include "internal/iprt.h" + +#include +#include +#include + +#include +#include +#include + + +RTDECL(int) RTSystemQueryTotalRam(uint64_t *pcb) +{ + int rc = VINF_SUCCESS; + u_long cbMemPhys = 0; + size_t cbParameter = sizeof(cbMemPhys); + + AssertPtrReturn(pcb, VERR_INVALID_POINTER); + + if (!sysctlbyname("hw.physmem", &cbMemPhys, &cbParameter, NULL, 0)) + { + *pcb = cbMemPhys; + return VINF_SUCCESS; + } + return RTErrConvertFromErrno(errno); +} + + +RTDECL(int) RTSystemQueryAvailableRam(uint64_t *pcb) +{ + AssertPtrReturn(pcb, VERR_INVALID_POINTER); + + int rc = VINF_SUCCESS; + u_int cPagesMemFree = 0; + u_int cPagesMemInactive = 0; + u_int cPagesMemCached = 0; + u_int cPagesMemUsed = 0; + int cbPage = 0; + size_t cbParameter; + int cProcessed = 0; + + cbParameter = sizeof(cPagesMemFree); + if (sysctlbyname("vm.stats.vm.v_free_count", &cPagesMemFree, &cbParameter, NULL, 0)) + rc = RTErrConvertFromErrno(errno); + cbParameter = sizeof(cPagesMemUsed); + if ( RT_SUCCESS(rc) + && sysctlbyname("vm.stats.vm.v_active_count", &cPagesMemUsed, &cbParameter, NULL, 0)) + rc = RTErrConvertFromErrno(errno); + cbParameter = sizeof(cPagesMemInactive); + if ( RT_SUCCESS(rc) + && sysctlbyname("vm.stats.vm.v_inactive_count", &cPagesMemInactive, &cbParameter, NULL, 0)) + rc = RTErrConvertFromErrno(errno); + cbParameter = sizeof(cPagesMemCached); + if ( RT_SUCCESS(rc) + && sysctlbyname("vm.stats.vm.v_cache_count", &cPagesMemCached, &cbParameter, NULL, 0)) + rc = RTErrConvertFromErrno(errno); + cbParameter = sizeof(cbPage); + if ( RT_SUCCESS(rc) + && sysctlbyname("hw.pagesize", &cbPage, &cbParameter, NULL, 0)) + rc = RTErrConvertFromErrno(errno); + + if (RT_SUCCESS(rc)) + *pcb = (cPagesMemFree + cPagesMemInactive + cPagesMemCached ) * cbPage; + + return rc; +} + Index: /trunk/src/VBox/ValidationKit/utils/cpu/cidet-app.cpp =================================================================== --- /trunk/src/VBox/ValidationKit/utils/cpu/cidet-app.cpp (revision 55094) +++ /trunk/src/VBox/ValidationKit/utils/cpu/cidet-app.cpp (revision 55095) @@ -1309,5 +1309,9 @@ g_AltStack.ss_size = _128K; # endif +#ifdef RT_OS_FREEBSD + g_AltStack.ss_sp = (char *)RTMemPageAlloc(g_AltStack.ss_size); +#else g_AltStack.ss_sp = RTMemPageAlloc(g_AltStack.ss_size); +#endif RTTESTI_CHECK_RET(g_AltStack.ss_sp != NULL, RTEXITCODE_FAILURE); RTTESTI_CHECK_RC_RET(sigaltstack(&g_AltStack, NULL), 0, RTEXITCODE_FAILURE);