Add CI for FreeBSD and fix compiling errors. (sogou#1755)

Author: Barenboim

.github/workflows/ci.yml

@@ -47,3 +47,23 @@ jobs:
     - name: make tutorial
       run: make tutorial
 
+  freebsd-cmake:
+    name: freebsd
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - name: Build and test on FreeBSD
+      uses: vmactions/freebsd-vm@v1
+      with:
+        usesh: true
+        mem: 2048
+        copyback: false
+        prepare: |
+          pkg update -f
+          pkg install -y cmake gmake gcc pkgconf openssl
+        run: |
+          freebsd-version
+          gmake
+          gmake tutorial
+          cd tutorial
+          ./parallel_wget http://github.com/

GNUmakefile

@@ -9,7 +9,7 @@ CMAKE3 := $(shell if which cmake3>/dev/null ; then echo cmake3; else echo cmake;
 .PHONY: $(ALL_TARGETS)
 
 all: base
-	make -C $(BUILD_DIR) -f Makefile
+	$(MAKE) -C $(BUILD_DIR) -f Makefile
 
 base:
 	mkdir -p $(BUILD_DIR)
@@ -23,19 +23,19 @@ else
 endif
 
 tutorial: all
-	make -C tutorial
+	$(MAKE) -C tutorial
 
 check: all
-	make -C test check
+	$(MAKE) -C test check
 
 install preinstall: base
 	mkdir -p $(BUILD_DIR)
 	cd $(BUILD_DIR) && $(CMAKE3) $(ROOT_DIR)
-	make -C $(BUILD_DIR) -f Makefile $@
+	$(MAKE) -C $(BUILD_DIR) -f Makefile $@
 
 clean:
-	-make -C test clean
-	-make -C tutorial clean
+	-$(MAKE) -C test clean
+	-$(MAKE) -C tutorial clean
 	rm -rf $(DEFAULT_BUILD_DIR)
 	rm -rf _include
 	rm -rf _lib

benchmark/GNUmakefile

@@ -15,13 +15,13 @@ ifeq ($(DEBUG),y)
 else
 	cd $(BUILD_DIR) && $(CMAKE3) $(ROOT_DIR)
 endif
-	make -C $(BUILD_DIR) -f Makefile
+	$(MAKE) -C $(BUILD_DIR) -f Makefile
 
 clean:
 ifeq ($(MAKE_FILE), $(wildcard $(MAKE_FILE)))
-	-make -f Makefile clean
+	-$(MAKE) -f Makefile clean
 else ifeq (build, $(wildcard build))
-	-make -C build clean
+	-$(MAKE) -C build clean
 endif
 	rm -rf build
 

src/kernel/IOService_thread.cc

@@ -201,13 +201,6 @@ int IOService::request(IOSession *session)
 	return ret;
 }
 
-#if _POSIX_SYNCHRONIZED_IO <= 0
-static inline int fdatasync(int fd)
-{
-	return fsync(fd);
-}
-#endif
-
 void *IOService::io_routine(void *arg)
 {
 	IOSession *session = (IOSession *)arg;
@@ -223,12 +216,16 @@ void *IOService::io_routine(void *arg)
 	case IO_CMD_PWRITE:
 		ret = pwrite(fd, session->buf, session->count, session->offset);
 		break;
-	case IO_CMD_FSYNC:
 		ret = fsync(fd);
 		break;
 	case IO_CMD_FDSYNC:
+#if _POSIX_SYNCHRONIZED_IO > 0
 		ret = fdatasync(fd);
 		break;
+#endif
+	case IO_CMD_FSYNC:
+		ret = fsync(fd);
+		break;
 	case IO_CMD_PREADV:
 		ret = service->preadv(fd, (const struct iovec *)session->buf,
 							  session->count, session->offset);

src/manager/WFGlobal.cc

@@ -18,6 +18,7 @@
            Liu Kai (liukaidx@sogou-inc.com)
 */
 
+#include <netinet/in.h>
 #include <arpa/inet.h>
 #include <unistd.h>
 #include <signal.h>

src/nameservice/WFDnsResolver.cc

@@ -21,6 +21,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/un.h>
+#include <netinet/in.h>
 #include <arpa/inet.h>
 #include <errno.h>
 #include <netdb.h>

src/protocol/DnsMessage.cc

@@ -16,8 +16,8 @@
   Author: Liu Kai (liukaidx@sogou-inc.com)
 */
 
-#include <errno.h>
 #include <arpa/inet.h>
+#include <errno.h>
 #include "dns_types.h"
 #include "dns_parser.h"
 #include "DnsMessage.h"

src/protocol/dns_parser.c

@@ -16,10 +16,11 @@
   Author: Liu Kai (liukaidx@sogou-inc.com)
 */
 
+#include <netinet/in.h>
+#include <arpa/inet.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdint.h>
-#include <arpa/inet.h>
 #include "dns_types.h"
 #include "dns_parser.h"
 

test/GNUmakefile

@@ -15,16 +15,16 @@ ifeq ($(DEBUG),y)
 else
 	cd $(BUILD_DIR) && $(CMAKE3) $(ROOT_DIR)
 endif
-	make -C $(BUILD_DIR) -f Makefile
+	$(MAKE) -C $(BUILD_DIR) -f Makefile
 
 check:
 	mkdir -p $(BUILD_DIR)
 	cd $(BUILD_DIR) && $(CMAKE3) $(ROOT_DIR)
-	make -C $(BUILD_DIR) check CTEST_OUTPUT_ON_FAILURE=1
+	$(MAKE) -C $(BUILD_DIR) check CTEST_OUTPUT_ON_FAILURE=1
 
 clean:
 ifeq ($(MAKE_FILE), $(wildcard $(MAKE_FILE)))
-	-make -f Makefile clean
+	-$(MAKE) -f Makefile clean
 endif
 	rm -rf $(DEFAULT_BUILD_DIR)
 

tutorial/GNUmakefile

@@ -11,18 +11,17 @@ CMAKE3 := $(shell if which cmake3>/dev/null ; then echo cmake3; else echo cmake;
 all:
 	mkdir -p $(BUILD_DIR)
 	rm -rf $(DEFAULT_BUILD_DIR)/CMakeCache.txt
-
 ifeq ($(DEBUG),y)
 	cd $(BUILD_DIR) && $(CMAKE3) -D CMAKE_BUILD_TYPE=Debug -D CONSUL=$(CONSUL) -D KAFKA=$(KAFKA) -D MYSQL=$(MYSQL) -D REDIS=$(REDIS) $(ROOT_DIR)
 else
 	cd $(BUILD_DIR) && $(CMAKE3) -D CONSUL=$(CONSUL) -D KAFKA=$(KAFKA) -D MYSQL=$(MYSQL) -D REDIS=$(REDIS) $(ROOT_DIR)
 endif
-	make -C $(BUILD_DIR) -f Makefile
+	$(MAKE) -C $(BUILD_DIR) -f Makefile
 
 clean:
 ifeq ($(MAKE_FILE), $(wildcard $(MAKE_FILE)))
-	-make -f Makefile clean
+	-$(MAKE) -f Makefile clean
 else ifeq ($(DEFAULT_BUILD_DIR), $(wildcard $(DEFAULT_BUILD_DIR)))
-	-make -C $(DEFAULT_BUILD_DIR) clean
+	-$(MAKE) -C $(DEFAULT_BUILD_DIR) clean
 endif
 	rm -rf $(DEFAULT_BUILD_DIR)