Add foundationdb, yet another distributed database from apple.

1 files changed, 165 insertions, 0 deletions

diff --git a/databases/foundationdb/files/patch-fdbmonitor_fdbmonitor.cpp b/databases/foundationdb/files/patch-fdbmonitor_fdbmonitor.cpp
new file mode 100644
index 000000000000..98bc4f51dc58
--- /dev/null
+++ b/databases/foundationdb/files/patch-fdbmonitor_fdbmonitor.cpp
@@ -0,0 +1,165 @@
+--- fdbmonitor/fdbmonitor.cpp.orig	2018-04-19 02:55:50 UTC
++++ fdbmonitor/fdbmonitor.cpp
+@@ -35,6 +35,10 @@
+ #include <linux/limits.h>
+ #endif
+ 
++#ifdef __FreeBSD__
++#include <sys/event.h>
++#endif
++
+ #ifdef __APPLE__
+ #include <sys/event.h>
+ #include <mach/mach.h>
+@@ -72,7 +76,7 @@
+ 
+ #ifdef __linux__
+ typedef fd_set* fdb_fd_set;
+-#elif defined __APPLE__
++#elif defined(__APPLE__) || defined(__FreeBSD__)
+ typedef int fdb_fd_set;
+ #endif
+ 
+@@ -83,7 +87,7 @@ void monitor_fd( fdb_fd_set list, int fd
+ 	FD_SET( fd, list );
+ 	if ( fd > *maxfd )
+ 		*maxfd = fd;
+-#elif defined __APPLE__
++#elif defined(__APPLE__) || defined(__FreeBSD__)
+ 	/* 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
+ void unmonitor_fd( fdb_fd_set list, int fd ) {
+ #ifdef __linux__
+ 	FD_CLR( fd, list );
+-#elif defined __APPLE__
++#elif defined(__APPLE__) || defined(__FreeBSD__)
+ 	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
+ }
+ 
+ double timer() {
+-#if defined(__linux__)
++#if defined(__linux__) || defined(__FreeBSD__)
+ 	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
+ 	}
+ }
+ 
+-#ifdef __APPLE__
++#if defined(__APPLE__) || defined(__FreeBSD__)
+ 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_
+ 		std::string child = confdir;
+ 
+ 		/* Find the nearest existing ancestor */
+-		while( (*confd_fd = open( confdir.c_str(), O_EVTONLY )) < 0 && errno == ENOENT ) {
++		while( (*confd_fd = open( confdir.c_str(), O_RDONLY )) < 0 && errno == ENOENT ) {
+ 			child = confdir;
+ 			confdir = parentDirectory(confdir);
+ 		}
+@@ -876,7 +880,7 @@ void watch_conf_file( int kq, int* conff
+ 	}
+ 
+ 	/* Open and watch */
+-	*conff_fd = open( confpath, O_EVTONLY );
++	*conff_fd = open( confpath, O_RDONLY );
+ 	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_s
+ 
+ int main(int argc, char** argv) {
+ 	std::string lockfile = "/var/run/fdbmonitor.pid";
+-	std::string _confpath = "/etc/foundationdb/foundationdb.conf";
++	std::string _confpath = std::string(PREFIX) + "/etc/foundationdb/foundationdb.conf";
+ 
+ 	std::vector<const char *> additional_watch_paths;
+ 
+@@ -1065,7 +1069,7 @@ int main(int argc, char** argv) {
+ 	/* only linux needs this, but... */
+ 	int maxfd = 0;
+ 
+-#ifdef __linux__
++#if defined(__linux__)
+ 	fd_set rfds;
+ 	watched_fds = &rfds;
+ 
+@@ -1080,12 +1084,12 @@ int main(int argc, char** argv) {
+ 	CSimpleIniA* ini = NULL;
+ 
+ 	if (daemonize) {
+-#ifdef __APPLE__
++#if defined(__APPLE__) || defined(__FreeBSD__)
+ #pragma GCC diagnostic push
+ #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+ #endif
+ 		if (daemon(0, 0)) {
+-#ifdef __APPLE__
++#if defined(__APPLE__) || defined(__FreeBSD__)
+ #pragma GCC diagnostic pop
+ #endif
+ 			log_err("daemon", errno, "Unable to daemonize");
+@@ -1138,12 +1142,12 @@ int main(int argc, char** argv) {
+ 	snprintf(pid_buf, sizeof(pid_buf), "%d\n", getpid());
+ 	ssize_t ign = write(lockfile_fd, pid_buf, strlen(pid_buf));
+ 
+-#ifdef __linux__
++#if defined(__linux__)
+ 	/* attempt to do clean shutdown and remove lockfile when killed */
+ 	signal(SIGHUP, signal_handler);
+ 	signal(SIGINT, signal_handler);
+ 	signal(SIGTERM, signal_handler);
+-#elif defined(__APPLE__)
++#elif defined(__APPLE__) || defined(__FreeBSD__)
+ 	int kq = kqueue();
+ 	if ( kq < 0 ) {
+ 		log_err( "kqueue", errno, "Unable to create kqueue" );
+@@ -1174,7 +1178,7 @@ int main(int argc, char** argv) {
+ 
+ #endif
+ 
+-#ifdef __linux__
++#if defined(__linux__)
+ 	signal(SIGCHLD, child_handler);
+ #endif
+ 
+@@ -1188,11 +1192,11 @@ int main(int argc, char** argv) {
+ 	/* normal will be restored in our main loop in the call to
+ 	   pselect, but none blocks all signals while processing events */
+ 	sigprocmask(SIG_SETMASK, &full_mask, &normal_mask);
+-#elif defined(__APPLE__)
++#elif defined(__APPLE__) || defined(__FreeBSD__)
+ 	sigprocmask(0, NULL, &normal_mask);
+ #endif
+ 
+-#ifdef __APPLE__
++#if defined(__APPLE__) || defined(__FreeBSD__)
+ 	struct stat st_buf;
+ 	struct timespec mtimespec;
+ 
+@@ -1251,7 +1255,7 @@ int main(int argc, char** argv) {
+ 
+ 			load_conf(confpath.c_str(), uid, gid, &normal_mask, &rfds, &maxfd);
+ 			reload_additional_watches = false;
+-#elif defined(__APPLE__)
++#elif defined(__APPLE__) || defined(__FreeBSD__)
+ 			load_conf( confpath.c_str(), uid, gid, &normal_mask, watched_fds, &maxfd );
+ 			watch_conf_file( kq, &conff_fd, confpath.c_str() );
+ 			watch_conf_dir( kq, &confd_fd, confdir );
+@@ -1289,7 +1293,7 @@ int main(int argc, char** argv) {
+ 		if(nfds == 0) {
+ 			reload = true;
+ 		}
+-#elif defined(__APPLE__)
++#elif defined(__APPLE__) || defined(__FreeBSD__)
+ 		int nev = 0;
+ 		if(timeout < 0) {
+ 			nev = kevent( kq, NULL, 0, &ev, 1, NULL );