From owner-svn-ports-all@freebsd.org Thu May 31 03:53:38 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2FE8DF70172; Thu, 31 May 2018 03:53:38 +0000 (UTC) (envelope-from vanilla@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C92576DB6A; Thu, 31 May 2018 03:53:37 +0000 (UTC) (envelope-from vanilla@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A593114F4F; Thu, 31 May 2018 03:53:37 +0000 (UTC) (envelope-from vanilla@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4V3rb4G004318; Thu, 31 May 2018 03:53:37 GMT (envelope-from vanilla@FreeBSD.org) Received: (from vanilla@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4V3rYsq004299; Thu, 31 May 2018 03:53:34 GMT (envelope-from vanilla@FreeBSD.org) Message-Id: <201805310353.w4V3rYsq004299@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: vanilla set sender to vanilla@FreeBSD.org using -f From: "Vanilla I. Shu" Date: Thu, 31 May 2018 03:53:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r471193 - in head/databases/foundationdb: . files X-SVN-Group: ports-head X-SVN-Commit-Author: vanilla X-SVN-Commit-Paths: in head/databases/foundationdb: . files X-SVN-Commit-Revision: 471193 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 May 2018 03:53:38 -0000 Author: vanilla Date: Thu May 31 03:53:34 2018 New Revision: 471193 URL: https://svnweb.freebsd.org/changeset/ports/471193 Log: Update to 5.2.2. Added: head/databases/foundationdb/files/patch-build_csprojtom4.py (contents, props changed) head/databases/foundationdb/files/patch-build_vcxprojtom4.py (contents, props changed) Deleted: head/databases/foundationdb/files/patch-fdbclient_MultiVersionAssignmentVars.h head/databases/foundationdb/files/patch-fdbclient_NativeAPI.actor.cpp head/databases/foundationdb/files/patch-fdbrpc_AsyncFileCached.actor.h head/databases/foundationdb/files/patch-fdbserver_TLogServer.actor.cpp head/databases/foundationdb/files/patch-fdbserver_VFSAsync.cpp head/databases/foundationdb/files/patch-flow_IThreadPool.cpp Modified: head/databases/foundationdb/Makefile head/databases/foundationdb/distinfo head/databases/foundationdb/files/patch-FDBLibTLS_local.mk head/databases/foundationdb/files/patch-Makefile head/databases/foundationdb/files/patch-fdbmonitor_fdbmonitor.cpp head/databases/foundationdb/files/patch-fdbrpc_AsyncFileCached.actor.cpp head/databases/foundationdb/files/patch-fdbrpc_IAsyncFile.actor.cpp head/databases/foundationdb/files/patch-fdbrpc_Platform.cpp head/databases/foundationdb/files/patch-fdbserver_fdbserver.actor.cpp head/databases/foundationdb/files/patch-fdbserver_worker.actor.cpp head/databases/foundationdb/files/patch-flow_Deque.h head/databases/foundationdb/files/patch-flow_Net2.actor.cpp head/databases/foundationdb/files/patch-flow_Platform.cpp head/databases/foundationdb/files/patch-flow_Platform.h head/databases/foundationdb/files/patch-flow_ThreadPrimitives.cpp head/databases/foundationdb/files/patch-flow_ThreadPrimitives.h Modified: head/databases/foundationdb/Makefile ============================================================================== --- head/databases/foundationdb/Makefile Thu May 31 02:53:36 2018 (r471192) +++ head/databases/foundationdb/Makefile Thu May 31 03:53:34 2018 (r471193) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= foundationdb -PORTVERSION= 5.1.7 +PORTVERSION= 5.2.2 CATEGORIES= databases MAINTAINER= vanilla@FreeBSD.org @@ -22,8 +22,10 @@ USES= compiler:c++14-lang gmake mono python:build she USE_GITHUB= yes GH_ACCOUNT= apple USE_RC_SUBR= foundationdb -SHEBANG_FILES= build/link-wrapper.sh bindings/c/generate_asm.py +SHEBANG_FILES= build/csprojtom4.py build/link-wrapper.sh build/vcxprojtom4.py \ + bindings/c/generate_asm.py MAKE_ENV+= PYTHON=${PYTHON_CMD} +CXXFLAGS+= -Wno-varargs USERS= ${PORTNAME} GROUPS= ${PORTNAME} Modified: head/databases/foundationdb/distinfo ============================================================================== --- head/databases/foundationdb/distinfo Thu May 31 02:53:36 2018 (r471192) +++ head/databases/foundationdb/distinfo Thu May 31 03:53:34 2018 (r471193) @@ -1,3 +1,3 @@ -TIMESTAMP = 1524403792 -SHA256 (apple-foundationdb-5.1.7_GH0.tar.gz) = 6dd8b391527fc8070c9714117e0ed2ced50d993b20d64f3f2981bf9ef8734870 -SIZE (apple-foundationdb-5.1.7_GH0.tar.gz) = 3982458 +TIMESTAMP = 1527730920 +SHA256 (apple-foundationdb-5.2.2_GH0.tar.gz) = f632b354cc6ebfdcb5133278901511129a341806d3aa4f4184cc13766f7d841e +SIZE (apple-foundationdb-5.2.2_GH0.tar.gz) = 4495353 Modified: head/databases/foundationdb/files/patch-FDBLibTLS_local.mk ============================================================================== --- head/databases/foundationdb/files/patch-FDBLibTLS_local.mk Thu May 31 02:53:36 2018 (r471192) +++ head/databases/foundationdb/files/patch-FDBLibTLS_local.mk Thu May 31 03:53:34 2018 (r471193) @@ -1,10 +1,10 @@ ---- FDBLibTLS/local.mk.orig 2018-04-19 02:55:50 UTC +--- FDBLibTLS/local.mk.orig 2018-05-16 23:59:08 UTC +++ FDBLibTLS/local.mk @@ -1,6 +1,6 @@ --FDBLibTLS_CFLAGS := -fPIC -I/usr/local/include -I$(BOOSTDIR) +-FDBLibTLS_CFLAGS := -fPIC -I/usr/local/include -I$(BOOSTDIR) -Ifdbrpc -FDBLibTLS_STATIC_LIBS := -ltls -lssl -lcrypto -FDBLibTLS_LDFLAGS := -L/usr/local/lib -static-libstdc++ -static-libgcc -lrt -+FDBLibTLS_CFLAGS := -fPIC -I/usr/local/include -I$(BOOSTDIR)/include ++FDBLibTLS_CFLAGS := -fPIC -I/usr/local/include -I$(BOOSTDIR)/include -I../fdbrpc +FDBLibTLS_LIBS := -lssl -lcrypto +FDBLibTLS_LDFLAGS := -lc++ FDBLibTLS_LDFLAGS += -Wl,-soname,FDBLibTLS.so -Wl,--version-script=FDBLibTLS/FDBLibTLS.map Modified: head/databases/foundationdb/files/patch-Makefile ============================================================================== --- head/databases/foundationdb/files/patch-Makefile Thu May 31 02:53:36 2018 (r471192) +++ head/databases/foundationdb/files/patch-Makefile Thu May 31 03:53:34 2018 (r471193) @@ -1,4 +1,4 @@ ---- Makefile.orig 2018-04-19 02:55:50 UTC +--- Makefile.orig 2018-05-11 01:30:59 UTC +++ Makefile @@ -6,6 +6,8 @@ TOPDIR := $(shell pwd) @@ -43,7 +43,7 @@ OTHER_PROJECTS := bindings/python bindings/ruby bindings/go CS_MK_GENERATED := $(CS_PROJECTS:=/generated.mk) -@@ -101,7 +112,7 @@ CPP_MK_GENERATED := $(CPP_PROJECTS:=/gen +@@ -101,7 +112,7 @@ CPP_MK_GENERATED := $(CPP_PROJECTS:=/generated.mk) MK_GENERATED := $(CS_MK_GENERATED) $(CPP_MK_GENERATED) # build/valgrind.mk needs to be included before any _MK_GENERATED (which in turn includes local.mk) Added: head/databases/foundationdb/files/patch-build_csprojtom4.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/foundationdb/files/patch-build_csprojtom4.py Thu May 31 03:53:34 2018 (r471193) @@ -0,0 +1,55 @@ +--- build/csprojtom4.py.orig 2018-05-31 02:58:48 UTC ++++ build/csprojtom4.py +@@ -1,5 +1,5 @@ + #!/usr/local/bin/python2.7 +-# ++#i + # csprojtom4.py + # + # This source file is part of the FoundationDB open source project +@@ -23,8 +23,8 @@ + import sys + + if len(sys.argv) != 2: +- print """Usage: +- %s [input]""" % sys.argv[0] ++ print("""Usage: ++ %s [input]""" % sys.argv[0]) + sys.exit() + + csproj = sys.argv[1] +@@ -34,20 +34,20 @@ from xml.dom.minidom import parse + try: + dom = parse(csproj) + except: +- print "ERROR: Unable to open CSProj file %s" % csproj ++ print("ERROR: Unable to open CSProj file %s" % csproj) + sys.exit() + + outputType = dom.getElementsByTagName("OutputType")[0].childNodes[0].data + assemblyName = dom.getElementsByTagName("AssemblyName")[0].childNodes[0].data + + if outputType == "Exe": +- print "define(`GENTARGET', `bin/%s.exe')dnl" % assemblyName +- print "define(`GENOUTPUTTYPE', `exe')dnl" ++ print("define(`GENTARGET', `bin/%s.exe')dnl" % assemblyName) ++ print("define(`GENOUTPUTTYPE', `exe')dnl") + elif outputType == "Library": +- print "define(`GENTARGET', `bin/%s.dll')dnl" % assemblyName +- print "define(`GENOUTPUTTYPE', `library')dnl" ++ print("define(`GENTARGET', `bin/%s.dll')dnl" % assemblyName) ++ print("define(`GENOUTPUTTYPE', `library')dnl") + else: +- print "ERROR: Unable to determine output type" ++ print("ERROR: Unable to determine output type") + sys.exit() + + sources = [node.getAttribute("Include").replace('\\', '/') for node in +@@ -55,5 +55,5 @@ sources = [node.getAttribute("Include").replace('\\', + assemblies = [node.getAttribute("Include") for node in + dom.getElementsByTagName("Reference")] + +-print "define(`GENSOURCES', `%s')dnl" % ' '.join(sources) +-print "define(`GENREFERENCES', `%s')dnl" % ','.join(assemblies) ++print("define(`GENSOURCES', `%s')dnl" % ' '.join(sources)) ++print("define(`GENREFERENCES', `%s')dnl" % ','.join(assemblies)) Added: head/databases/foundationdb/files/patch-build_vcxprojtom4.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/foundationdb/files/patch-build_vcxprojtom4.py Thu May 31 03:53:34 2018 (r471193) @@ -0,0 +1,56 @@ +--- build/vcxprojtom4.py.orig 2018-05-31 02:52:54 UTC ++++ build/vcxprojtom4.py +@@ -23,8 +23,8 @@ + import sys + + if len(sys.argv) != 2: +- print """Usage: +- %s [input]""" % sys.argv[0] ++ print("""Usage: ++ %s [input]""" % sys.argv[0]) + sys.exit() + + vcxproj = sys.argv[1] +@@ -34,7 +34,7 @@ from xml.dom.minidom import parse + try: + dom = parse(vcxproj) + except: +- print "ERROR: Unable to open VCXProj file %s" % vcxproj ++ print("ERROR: Unable to open VCXProj file %s" % vcxproj) + sys.exit() + + # We need to find out what kind of project/configuration we're going +@@ -49,19 +49,19 @@ for group in groups: + configType = ctnodes[0].childNodes[0].data + break + +-print "define(`GENCONFIGTYPE', `%s')dnl" % configType ++print("define(`GENCONFIGTYPE', `%s')dnl" % configType) + + if configType == "StaticLibrary": +- print "define(`GENTARGET', `lib/lib`'GENNAME.a')dnl" +- print "define(`GENOUTDIR', `lib')dnl" ++ print("define(`GENTARGET', `lib/lib`'GENNAME.a')dnl") ++ print("define(`GENOUTDIR', `lib')dnl") + elif configType == "DynamicLibrary": +- print "define(`GENTARGET', `lib/lib`'GENNAME.$(DLEXT)')dnl" +- print "define(`GENOUTDIR', `lib')dnl" ++ print("define(`GENTARGET', `lib/lib`'GENNAME.$(DLEXT)')dnl") ++ print("define(`GENOUTDIR', `lib')dnl") + elif configType == "Application": +- print "define(`GENTARGET', `bin/'`GENNAME')dnl" +- print "define(`GENOUTDIR', `bin')dnl" ++ print("define(`GENTARGET', `bin/'`GENNAME')dnl") ++ print("define(`GENOUTDIR', `bin')dnl") + else: +- print "ERROR: Unable to determine configuration type" ++ print("ERROR: Unable to determine configuration type") + sys.exit() + + sources = [node.getAttribute("Include").replace('\\', '/') for node in +@@ -70,4 +70,4 @@ sources = [node.getAttribute("Include").replace('\\', + dom.getElementsByTagName("ClInclude") + if not node.getElementsByTagName("ExcludedFromBuild") and node.hasAttribute("Include")] + +-print "define(`GENSOURCES', `%s')dnl" % ' '.join(sorted(sources)) ++print("define(`GENSOURCES', `%s')dnl" % ' '.join(sorted(sources))) Modified: head/databases/foundationdb/files/patch-fdbmonitor_fdbmonitor.cpp ============================================================================== --- head/databases/foundationdb/files/patch-fdbmonitor_fdbmonitor.cpp Thu May 31 02:53:36 2018 (r471192) +++ head/databases/foundationdb/files/patch-fdbmonitor_fdbmonitor.cpp Thu May 31 03:53:34 2018 (r471193) @@ -1,4 +1,4 @@ ---- fdbmonitor/fdbmonitor.cpp.orig 2018-04-19 02:55:50 UTC +--- fdbmonitor/fdbmonitor.cpp.orig 2018-05-11 01:30:59 UTC +++ fdbmonitor/fdbmonitor.cpp @@ -35,6 +35,10 @@ #include @@ -20,7 +20,7 @@ typedef int fdb_fd_set; #endif -@@ -83,7 +87,7 @@ void monitor_fd( fdb_fd_set list, int fd +@@ -83,7 +87,7 @@ void monitor_fd( fdb_fd_set list, int fd, int* maxfd, FD_SET( fd, list ); if ( fd > *maxfd ) *maxfd = fd; @@ -29,7 +29,7 @@ /* ignore maxfd */ struct kevent ev; EV_SET( &ev, fd, EVFILT_READ, EV_ADD, 0, 0, cmd ); -@@ -94,7 +98,7 @@ void monitor_fd( fdb_fd_set list, int fd +@@ -94,7 +98,7 @@ void monitor_fd( fdb_fd_set list, int fd, int* maxfd, void unmonitor_fd( fdb_fd_set list, int fd ) { #ifdef __linux__ FD_CLR( fd, list ); @@ -38,7 +38,7 @@ struct kevent ev; EV_SET( &ev, fd, EVFILT_READ, EV_DELETE, 0, 0, NULL ); kevent( list, &ev, 1, NULL, 0, NULL ); // FIXME: check? -@@ -188,7 +192,7 @@ const char* get_value_multi(const CSimpl +@@ -188,7 +192,7 @@ const char* get_value_multi(const CSimpleIni& ini, con } double timer() { @@ -47,7 +47,7 @@ struct timespec ts; clock_gettime(CLOCK_MONOTONIC, &ts); return double(ts.tv_sec) + (ts.tv_nsec * 1e-9); -@@ -822,7 +826,7 @@ void read_child_output( Command* cmd, in +@@ -822,7 +826,7 @@ void read_child_output( Command* cmd, int pipe_idx, fd } } @@ -56,7 +56,7 @@ void watch_conf_dir( int kq, int* confd_fd, std::string confdir ) { struct kevent ev; std::string original = confdir; -@@ -839,7 +843,7 @@ void watch_conf_dir( int kq, int* confd_ +@@ -839,7 +843,7 @@ void watch_conf_dir( int kq, int* confd_fd, std::strin std::string child = confdir; /* Find the nearest existing ancestor */ @@ -65,7 +65,7 @@ child = confdir; confdir = parentDirectory(confdir); } -@@ -876,7 +880,7 @@ void watch_conf_file( int kq, int* conff +@@ -876,7 +880,7 @@ void watch_conf_file( int kq, int* conff_fd, const cha } /* Open and watch */ @@ -74,7 +74,7 @@ if ( *conff_fd >= 0 ) { EV_SET( &ev, *conff_fd, EVFILT_VNODE, EV_ADD | EV_CLEAR, NOTE_WRITE | NOTE_ATTRIB, 0, NULL ); kevent( kq, &ev, 1, NULL, 0, NULL ); -@@ -983,7 +987,7 @@ std::unordered_mappageSize == 4096) @@ -9,12 +9,3 @@ } if (index > -1) { pageCache->pages[index] = pageCache->pages.back(); -@@ -233,7 +233,7 @@ Future AsyncFileCached::quiesce() - AsyncFileCached::~AsyncFileCached() { - while ( !pages.empty() ) { - auto ok = pages.begin()->second->evict(); -- ASSERT( ok ); -+ ASSERT_ABORT( ok ); - } - openFiles.erase( filename ); - } Modified: head/databases/foundationdb/files/patch-fdbrpc_IAsyncFile.actor.cpp ============================================================================== --- head/databases/foundationdb/files/patch-fdbrpc_IAsyncFile.actor.cpp Thu May 31 02:53:36 2018 (r471192) +++ head/databases/foundationdb/files/patch-fdbrpc_IAsyncFile.actor.cpp Thu May 31 03:53:34 2018 (r471193) @@ -1,6 +1,6 @@ ---- fdbrpc/IAsyncFile.actor.cpp.orig 2018-04-25 15:06:34 UTC +--- fdbrpc/IAsyncFile.actor.cpp.orig 2018-05-11 01:30:59 UTC +++ fdbrpc/IAsyncFile.actor.cpp -@@ -42,7 +42,7 @@ ACTOR static Future zeroRangeHelpe +@@ -42,7 +42,7 @@ ACTOR static Future zeroRangeHelper( Reference @@ -9,7 +9,7 @@ #include #include #ifdef ALLOC_INSTRUMENTATION -@@ -72,6 +72,7 @@ +@@ -73,6 +73,7 @@ #endif #include "flow/SimpleOpt.h" @@ -17,7 +17,7 @@ enum { OPT_CONNFILE, OPT_SEEDCONNFILE, OPT_SEEDCONNSTRING, OPT_ROLE, OPT_LISTEN, OPT_PUBLICADDR, OPT_DATAFOLDER, OPT_LOGFOLDER, OPT_PARENTPID, OPT_NEWCONSOLE, OPT_NOBOX, OPT_TESTFILE, OPT_RESTARTING, OPT_RANDOMSEED, OPT_KEY, OPT_MEMLIMIT, OPT_STORAGEMEMLIMIT, OPT_MACHINEID, OPT_DCID, OPT_MACHINE_CLASS, OPT_BUGGIFY, OPT_VERSION, OPT_CRASHONERROR, OPT_HELP, OPT_NETWORKIMPL, OPT_NOBUFSTDOUT, OPT_BUFSTDOUTERR, OPT_TRACECLOCK, OPT_NUMTESTERS, OPT_DEVHELP, OPT_ROLLSIZE, OPT_MAXLOGS, OPT_MAXLOGSSIZE, OPT_KNOB, OPT_TESTSERVERS, OPT_TEST_ON_SERVERS, OPT_METRICSCONNFILE, OPT_METRICSPREFIX, -@@ -350,7 +351,7 @@ public: +@@ -351,7 +352,7 @@ class WorldReadablePermissions { (public) throw platform_error(); } permission.set_permissions( &sa ); @@ -26,7 +26,7 @@ // There is nothing to do here, since the default permissions are fine #else #error Port me! -@@ -360,7 +361,7 @@ public: +@@ -361,7 +362,7 @@ class WorldReadablePermissions { (public) virtual ~WorldReadablePermissions() { #ifdef _WIN32 LocalFree( sa.lpSecurityDescriptor ); Modified: head/databases/foundationdb/files/patch-fdbserver_worker.actor.cpp ============================================================================== --- head/databases/foundationdb/files/patch-fdbserver_worker.actor.cpp Thu May 31 02:53:36 2018 (r471192) +++ head/databases/foundationdb/files/patch-fdbserver_worker.actor.cpp Thu May 31 03:53:34 2018 (r471193) @@ -1,4 +1,4 @@ ---- fdbserver/worker.actor.cpp.orig 2018-04-26 12:45:22 UTC +--- fdbserver/worker.actor.cpp.orig 2018-05-11 01:30:59 UTC +++ fdbserver/worker.actor.cpp @@ -39,7 +39,7 @@ #include "fdbclient/ClientWorkerInterface.h" @@ -9,7 +9,7 @@ #ifdef USE_GPERFTOOLS #include "gperftools/profiler.h" #endif -@@ -267,7 +267,7 @@ ACTOR Future registrationClient( R +@@ -267,7 +267,7 @@ ACTOR Future registrationClient( Reference volatile double net2liveness = 0; -@@ -403,8 +403,7 @@ private: +@@ -403,8 +403,7 @@ class Connection : public IConnection, ReferenceCounte void init() { // Socket settings that have to be set after connect or accept succeeds Modified: head/databases/foundationdb/files/patch-flow_Platform.cpp ============================================================================== --- head/databases/foundationdb/files/patch-flow_Platform.cpp Thu May 31 02:53:36 2018 (r471192) +++ head/databases/foundationdb/files/patch-flow_Platform.cpp Thu May 31 03:53:34 2018 (r471193) @@ -1,4 +1,4 @@ ---- flow/Platform.cpp.orig 2018-04-19 02:55:50 UTC +--- flow/Platform.cpp.orig 2018-05-11 01:30:59 UTC +++ flow/Platform.cpp @@ -71,6 +71,7 @@ @@ -8,7 +8,7 @@ #include #include #include -@@ -119,6 +120,12 @@ +@@ -119,7 +120,13 @@ #include #endif @@ -17,10 +17,11 @@ +#include +#include +#include -+#endif #endif ++#endif std::string removeWhitespace(const std::string &t) + { @@ -198,7 +205,7 @@ double getProcessorTimeThread() { throw platform_error(); } @@ -54,7 +55,7 @@ return 0; #endif } -@@ -427,6 +442,24 @@ void getMachineRAMInfo(MachineRAMInfo& m +@@ -427,6 +442,24 @@ void getMachineRAMInfo(MachineRAMInfo& memInfo) { memInfo.total = pagesize * (vm_stat.free_count + vm_stat.active_count + vm_stat.inactive_count + vm_stat.wire_count); memInfo.available = pagesize * vm_stat.free_count; memInfo.committed = memInfo.total - memInfo.available; @@ -79,7 +80,7 @@ #else #warning getMachineRAMInfo unimplemented on this platform #endif -@@ -435,7 +468,7 @@ void getMachineRAMInfo(MachineRAMInfo& m +@@ -435,7 +468,7 @@ void getMachineRAMInfo(MachineRAMInfo& memInfo) { void getDiskBytes(std::string const& directory, int64_t& free, int64_t& total) { INJECT_FAULT( platform_error, "getDiskBytes" ); #if defined(__unixish__) @@ -88,7 +89,7 @@ struct statvfs buf; if (statvfs(directory.c_str(), &buf)) { TraceEvent(SevError, "GetDiskBytesStatvfsError").detail("Directory", directory).GetLastError(); -@@ -477,7 +510,7 @@ void getDiskBytes(std::string const& dir +@@ -477,7 +510,7 @@ void getDiskBytes(std::string const& directory, int64_ #endif } @@ -155,7 +156,7 @@ struct timespec ts; clock_gettime(CLOCK_REALTIME, &ts); return uint64_t(ts.tv_sec) * 1e9 + ts.tv_nsec; -@@ -1481,7 +1538,7 @@ static void *allocateInternal(size_t len +@@ -1481,7 +1538,7 @@ static void *allocateInternal(size_t length, bool larg flags |= MAP_HUGETLB; return mmap(NULL, length, PROT_READ|PROT_WRITE, flags, -1, 0); @@ -176,7 +177,7 @@ #endif } -@@ -1615,7 +1677,7 @@ void renameFile( std::string const& from +@@ -1615,7 +1677,7 @@ void renameFile( std::string const& fromPath, std::str //renamedFile(); return; } @@ -185,7 +186,7 @@ if (!rename( fromPath.c_str(), toPath.c_str() )) { //FIXME: We cannot inject faults after renaming the file, because we could end up with two asyncFileNonDurable open for the same file //renamedFile(); -@@ -1733,7 +1795,7 @@ bool createDirectory( std::string const& +@@ -1733,7 +1795,7 @@ bool createDirectory( std::string const& directory ) { } TraceEvent(SevError, "CreateDirectory").detail("Directory", directory).GetLastError(); throw platform_error(); @@ -194,7 +195,7 @@ size_t sep = 0; do { sep = directory.find_first_of('/', sep + 1); -@@ -1774,7 +1836,7 @@ std::string abspath( std::string const& +@@ -1774,7 +1836,7 @@ std::string abspath( std::string const& filename ) { if (*x == '/') *x = CANONICAL_PATH_SEPARATOR; return nameBuffer; @@ -221,7 +222,7 @@ return S_ISREG(fileAttributes) && StringRef(name).endsWith(extension); #else #error Port me! -@@ -1858,7 +1920,7 @@ bool acceptFile( FILE_ATTRIBUTE_DATA fil +@@ -1858,7 +1920,7 @@ bool acceptFile( FILE_ATTRIBUTE_DATA fileAttributes, s bool acceptDirectory( FILE_ATTRIBUTE_DATA fileAttributes, std::string name, std::string extension ) { #ifdef _WIN32 return (fileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0; @@ -230,7 +231,7 @@ return S_ISDIR(fileAttributes); #else #error Port me! -@@ -1894,7 +1956,7 @@ std::vector findFiles( std: +@@ -1894,7 +1956,7 @@ std::vector findFiles( std::string const& } FindClose(h); } @@ -239,7 +240,7 @@ DIR *dip; if ((dip = opendir(directory.c_str())) != NULL) { -@@ -1958,7 +2020,7 @@ void findFilesRecursively(std::string pa +@@ -1958,7 +2020,7 @@ void findFilesRecursively(std::string path, std::vecto void threadSleep( double seconds ) { #ifdef _WIN32 Sleep( (DWORD)(seconds * 1e3) ); @@ -248,7 +249,7 @@ struct timespec req, rem; req.tv_sec = seconds; -@@ -1996,7 +2058,7 @@ void makeTemporary( const char* filename +@@ -1996,7 +2058,7 @@ void makeTemporary( const char* filename ) { THREAD_HANDLE startThread(void (*func) (void *), void *arg) { return (void *)_beginthread(func, 0, arg); } @@ -257,7 +258,7 @@ THREAD_HANDLE startThread(void *(*func) (void *), void *arg) { pthread_t t; pthread_create(&t, NULL, func, arg); -@@ -2009,7 +2071,7 @@ THREAD_HANDLE startThread(void *(*func) +@@ -2009,7 +2071,7 @@ THREAD_HANDLE startThread(void *(*func) (void *), void void waitThread(THREAD_HANDLE thread) { #ifdef _WIN32 WaitForSingleObject(thread, INFINITE); @@ -266,7 +267,7 @@ pthread_join(thread, NULL); #else #error Port me! -@@ -2038,7 +2100,7 @@ int64_t fileSize(std::string const& file +@@ -2038,7 +2100,7 @@ int64_t fileSize(std::string const& filename) { return 0; else return file_status.st_size; @@ -275,7 +276,7 @@ struct stat file_status; if(stat(filename.c_str(), &file_status) != 0) return 0; -@@ -2181,6 +2243,8 @@ std::string getDefaultPluginPath( const +@@ -2181,6 +2243,8 @@ std::string getDefaultPluginPath( const char* plugin_n return format( "/usr/lib/foundationdb/plugins/%s.so", plugin_name ); #elif defined(__APPLE__) return format( "/usr/local/foundationdb/plugins/%s.dylib", plugin_name ); @@ -293,7 +294,7 @@ #error Port me! #endif -@@ -2446,7 +2510,7 @@ bool isLibraryLoaded(const char* lib_pat +@@ -2446,7 +2510,7 @@ bool isLibraryLoaded(const char* lib_path) { } void* loadLibrary(const char* lib_path) { Modified: head/databases/foundationdb/files/patch-flow_Platform.h ============================================================================== --- head/databases/foundationdb/files/patch-flow_Platform.h Thu May 31 02:53:36 2018 (r471192) +++ head/databases/foundationdb/files/patch-flow_Platform.h Thu May 31 03:53:34 2018 (r471193) @@ -1,4 +1,4 @@ ---- flow/Platform.h.orig 2018-04-22 14:30:05 UTC +--- flow/Platform.h.orig 2018-05-11 01:30:59 UTC +++ flow/Platform.h @@ -22,7 +22,7 @@ #define FLOW_PLATFORM_H @@ -9,12 +9,12 @@ #define __unixish__ 1 #endif -@@ -183,6 +183,8 @@ THREAD_HANDLE startThread(void *(func) ( +@@ -182,6 +182,8 @@ THREAD_HANDLE startThread(void *(func) (void *), void + #if defined(_WIN32) #define DYNAMIC_LIB_EXT ".dll" #elif defined(__linux) - #define DYNAMIC_LIB_EXT ".so" -+#elif defined(__FreeBSD__) +#define DYNAMIC_LIB_EXT ".so" ++#elif defined(__FreeBSD__) + #define DYNAMIC_LIB_EXT ".so" #elif defined(__APPLE__) #define DYNAMIC_LIB_EXT ".dylib" - #else Modified: head/databases/foundationdb/files/patch-flow_ThreadPrimitives.cpp ============================================================================== --- head/databases/foundationdb/files/patch-flow_ThreadPrimitives.cpp Thu May 31 02:53:36 2018 (r471192) +++ head/databases/foundationdb/files/patch-flow_ThreadPrimitives.cpp Thu May 31 03:53:34 2018 (r471193) @@ -1,6 +1,6 @@ ---- flow/ThreadPrimitives.cpp.orig 2018-04-24 15:27:55 UTC +--- flow/ThreadPrimitives.cpp.orig 2018-05-11 01:30:59 UTC +++ flow/ThreadPrimitives.cpp -@@ -37,7 +37,7 @@ extern std::string format( const char *f +@@ -37,7 +37,7 @@ extern std::string format( const char *form, ... ); Event::Event() { #ifdef _WIN32 ev = CreateEvent(NULL, FALSE, FALSE, NULL); Modified: head/databases/foundationdb/files/patch-flow_ThreadPrimitives.h ============================================================================== --- head/databases/foundationdb/files/patch-flow_ThreadPrimitives.h Thu May 31 02:53:36 2018 (r471192) +++ head/databases/foundationdb/files/patch-flow_ThreadPrimitives.h Thu May 31 03:53:34 2018 (r471193) @@ -1,4 +1,4 @@ ---- flow/ThreadPrimitives.h.orig 2018-04-22 14:33:39 UTC +--- flow/ThreadPrimitives.h.orig 2018-05-11 01:30:59 UTC +++ flow/ThreadPrimitives.h @@ -25,7 +25,7 @@ #include "Error.h" @@ -9,7 +9,7 @@ #include #endif -@@ -63,11 +63,11 @@ public: +@@ -63,11 +63,11 @@ class ThreadSpinLock { (public) #endif } void leave() { @@ -23,12 +23,12 @@ __sync_synchronize(); #endif #if VALGRIND -@@ -117,6 +117,8 @@ private: +@@ -116,6 +116,8 @@ class Event { (private) + #ifdef _WIN32 void* ev; #elif defined(__linux__) - sem_t sem; -+#elif defined(__FreeBSD__) + sem_t sem; ++#elif defined(__FreeBSD__) + sem_t sem; #elif defined(__APPLE__) mach_port_t self; - semaphore_t sem;