refactor

jysandy · Apr 17, 2011 · 075db86 · 075db86
1 parent e4d7e7b
commit 075db86
Show file tree

Hide file tree

Showing 17 changed files with 82 additions and 83 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -12,7 +12,7 @@ aux_sources = \
 	ms.c \
 	net.c \
 	net_$(OS).c \
-	port.c \
+	port_$(OS).c \
 	primes.c \
 	prot.c \
 	sd-daemon.c \

diff --git a/beanstalkd.c b/beanstalkd.c
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "t.h"
-
+#include <stdint.h>
+#include <sys/types.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/binlog.c b/binlog.c
@@ -16,7 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "t.h"
+#include <stdint.h>
+#include <sys/types.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <fcntl.h>
@@ -32,7 +33,6 @@
 #include <limits.h>
 #include <stddef.h>
 #include <event.h>
-
 #include "dat.h"
 
 typedef struct binlog *binlog;
@@ -326,7 +326,7 @@ binlog_open(binlog log, size_t *written)
 
     if (fd < 0) return twarn("Cannot open binlog %s", log->path);
 
-    r = posix_fallocate(fd, 0, binlog_size_limit);
+    r = falloc(fd, binlog_size_limit);
     if (r) {
         close(fd);
         binlog_dref(log);
@@ -455,8 +455,8 @@ binlog_write_job(job j)
 
     now = nanoseconds() / 1000000; /* ns -> ms */
     if (enable_fsync && now - last_fsync >= fsync_throttle_ms) {
-        r = fdatasync(current_binlog->fd);
-        if (r == -1) return twarn("fdatasync"), 0;
+        r = fsync(current_binlog->fd);
+        if (r == -1) return twarn("fsync"), 0;
         last_fsync = now;
     }
 

diff --git a/conn.c b/conn.c
@@ -16,7 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "t.h"
+#include <stdint.h>
+#include <sys/types.h>
 #include <stdlib.h>
 #include <sys/time.h>
 #include <stdio.h>

diff --git a/dat.h b/dat.h
@@ -1,3 +1,11 @@
+typedef unsigned char uchar;
+typedef uchar         byte;
+typedef unsigned int  uint;
+typedef int32_t       int32;
+typedef uint32_t      uint32;
+typedef int64_t       int64;
+typedef uint64_t      uint64;
+
 #define int32_t  do_not_use_int32_t
 #define uint32_t do_not_use_uint32_t
 #define int64_t  do_not_use_int64_t
@@ -300,3 +308,8 @@ size_t binlog_reserve_space_update(job j);
 void binlog_shutdown();
 const char *binlog_oldest_index();
 const char *binlog_current_index();
+
+/* Allocate disk space.
+ * Expects fd's offset to be 0; may also reset fd's offset to 0.
+ * Returns 0 on success, and a positive errno otherwise. */
+int falloc(int fd, int len);
diff --git a/heap.c b/heap.c
@@ -15,7 +15,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "t.h"
+#include <stdint.h>
+#include <sys/types.h>
 #include <stdlib.h>
 #include <sys/time.h>
 #include <stdio.h>

diff --git a/job.c b/job.c
@@ -16,7 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "t.h"
+#include <stdint.h>
+#include <sys/types.h>
 #include <stdlib.h>
 #include <sys/time.h>
 #include <string.h>

diff --git a/ms.c b/ms.c
@@ -16,7 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "t.h"
+#include <stdint.h>
+#include <sys/types.h>
 #include <string.h>
 #include <stdlib.h>
 #include <sys/time.h>

diff --git a/net.c b/net.c
@@ -14,7 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "t.h"
+#include <stdint.h>
+#include <sys/types.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/time.h>

diff --git a/port.c → port_darwin.c b/port.c → port_darwin.c
@@ -1,6 +1,4 @@
-/* portability functions */
-
-/* Copyright (C) 2009 Keith Rarick
+/* Copyright 2011 Keith Rarick
 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,35 +14,26 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "t.h"
+#include <stdint.h>
+#include <sys/types.h>
+#include <unistd.h>
+#include <errno.h>
+#include <event.h>
+#include "dat.h"
+
+static char buf0[512]; /* buffer of zeros */
 
-#ifdef _NEED_POSIX_FALLOCATE
 int
-posix_fallocate(int fd, off_t offset, off_t len)
+falloc(int fd, int len)
 {
-    off_t i;
-    ssize_t w;
-    off_t p;
-    #define ZERO_BUF_SIZE 512
-    char buf[ZERO_BUF_SIZE] = {}; /* initialize to zero */
-
-    /* we only support a 0 offset */
-    if (offset != 0) return EINVAL;
-
-    if (len <= 0) return EINVAL;
-
-    if (len % 512 != 0) {
-        len += 512 - len % 512;
-    }
+    int i, w;
 
     for (i = 0; i < len; i += w) {
-        w = write(fd, &buf, ZERO_BUF_SIZE);
+        w = write(fd, buf0, sizeof buf0);
         if (w == -1) return errno;
     }
 
-    p = lseek(fd, 0, SEEK_SET);
-    if (p == -1) return errno;
+    lseek(fd, 0, 0); /* do not care if this fails */
 
     return 0;
 }
-#endif
diff --git a/port_linux.c b/port_linux.c
@@ -0,0 +1,28 @@
+/* Copyright 2011 Keith Rarick
+
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#define _GNU_SOURCE
+#include <stdint.h>
+#include <sys/types.h>
+#include <fcntl.h>
+#include <event.h>
+#include "dat.h"
+
+int
+falloc(int fd, int len)
+{
+    return fallocate(fd, 0, 0, len);
+}
diff --git a/prot.c b/prot.c
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "t.h"
-
+#include <stdint.h>
+#include <sys/types.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>

diff --git a/srv.c b/srv.c
@@ -14,7 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "t.h"
+#include <stdint.h>
+#include <sys/types.h>
 #include <stdlib.h>
 #include <sys/socket.h>
 #include <event.h>

diff --git a/t.h b/t.h
@@ -1,40 +0,0 @@
-/* ugly stuff */
-
-#ifndef _t_h_
-#define _t_h_
-
-#include <stdint.h>
-
-#define _NEED_FDATASYNC 1
-#define _NEED_POSIX_FALLOCATE 1
-
-#if defined(__linux__)
-#   include <sys/types.h>
-#   undef _NEED_FDATASYNC
-#   undef _NEED_POSIX_FALLOCATE
-#elif defined(__gnu_linux__)
-#   include <sys/types.h>
-#   undef _NEED_FDATASYNC
-#   undef _NEED_POSIX_FALLOCATE
-#elif defined(__APPLE__)
-#   include <sys/types.h>
-#else
-#   error "unknown system type"
-#endif
-
-#ifdef _NEED_FDATASYNC
-#   define fdatasync fsync
-#endif
-
-#undef _NEED_FDATASYNC
-#undef _NEED_POSIX_FALLOCATE
-
-typedef unsigned char uchar;
-typedef uchar         byte;
-typedef unsigned int  uint;
-typedef int32_t       int32;
-typedef uint32_t      uint32;
-typedef int64_t       int64;
-typedef uint64_t      uint64;
-
-#endif /*_t_h_*/

diff --git a/time.c b/time.c
@@ -15,7 +15,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "t.h"
+#include <stdint.h>
+#include <sys/types.h>
 #include <sys/time.h>
 #include <event.h>
 #include "dat.h"

diff --git a/tube.c b/tube.c
@@ -16,7 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "t.h"
+#include <stdint.h>
+#include <sys/types.h>
 #include <stdlib.h>
 #include <sys/time.h>
 #include <string.h>

diff --git a/util.c b/util.c
@@ -16,7 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "t.h"
+#include <stdint.h>
+#include <sys/types.h>
 #include <errno.h>
 #include <stdarg.h>
 #include <stdlib.h>