svn commit: r477160 - in head/databases/foundationdb: . files
Vanilla I. Shu
vanilla at FreeBSD.org
Tue Aug 14 14:59:52 UTC 2018
Author: vanilla
Date: Tue Aug 14 14:59:46 2018
New Revision: 477160
URL: https://svnweb.freebsd.org/changeset/ports/477160
Log:
Update to 5.2.8, and fix building with boost 1.68.
PR: 229697
Modified:
head/databases/foundationdb/Makefile
head/databases/foundationdb/distinfo
head/databases/foundationdb/files/patch-Makefile
head/databases/foundationdb/files/patch-build_csprojtom4.py
head/databases/foundationdb/files/patch-build_vcxprojtom4.py
head/databases/foundationdb/files/patch-fdbbackup_local.mk
head/databases/foundationdb/files/patch-fdbcli_local.mk
head/databases/foundationdb/files/patch-fdbclient_local.mk
head/databases/foundationdb/files/patch-fdbmonitor_fdbmonitor.cpp
head/databases/foundationdb/files/patch-fdbrpc_IAsyncFile.actor.cpp
head/databases/foundationdb/files/patch-fdbrpc_Platform.cpp
head/databases/foundationdb/files/patch-fdbrpc_local.mk
head/databases/foundationdb/files/patch-fdbserver_fdbserver.actor.cpp
head/databases/foundationdb/files/patch-fdbserver_local.mk
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
head/databases/foundationdb/files/patch-flow_libs_system_src_error__code.cpp
head/databases/foundationdb/files/patch-flow_local.mk
Modified: head/databases/foundationdb/Makefile
==============================================================================
--- head/databases/foundationdb/Makefile Tue Aug 14 14:44:29 2018 (r477159)
+++ head/databases/foundationdb/Makefile Tue Aug 14 14:59:46 2018 (r477160)
@@ -2,9 +2,7 @@
# $FreeBSD$
PORTNAME= foundationdb
-PORTVERSION= 5.2.5
-#DISTVERSIONPREFIX= release-
-PORTREVISION= 1
+PORTVERSION= 5.2.8
CATEGORIES= databases
MAINTAINER= vanilla at FreeBSD.org
@@ -15,7 +13,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
ONLY_FOR_ARCHS= amd64
ONLY_FOR_ARCHS_REASON= not yet ported to anything other than amd64
-BROKEN= fails to build with boost 1.68, see bug 229697
BUILD_DEPENDS= bash:shells/bash
LIB_DEPENDS= libboost_system.so:devel/boost-libs \
Modified: head/databases/foundationdb/distinfo
==============================================================================
--- head/databases/foundationdb/distinfo Tue Aug 14 14:44:29 2018 (r477159)
+++ head/databases/foundationdb/distinfo Tue Aug 14 14:59:46 2018 (r477160)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1529928229
-SHA256 (apple-foundationdb-5.2.5_GH0.tar.gz) = 25056568dfe283456f5b6b6ff822db133ecafc78319a29b6243c536f357d13b5
-SIZE (apple-foundationdb-5.2.5_GH0.tar.gz) = 4495658
+TIMESTAMP = 1534256583
+SHA256 (apple-foundationdb-5.2.8_GH0.tar.gz) = c276c91a8bfc6f6aaeceeec26f4b3d5a79d806c7a4e66a9138e3299a232eede1
+SIZE (apple-foundationdb-5.2.8_GH0.tar.gz) = 4499309
Modified: head/databases/foundationdb/files/patch-Makefile
==============================================================================
--- head/databases/foundationdb/files/patch-Makefile Tue Aug 14 14:44:29 2018 (r477159)
+++ head/databases/foundationdb/files/patch-Makefile Tue Aug 14 14:59:46 2018 (r477160)
@@ -1,4 +1,4 @@
---- Makefile.orig 2018-05-11 01:30:59 UTC
+--- Makefile.orig 2018-08-01 01:25:10 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:=/generated.mk)
+@@ -101,7 +112,7 @@ CPP_MK_GENERATED := $(CPP_PROJECTS:=/gen
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)
Modified: head/databases/foundationdb/files/patch-build_csprojtom4.py
==============================================================================
--- head/databases/foundationdb/files/patch-build_csprojtom4.py Tue Aug 14 14:44:29 2018 (r477159)
+++ head/databases/foundationdb/files/patch-build_csprojtom4.py Tue Aug 14 14:59:46 2018 (r477160)
@@ -1,4 +1,4 @@
---- build/csprojtom4.py.orig 2018-05-31 02:58:48 UTC
+--- build/csprojtom4.py.orig 2018-08-14 14:24:41 UTC
+++ build/csprojtom4.py
@@ -1,5 +1,5 @@
#!/usr/local/bin/python2.7
@@ -45,7 +45,7 @@
sys.exit()
sources = [node.getAttribute("Include").replace('\\', '/') for node in
-@@ -55,5 +55,5 @@ sources = [node.getAttribute("Include").replace('\\',
+@@ -55,5 +55,5 @@ sources = [node.getAttribute("Include").
assemblies = [node.getAttribute("Include") for node in
dom.getElementsByTagName("Reference")]
Modified: head/databases/foundationdb/files/patch-build_vcxprojtom4.py
==============================================================================
--- head/databases/foundationdb/files/patch-build_vcxprojtom4.py Tue Aug 14 14:44:29 2018 (r477159)
+++ head/databases/foundationdb/files/patch-build_vcxprojtom4.py Tue Aug 14 14:59:46 2018 (r477160)
@@ -1,4 +1,4 @@
---- build/vcxprojtom4.py.orig 2018-05-31 02:52:54 UTC
+--- build/vcxprojtom4.py.orig 2018-08-14 14:24:41 UTC
+++ build/vcxprojtom4.py
@@ -23,8 +23,8 @@
import sys
@@ -48,7 +48,7 @@
sys.exit()
sources = [node.getAttribute("Include").replace('\\', '/') for node in
-@@ -70,4 +70,4 @@ sources = [node.getAttribute("Include").replace('\\',
+@@ -70,4 +70,4 @@ sources = [node.getAttribute("Include").
dom.getElementsByTagName("ClInclude")
if not node.getElementsByTagName("ExcludedFromBuild") and node.hasAttribute("Include")]
Modified: head/databases/foundationdb/files/patch-fdbbackup_local.mk
==============================================================================
--- head/databases/foundationdb/files/patch-fdbbackup_local.mk Tue Aug 14 14:44:29 2018 (r477159)
+++ head/databases/foundationdb/files/patch-fdbbackup_local.mk Tue Aug 14 14:59:46 2018 (r477160)
@@ -5,7 +5,7 @@
else ifeq ($(PLATFORM),osx)
fdbbackup_LDFLAGS += -lc++
+else ifeq ($(PLATFORM),freebsd)
-+ fdbbackup_LDFLAGS += -lc++ -lm -lexecinfo -lpthread -leio
++ fdbbackup_LDFLAGS += -lc++ -lm -lexecinfo -lpthread -leio -lboost_system
endif
fdbbackup_GENERATED_SOURCES += versions.h
Modified: head/databases/foundationdb/files/patch-fdbcli_local.mk
==============================================================================
--- head/databases/foundationdb/files/patch-fdbcli_local.mk Tue Aug 14 14:44:29 2018 (r477159)
+++ head/databases/foundationdb/files/patch-fdbcli_local.mk Tue Aug 14 14:59:46 2018 (r477160)
@@ -14,7 +14,7 @@
else ifeq ($(PLATFORM),osx)
fdbcli_LDFLAGS += -lc++
+else ifeq ($(PLATFORM),freebsd)
-+ fdbcli_LDFLAGS += -lc++ -lm -lpthread -leio -lexecinfo
++ fdbcli_LDFLAGS += -lc++ -lm -lpthread -leio -lexecinfo -lboost_system
endif
test_fdbcli_status: fdbcli
Modified: head/databases/foundationdb/files/patch-fdbclient_local.mk
==============================================================================
--- head/databases/foundationdb/files/patch-fdbclient_local.mk Tue Aug 14 14:44:29 2018 (r477159)
+++ head/databases/foundationdb/files/patch-fdbclient_local.mk Tue Aug 14 14:59:46 2018 (r477160)
@@ -5,7 +5,7 @@
fdbclient_CFLAGS := $(fdbrpc_CFLAGS)
-
-+fdbclient_LIBS := -lm -lc++ -lpthread -lexecinfo -leio
++fdbclient_LIBS := -lm -lc++ -lpthread -lexecinfo -leio -lboost_system
fdbclient_GENERATED_SOURCES += fdbclient/FDBOptions.g.h
fdbclient/FDBOptions.g.cpp: fdbclient/FDBOptions.g.h
Modified: head/databases/foundationdb/files/patch-fdbmonitor_fdbmonitor.cpp
==============================================================================
--- head/databases/foundationdb/files/patch-fdbmonitor_fdbmonitor.cpp Tue Aug 14 14:44:29 2018 (r477159)
+++ head/databases/foundationdb/files/patch-fdbmonitor_fdbmonitor.cpp Tue Aug 14 14:59:46 2018 (r477160)
@@ -1,4 +1,4 @@
---- fdbmonitor/fdbmonitor.cpp.orig 2018-05-11 01:30:59 UTC
+--- fdbmonitor/fdbmonitor.cpp.orig 2018-08-01 01:25:10 UTC
+++ fdbmonitor/fdbmonitor.cpp
@@ -35,6 +35,10 @@
#include <linux/limits.h>
@@ -20,7 +20,7 @@
typedef int fdb_fd_set;
#endif
-@@ -83,7 +87,7 @@ void monitor_fd( fdb_fd_set list, int fd, int* maxfd,
+@@ -83,7 +87,7 @@ void monitor_fd( fdb_fd_set list, int fd
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, int* maxfd,
+@@ -94,7 +98,7 @@ void monitor_fd( fdb_fd_set list, int fd
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 CSimpleIni& ini, con
+@@ -188,7 +192,7 @@ const char* get_value_multi(const CSimpl
}
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, int pipe_idx, fd
+@@ -822,7 +826,7 @@ void read_child_output( Command* cmd, in
}
}
@@ -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_fd, std::strin
+@@ -839,7 +843,7 @@ void watch_conf_dir( int kq, int* confd_
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_fd, const cha
+@@ -876,7 +880,7 @@ void watch_conf_file( int kq, int* conff
}
/* 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_map<int, std::unordered_set<std::string
+@@ -983,7 +987,7 @@ std::unordered_map<int, std::unordered_s
int main(int argc, char** argv) {
std::string lockfile = "/var/run/fdbmonitor.pid";
Modified: head/databases/foundationdb/files/patch-fdbrpc_IAsyncFile.actor.cpp
==============================================================================
--- head/databases/foundationdb/files/patch-fdbrpc_IAsyncFile.actor.cpp Tue Aug 14 14:44:29 2018 (r477159)
+++ head/databases/foundationdb/files/patch-fdbrpc_IAsyncFile.actor.cpp Tue Aug 14 14:59:46 2018 (r477160)
@@ -1,6 +1,6 @@
---- fdbrpc/IAsyncFile.actor.cpp.orig 2018-05-11 01:30:59 UTC
+--- fdbrpc/IAsyncFile.actor.cpp.orig 2018-08-01 01:25:10 UTC
+++ fdbrpc/IAsyncFile.actor.cpp
-@@ -42,7 +42,7 @@ ACTOR static Future<Void> zeroRangeHelper( Reference<I
+@@ -42,7 +42,7 @@ ACTOR static Future<Void> zeroRangeHelpe
Void _ = wait( yield() );
}
Modified: head/databases/foundationdb/files/patch-fdbrpc_Platform.cpp
==============================================================================
--- head/databases/foundationdb/files/patch-fdbrpc_Platform.cpp Tue Aug 14 14:44:29 2018 (r477159)
+++ head/databases/foundationdb/files/patch-fdbrpc_Platform.cpp Tue Aug 14 14:59:46 2018 (r477160)
@@ -1,6 +1,6 @@
---- fdbrpc/Platform.cpp.orig 2018-05-11 01:30:59 UTC
+--- fdbrpc/Platform.cpp.orig 2018-08-01 01:25:10 UTC
+++ fdbrpc/Platform.cpp
-@@ -87,7 +87,7 @@ int eraseDirectoryRecursive(std::string const& dir) {
+@@ -87,7 +87,7 @@ int eraseDirectoryRecursive(std::string
__eraseDirectoryRecurseiveCount = 0;
#ifdef _WIN32
system( ("rd /s /q \"" + dir + "\"").c_str() );
Modified: head/databases/foundationdb/files/patch-fdbrpc_local.mk
==============================================================================
--- head/databases/foundationdb/files/patch-fdbrpc_local.mk Tue Aug 14 14:44:29 2018 (r477159)
+++ head/databases/foundationdb/files/patch-fdbrpc_local.mk Tue Aug 14 14:59:46 2018 (r477160)
@@ -11,7 +11,7 @@
-fdbrpc_LDFLAGS :=
+fdbrpc_CFLAGS := -I$(BOOSTDIR)/include -I. -Ifdbrpc -Ifdbrpc/libeio -DUSE_UCONTEXT
+fdbrpc_LDFLAGS := -L$(BOOSTDIR)/lib
-+fdbrpc_LIBS := -lm -lc++ -lpthread -leio
++fdbrpc_LIBS := -lm -lc++ -lpthread -leio -lboost_system
ifeq ($(PLATFORM),osx)
fdbrpc_CFLAGS += -fasynchronous-unwind-tables -fno-omit-frame-pointer
Modified: head/databases/foundationdb/files/patch-fdbserver_fdbserver.actor.cpp
==============================================================================
--- head/databases/foundationdb/files/patch-fdbserver_fdbserver.actor.cpp Tue Aug 14 14:44:29 2018 (r477159)
+++ head/databases/foundationdb/files/patch-fdbserver_fdbserver.actor.cpp Tue Aug 14 14:59:46 2018 (r477160)
@@ -1,4 +1,4 @@
---- fdbserver/fdbserver.actor.cpp.orig 2018-05-11 01:30:59 UTC
+--- fdbserver/fdbserver.actor.cpp.orig 2018-08-01 01:25:10 UTC
+++ fdbserver/fdbserver.actor.cpp
@@ -60,7 +60,7 @@
#define BOOST_DATE_TIME_NO_LIB
@@ -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,
-@@ -351,7 +352,7 @@ class WorldReadablePermissions { (public)
+@@ -351,7 +352,7 @@ 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!
-@@ -361,7 +362,7 @@ class WorldReadablePermissions { (public)
+@@ -361,7 +362,7 @@ public:
virtual ~WorldReadablePermissions() {
#ifdef _WIN32
LocalFree( sa.lpSecurityDescriptor );
Modified: head/databases/foundationdb/files/patch-fdbserver_local.mk
==============================================================================
--- head/databases/foundationdb/files/patch-fdbserver_local.mk Tue Aug 14 14:44:29 2018 (r477159)
+++ head/databases/foundationdb/files/patch-fdbserver_local.mk Tue Aug 14 14:59:46 2018 (r477160)
@@ -5,7 +5,7 @@
else ifeq ($(PLATFORM),osx)
fdbserver_LDFLAGS += -lc++
+else ifeq ($(PLATFORM),freebsd)
-+ fdbserver_LDFLAGS += -lc++ -lm -lpthread -lexecinfo -leio
++ fdbserver_LDFLAGS += -lc++ -lm -lpthread -lexecinfo -leio -lboost_system
endif
ifeq ($(WORKLOADS),false)
Modified: head/databases/foundationdb/files/patch-fdbserver_worker.actor.cpp
==============================================================================
--- head/databases/foundationdb/files/patch-fdbserver_worker.actor.cpp Tue Aug 14 14:44:29 2018 (r477159)
+++ head/databases/foundationdb/files/patch-fdbserver_worker.actor.cpp Tue Aug 14 14:59:46 2018 (r477160)
@@ -1,4 +1,4 @@
---- fdbserver/worker.actor.cpp.orig 2018-05-11 01:30:59 UTC
+--- fdbserver/worker.actor.cpp.orig 2018-08-01 01:25:10 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<Void> registrationClient( Reference<Async
+@@ -267,7 +267,7 @@ ACTOR Future<Void> registrationClient( R
}
}
Modified: head/databases/foundationdb/files/patch-flow_Deque.h
==============================================================================
--- head/databases/foundationdb/files/patch-flow_Deque.h Tue Aug 14 14:44:29 2018 (r477159)
+++ head/databases/foundationdb/files/patch-flow_Deque.h Tue Aug 14 14:59:46 2018 (r477160)
@@ -1,6 +1,6 @@
---- flow/Deque.h.orig 2018-05-11 01:30:59 UTC
+--- flow/Deque.h.orig 2018-08-01 01:25:10 UTC
+++ flow/Deque.h
-@@ -166,7 +166,7 @@ class Deque { (private)
+@@ -166,7 +166,7 @@ private:
new (&newArr[i - begin]) T(std::move(arr[i&mask]));
arr[i&mask].~T();
}
@@ -9,7 +9,7 @@
arr = newArr;
end -= begin;
begin = 0;
-@@ -177,8 +177,8 @@ class Deque { (private)
+@@ -177,8 +177,8 @@ private:
for (int i = begin; i != end; i++)
arr[i&mask].~T();
if(arr)
Modified: head/databases/foundationdb/files/patch-flow_Net2.actor.cpp
==============================================================================
--- head/databases/foundationdb/files/patch-flow_Net2.actor.cpp Tue Aug 14 14:44:29 2018 (r477159)
+++ head/databases/foundationdb/files/patch-flow_Net2.actor.cpp Tue Aug 14 14:59:46 2018 (r477160)
@@ -1,6 +1,6 @@
---- flow/Net2.actor.cpp.orig 2018-05-11 01:30:59 UTC
+--- flow/Net2.actor.cpp.orig 2018-08-01 01:25:10 UTC
+++ flow/Net2.actor.cpp
-@@ -56,7 +56,7 @@ uint64_t compatibleProtocolVersionMask = 0xfffffffffff
+@@ -56,7 +56,7 @@ uint64_t compatibleProtocolVersionMask =
uint64_t minValidProtocolVersion = 0x0FDB00A200060001LL;
@@ -9,7 +9,7 @@
#include <execinfo.h>
volatile double net2liveness = 0;
-@@ -403,8 +403,7 @@ class Connection : public IConnection, ReferenceCounte
+@@ -403,8 +403,7 @@ private:
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 Tue Aug 14 14:44:29 2018 (r477159)
+++ head/databases/foundationdb/files/patch-flow_Platform.cpp Tue Aug 14 14:59:46 2018 (r477160)
@@ -1,4 +1,4 @@
---- flow/Platform.cpp.orig 2018-05-11 01:30:59 UTC
+--- flow/Platform.cpp.orig 2018-08-01 01:25:10 UTC
+++ flow/Platform.cpp
@@ -71,6 +71,7 @@
@@ -8,7 +8,7 @@
#include <sys/mman.h>
#include <unistd.h>
#include <ftw.h>
-@@ -119,7 +120,13 @@
+@@ -119,6 +120,12 @@
#include <IOKit/IOBSD.h>
#endif
@@ -17,11 +17,10 @@
+#include <sys/sysctl.h>
+#include <sys/cpuset.h>
+#include <sys/resource.h>
- #endif
+#endif
+ #endif
std::string removeWhitespace(const std::string &t)
- {
@@ -198,7 +205,7 @@ double getProcessorTimeThread() {
throw platform_error();
}
@@ -55,7 +54,7 @@
return 0;
#endif
}
-@@ -427,6 +442,24 @@ void getMachineRAMInfo(MachineRAMInfo& memInfo) {
+@@ -427,6 +442,24 @@ void getMachineRAMInfo(MachineRAMInfo& m
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;
@@ -80,7 +79,7 @@
#else
#warning getMachineRAMInfo unimplemented on this platform
#endif
-@@ -435,7 +468,7 @@ void getMachineRAMInfo(MachineRAMInfo& memInfo) {
+@@ -435,7 +468,7 @@ void getMachineRAMInfo(MachineRAMInfo& m
void getDiskBytes(std::string const& directory, int64_t& free, int64_t& total) {
INJECT_FAULT( platform_error, "getDiskBytes" );
#if defined(__unixish__)
@@ -89,7 +88,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& directory, int64_
+@@ -477,7 +510,7 @@ void getDiskBytes(std::string const& dir
#endif
}
@@ -156,7 +155,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 length, bool larg
+@@ -1481,7 +1538,7 @@ static void *allocateInternal(size_t len
flags |= MAP_HUGETLB;
return mmap(NULL, length, PROT_READ|PROT_WRITE, flags, -1, 0);
@@ -177,7 +176,7 @@
#endif
}
-@@ -1615,7 +1677,7 @@ void renameFile( std::string const& fromPath, std::str
+@@ -1615,7 +1677,7 @@ void renameFile( std::string const& from
//renamedFile();
return;
}
@@ -186,7 +185,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& directory ) {
+@@ -1733,7 +1795,7 @@ bool createDirectory( std::string const&
}
TraceEvent(SevError, "CreateDirectory").detail("Directory", directory).GetLastError();
throw platform_error();
@@ -195,7 +194,7 @@
size_t sep = 0;
do {
sep = directory.find_first_of('/', sep + 1);
-@@ -1774,7 +1836,7 @@ std::string abspath( std::string const& filename ) {
+@@ -1774,7 +1836,7 @@ std::string abspath( std::string const&
if (*x == '/')
*x = CANONICAL_PATH_SEPARATOR;
return nameBuffer;
@@ -222,7 +221,7 @@
return S_ISREG(fileAttributes) && StringRef(name).endsWith(extension);
#else
#error Port me!
-@@ -1858,7 +1920,7 @@ bool acceptFile( FILE_ATTRIBUTE_DATA fileAttributes, s
+@@ -1858,7 +1920,7 @@ bool acceptFile( FILE_ATTRIBUTE_DATA fil
bool acceptDirectory( FILE_ATTRIBUTE_DATA fileAttributes, std::string name, std::string extension ) {
#ifdef _WIN32
return (fileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0;
@@ -231,7 +230,7 @@
return S_ISDIR(fileAttributes);
#else
#error Port me!
-@@ -1894,7 +1956,7 @@ std::vector<std::string> findFiles( std::string const&
+@@ -1894,7 +1956,7 @@ std::vector<std::string> findFiles( std:
}
FindClose(h);
}
@@ -240,7 +239,7 @@
DIR *dip;
if ((dip = opendir(directory.c_str())) != NULL) {
-@@ -1958,7 +2020,7 @@ void findFilesRecursively(std::string path, std::vecto
+@@ -1958,7 +2020,7 @@ void findFilesRecursively(std::string pa
void threadSleep( double seconds ) {
#ifdef _WIN32
Sleep( (DWORD)(seconds * 1e3) );
@@ -249,7 +248,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);
}
@@ -258,7 +257,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) (void *), void
+@@ -2009,7 +2071,7 @@ THREAD_HANDLE startThread(void *(*func)
void waitThread(THREAD_HANDLE thread) {
#ifdef _WIN32
WaitForSingleObject(thread, INFINITE);
@@ -267,7 +266,7 @@
pthread_join(thread, NULL);
#else
#error Port me!
-@@ -2038,7 +2100,7 @@ int64_t fileSize(std::string const& filename) {
+@@ -2038,7 +2100,7 @@ int64_t fileSize(std::string const& file
return 0;
else
return file_status.st_size;
@@ -276,7 +275,7 @@
struct stat file_status;
if(stat(filename.c_str(), &file_status) != 0)
return 0;
-@@ -2181,6 +2243,8 @@ std::string getDefaultPluginPath( const char* plugin_n
+@@ -2181,6 +2243,8 @@ std::string getDefaultPluginPath( const
return format( "/usr/lib/foundationdb/plugins/%s.so", plugin_name );
#elif defined(__APPLE__)
return format( "/usr/local/foundationdb/plugins/%s.dylib", plugin_name );
@@ -294,7 +293,7 @@
#error Port me!
#endif
-@@ -2446,7 +2510,7 @@ bool isLibraryLoaded(const char* lib_path) {
+@@ -2446,7 +2510,7 @@ bool isLibraryLoaded(const char* lib_pat
}
void* loadLibrary(const char* lib_path) {
Modified: head/databases/foundationdb/files/patch-flow_Platform.h
==============================================================================
--- head/databases/foundationdb/files/patch-flow_Platform.h Tue Aug 14 14:44:29 2018 (r477159)
+++ head/databases/foundationdb/files/patch-flow_Platform.h Tue Aug 14 14:59:46 2018 (r477160)
@@ -1,4 +1,4 @@
---- flow/Platform.h.orig 2018-05-11 01:30:59 UTC
+--- flow/Platform.h.orig 2018-08-01 01:25:10 UTC
+++ flow/Platform.h
@@ -22,7 +22,7 @@
#define FLOW_PLATFORM_H
@@ -9,12 +9,12 @@
#define __unixish__ 1
#endif
-@@ -182,6 +182,8 @@ THREAD_HANDLE startThread(void *(func) (void *), void
- #if defined(_WIN32)
+@@ -183,6 +183,8 @@ THREAD_HANDLE startThread(void *(func) (
#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 Tue Aug 14 14:44:29 2018 (r477159)
+++ head/databases/foundationdb/files/patch-flow_ThreadPrimitives.cpp Tue Aug 14 14:59:46 2018 (r477160)
@@ -1,6 +1,6 @@
---- flow/ThreadPrimitives.cpp.orig 2018-05-11 01:30:59 UTC
+--- flow/ThreadPrimitives.cpp.orig 2018-08-01 01:25:10 UTC
+++ flow/ThreadPrimitives.cpp
-@@ -37,7 +37,7 @@ extern std::string format( const char *form, ... );
+@@ -37,7 +37,7 @@ extern std::string format( const char *f
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 Tue Aug 14 14:44:29 2018 (r477159)
+++ head/databases/foundationdb/files/patch-flow_ThreadPrimitives.h Tue Aug 14 14:59:46 2018 (r477160)
@@ -1,4 +1,4 @@
---- flow/ThreadPrimitives.h.orig 2018-05-11 01:30:59 UTC
+--- flow/ThreadPrimitives.h.orig 2018-08-01 01:25:10 UTC
+++ flow/ThreadPrimitives.h
@@ -25,7 +25,7 @@
#include "Error.h"
@@ -9,7 +9,7 @@
#include <semaphore.h>
#endif
-@@ -63,11 +63,11 @@ class ThreadSpinLock { (public)
+@@ -63,11 +63,11 @@ public:
#endif
}
void leave() {
@@ -23,12 +23,12 @@
__sync_synchronize();
#endif
#if VALGRIND
-@@ -116,6 +116,8 @@ class Event { (private)
- #ifdef _WIN32
+@@ -117,6 +117,8 @@ private:
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;
Modified: head/databases/foundationdb/files/patch-flow_libs_system_src_error__code.cpp
==============================================================================
--- head/databases/foundationdb/files/patch-flow_libs_system_src_error__code.cpp Tue Aug 14 14:44:29 2018 (r477159)
+++ head/databases/foundationdb/files/patch-flow_libs_system_src_error__code.cpp Tue Aug 14 14:59:46 2018 (r477160)
@@ -1,6 +1,22 @@
---- flow/libs/system/src/error_code.cpp.orig 2018-04-19 02:55:50 UTC
+--- flow/libs/system/src/error_code.cpp.orig 2018-08-01 01:25:10 UTC
+++ flow/libs/system/src/error_code.cpp
-@@ -48,7 +48,7 @@ namespace
+@@ -15,6 +15,7 @@
+ // the library is being built (possibly exporting rather than importing code)
+ #define BOOST_SYSTEM_SOURCE
+
++#include <boost/version.hpp>
+ #include <boost/system/config.hpp>
+ #include <boost/system/error_code.hpp>
+ #include <boost/cerrno.hpp>
+@@ -37,6 +38,7 @@ using namespace boost::system::errc;
+
+ //----------------------------------------------------------------------------//
+
++#if BOOST_VERSION < 106800
+ namespace
+ {
+ #if defined(__PGI)
+@@ -48,7 +50,7 @@ namespace
{
public:
generic_error_category(){}
@@ -9,7 +25,7 @@
std::string message( int ev ) const;
};
-@@ -56,14 +56,14 @@ namespace
+@@ -56,14 +58,14 @@ namespace
{
public:
system_error_category(){}
@@ -27,7 +43,7 @@
{
return "generic";
}
-@@ -154,12 +154,12 @@ namespace
+@@ -154,12 +156,12 @@ namespace
}
// system_error_category implementation --------------------------------//
@@ -42,7 +58,7 @@
{
switch ( ev )
{
-@@ -414,13 +414,13 @@ namespace boost
+@@ -414,13 +416,13 @@ namespace boost
// address for comparison purposes
# endif
@@ -58,3 +74,8 @@
{
static const generic_error_category generic_category_const;
return generic_category_const;
+@@ -428,3 +430,4 @@ namespace boost
+
+ } // namespace system
+ } // namespace boost
++#endif
Modified: head/databases/foundationdb/files/patch-flow_local.mk
==============================================================================
--- head/databases/foundationdb/files/patch-flow_local.mk Tue Aug 14 14:44:29 2018 (r477159)
+++ head/databases/foundationdb/files/patch-flow_local.mk Tue Aug 14 14:59:46 2018 (r477160)
@@ -8,7 +8,7 @@
-flow_LDFLAGS :=
+flow_CFLAGS := -I$(BOOSTDIR)/include -I. -Iflow -DUSE_UCONTEXT
+flow_LDFLAGS := -L$(BOOSTDIR)/lib
-+flow_LIBS := -lm -lc++ -lpthread -leio -lexecinfo
++flow_LIBS := -lm -lc++ -lpthread -leio -lexecinfo -lboost_system
ifeq ($(PLATFORM),osx)
flow_CFLAGS += -fasynchronous-unwind-tables -fno-omit-frame-pointer
More information about the svn-ports-all
mailing list