gh actions: upgrade to 1.2.11-1

Added: 增加IPv6支持

debian/changelog

@@ -1,3 +1,93 @@
+libserverframe (1.2.11-1) unstable; urgency=medium
+
+  * upgrade to 1.2.11-1
+
+ -- YuQing <384681@qq.com>  Sun, 23 Nov 2025 10:48:22 +0000
+
+libserverframe (1.2.11-1) unstable; urgency=medium
+
+  * upgrade to 1.2.11-1
+
+ -- YuQing <384681@qq.com>  Sun, 23 Nov 2025 10:00:56 +0000
+
+libserverframe (1.2.11-1) unstable; urgency=medium
+
+  * upgrade to 1.2.11-1
+
+ -- YuQing <384681@qq.com>  Sun, 23 Nov 2025 09:06:43 +0000
+
+libserverframe (1.2.8-1) unstable; urgency=medium
+
+  * upgrade to 1.2.8-1
+
+ -- YuQing <384681@qq.com>  Sat, 16 Aug 2025 16:32:03 +0000
+
+libserverframe (1.2.7-1) unstable; urgency=medium
+
+  * upgrade to 1.2.7-1
+
+ -- YuQing <384681@qq.com>  Sun, 06 Apr 2025 16:56:40 +0000
+
+libserverframe (1.2.5-1) unstable; urgency=medium
+
+  * upgrade to 1.2.5-1
+
+ -- YuQing <384681@qq.com>  Sun, 29 Sep 2024 15:24:39 +0000
+
+libserverframe (1.2.4-1) unstable; urgency=medium
+
+  * upgrade to 1.2.4-1
+
+ -- YuQing <384681@qq.com>  Sat, 15 Jun 2024 14:45:44 +0000
+
+libserverframe (1.2.3-1) unstable; urgency=medium
+
+  * upgrade to 1.2.3-1
+
+ -- YuQing <384681@qq.com>  Sun, 17 Mar 2024 15:11:04 +0000
+
+libserverframe (1.2.2-1) unstable; urgency=medium
+
+  * upgrade to 1.2.2-1
+
+ -- YuQing <384681@qq.com>  Wed, 31 Jan 2024 12:00:10 +0000
+
+libserverframe (1.2.1-1) unstable; urgency=medium
+
+  * upgrade to 1.2.1-1
+
+ -- YuQing <384681@qq.com>  Mon, 01 Jan 2024 11:24:45 +0000
+
+libserverframe (1.2.0-3) unstable; urgency=medium
+
+  * upgrade to 1.2.0-3
+
+ -- YuQing <384681@qq.com>  Tue, 21 Nov 2023 14:36:16 +0000
+
+libserverframe (1.2.0-2) unstable; urgency=medium
+
+  * upgrade to 1.2.0-2
+
+ -- YuQing <384681@qq.com>  Mon, 20 Nov 2023 13:24:02 +0000
+
+libserverframe (1.2.0-1) unstable; urgency=medium
+
+  * upgrade to 1.2.0-1
+
+ -- YuQing <384681@qq.com>  Sun, 19 Nov 2023 14:46:16 +0000
+
+libserverframe (1.1.29-1) unstable; urgency=medium
+
+  * upgrade to 1.1.29-1
+
+ -- YuQing <384681@qq.com>  Sun, 06 Aug 2023 07:22:46 +0000
+
+libserverframe (1.1.28-1) unstable; urgency=medium
+
+  * upgrade to 1.1.28-1
+
+ -- YuQing <384681@qq.com>  Sun, 23 Jul 2023 14:28:20 +0000
+
 libserverframe (1.1.27-1) unstable; urgency=medium
 
   * upgrade to 1.1.27-1

debian/substvars

@@ -1 +1 @@
-libfastcommon:Version=1.0.67
+libfastcommon:Version=1.0.83

libserverframe.spec

@@ -2,7 +2,7 @@
 %define CommitVersion %(echo $COMMIT_VERSION)
 
 Name: libserverframe
-Version: 1.1.28
+Version: 1.2.11
 Release: 1%{?dist}
 Summary: network framework library
 License: AGPL v3.0
@@ -10,11 +10,11 @@ Group: Arch/Tech
 URL:  http://github.com/happyfish100/libserverframe/
 Source: http://github.com/happyfish100/libserverframe/%{name}-%{version}.tar.gz
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: libfastcommon-devel >= 1.0.68
+BuildRequires: libfastcommon-devel >= 1.0.83
 Requires: %__cp %__mv %__chmod %__grep %__mkdir %__install %__id
-Requires: libfastcommon >= 1.0.68
+Requires: libfastcommon >= 1.0.83
 
 %description
 common framework library 

make.sh

@@ -8,11 +8,14 @@ LIB_VERSION=lib64
 DEBUG_FLAG=0
 
 if [ -f /usr/include/fastcommon/_os_define.h ]; then
-  OS_BITS=$(fgrep OS_BITS /usr/include/fastcommon/_os_define.h | awk '{print $NF;}')
+  OS_BITS=$(grep -F OS_BITS /usr/include/fastcommon/_os_define.h | awk '{print $NF;}')
+  USE_URING=$(grep -F IOEVENT_USE_URING /usr/include/fastcommon/_os_define.h | awk '{print $NF;}')
 elif [ -f /usr/local/include/fastcommon/_os_define.h ]; then
-  OS_BITS=$(fgrep OS_BITS /usr/local/include/fastcommon/_os_define.h | awk '{print $NF;}')
+  OS_BITS=$(grep -F OS_BITS /usr/local/include/fastcommon/_os_define.h | awk '{print $NF;}')
+  USE_URING=$(grep -F IOEVENT_USE_URING /usr/local/include/fastcommon/_os_define.h | awk '{print $NF;}')
 else
   OS_BITS=64
+  USE_URING=''
 fi
 
 uname=$(uname)
@@ -49,6 +52,9 @@ LIBS=''
 uname=$(uname)
 if [ "$uname" = "Linux" ]; then
   CFLAGS="$CFLAGS"
+  if [ -n "$USE_URING" ]; then
+    LIBS="$LIBS -luring"
+  fi
 elif [ "$uname" = "FreeBSD" ] || [ "$uname" = "Darwin" ]; then
   CFLAGS="$CFLAGS"
   if [ "$uname" = "Darwin" ]; then
@@ -77,19 +83,19 @@ elif [ "$uname" = "HP-UX" ]; then
   fi
 elif [ "$uname" = "FreeBSD" ]; then
   if [ -f /usr/lib/libc_r.so ]; then
-    line=$(nm -D /usr/lib/libc_r.so | grep pthread_create | grep -w T)
+    line=$(nm -D /usr/lib/libc_r.so | grep -F pthread_create | grep -w T)
     if [ $? -eq 0 ]; then
       LIBS="$LIBS -lc_r"
       have_pthread=1
     fi
   elif [ -f /lib64/libc_r.so ]; then
-    line=$(nm -D /lib64/libc_r.so | grep pthread_create | grep -w T)
+    line=$(nm -D /lib64/libc_r.so | grep -F pthread_create | grep -w T)
     if [ $? -eq 0 ]; then
       LIBS="$LIBS -lc_r"
       have_pthread=1
     fi
   elif [ -f /usr/lib64/libc_r.so ]; then
-    line=$(nm -D /usr/lib64/libc_r.so | grep pthread_create | grep -w T)
+    line=$(nm -D /usr/lib64/libc_r.so | grep -F pthread_create | grep -w T)
     if [ $? -eq 0 ]; then
       LIBS="$LIBS -lc_r"
       have_pthread=1
@@ -98,7 +104,7 @@ elif [ "$uname" = "FreeBSD" ]; then
 fi
 
 if [ $have_pthread -eq 0 ] && [ "$uname" = "Linux" ]; then
-   /sbin/ldconfig -p | fgrep libpthread.so > /dev/null
+   /sbin/ldconfig -p | grep -w libpthread.so > /dev/null
    if [ $? -eq 0 ]; then
       LIBS="$LIBS -lpthread"
    else
@@ -132,6 +138,7 @@ fi
 
 cd ..
 cp Makefile.in Makefile
+sed_replace "s#\\\$(CC)#gcc#g" Makefile
 sed_replace "s#\\\$(CFLAGS)#$CFLAGS#g" Makefile
 sed_replace "s#\\\$(LIBS)#$LIBS#g" Makefile
 sed_replace "s#\\\$(TARGET_PREFIX)#$TARGET_PREFIX#g" Makefile

src/idempotency/client/client_channel.c

@@ -31,11 +31,11 @@
 #include "fastcommon/pthread_func.h"
 #include "fastcommon/sched_thread.h"
 #include "fastcommon/fc_queue.h"
-#include "../../sf_util.h"
-#include "../../sf_func.h"
-#include "../../sf_nio.h"
-#include "../../sf_global.h"
-#include "../../sf_service.h"
+#include "sf/sf_util.h"
+#include "sf/sf_func.h"
+#include "sf/sf_nio.h"
+#include "sf/sf_global.h"
+#include "sf/sf_service.h"
 #include "client_channel.h"
 
 typedef struct {
@@ -171,17 +171,30 @@ void client_channel_destroy()
 }
 
 static struct fast_task_info *alloc_channel_task(IdempotencyClientChannel
-        *channel, const uint32_t hash_code, const char *server_ip,
-        const uint16_t port, int *err_no)
+        *channel, const uint32_t hash_code, const FCCommunicationType comm_type,
+        const char *server_ip, const uint16_t port, int *err_no)
 {
     struct fast_task_info *task;
+    SFAddressFamilyHandler *fh;
+    SFNetworkHandler *handler;
 
-    if ((task=sf_alloc_init_task(&g_sf_context, -1)) == NULL) {
+    if (is_ipv6_addr(server_ip)) {
+        fh = g_sf_context.handlers + SF_IPV6_ADDRESS_FAMILY_INDEX;
+    } else {
+        fh = g_sf_context.handlers + SF_IPV4_ADDRESS_FAMILY_INDEX;
+    }
+
+    if (comm_type == fc_comm_type_sock) {
+        handler = fh->handlers + SF_SOCKET_NETWORK_HANDLER_INDEX;
+    } else {
+        handler = fh->handlers + SF_RDMACM_NETWORK_HANDLER_INDEX;
+    }
+    if ((task=sf_alloc_init_task(handler, -1)) == NULL) {
         *err_no = ENOMEM;
         return NULL;
     }
 
-    snprintf(task->server_ip, sizeof(task->server_ip), "%s", server_ip);
+    fc_safe_strcpy(task->server_ip, server_ip);
     task->port = port;
     task->arg = channel;
     task->thread_data = g_sf_context.thread_data +
@@ -190,7 +203,8 @@ static struct fast_task_info *alloc_channel_task(IdempotencyClientChannel
     channel->last_connect_time = g_current_time;
     if ((*err_no=sf_nio_notify(task, SF_NIO_STAGE_CONNECT)) != 0) {
         channel->in_ioevent = 0;   //rollback
-        sf_release_task(task);
+        __sync_sub_and_fetch(&task->reffer_count, 1);
+        free_queue_push(task);
         return NULL;
     }
     return task;
@@ -200,6 +214,15 @@ int idempotency_client_channel_check_reconnect(
         IdempotencyClientChannel *channel)
 {
     int result;
+    char formatted_ip[FORMATTED_IP_SIZE];
+
+#if IOEVENT_USE_URING
+    struct fast_task_info *task;
+    task = channel->task;
+    if (SF_CTX->use_io_uring && FC_ATOMIC_GET(task->reffer_count) > 1) {
+        return 0;
+    }
+#endif
 
     if (!__sync_bool_compare_and_swap(&channel->in_ioevent, 0, 1)) {
         return 0;
@@ -210,11 +233,16 @@ int idempotency_client_channel_check_reconnect(
         channel->last_connect_time = g_current_time;
     }
 
-    logDebug("file: "__FILE__", line: %d, "
-            "trigger connect to server %s:%u",
-            __LINE__, channel->task->server_ip,
-            channel->task->port);
+    if (FC_LOG_BY_LEVEL(LOG_DEBUG)) {
+        format_ip_address(channel->task->server_ip, formatted_ip);
+        logDebug("file: "__FILE__", line: %d, "
+                "trigger connect to server %s:%u", __LINE__,
+                formatted_ip, channel->task->port);
+    }
 
+    if (channel->task->event.fd >= 0) {
+        channel->task->handler->close_connection(channel->task);
+    }
     __sync_bool_compare_and_swap(&channel->task->canceled, 1, 0);
     if ((result=sf_nio_notify(channel->task, SF_NIO_STAGE_CONNECT)) == 0) {
         channel->last_connect_time = g_current_time;
@@ -226,8 +254,8 @@ int idempotency_client_channel_check_reconnect(
 }
 
 struct idempotency_client_channel *idempotency_client_channel_get(
-        const char *server_ip, const uint16_t server_port,
-        const int timeout, int *err_no)
+        const FCCommunicationType comm_type, const char *server_ip,
+        const uint16_t server_port, const int timeout, int *err_no)
 {
     int r;
     int key_len;
@@ -239,7 +267,10 @@ struct idempotency_client_channel *idempotency_client_channel_get(
     IdempotencyClientChannel *current;
     IdempotencyClientChannel *channel;
 
-    key_len = snprintf(key, sizeof(key), "%s_%u", server_ip, server_port);
+    key_len = strlen(server_ip);
+    memcpy(key, server_ip, key_len);
+    *(key + key_len++) = '-';
+    key_len += fc_itoa(server_port, key + key_len);
     hash_code = fc_simple_hash(key, key_len);
     bucket = channel_context.htable.buckets +
         hash_code % channel_context.htable.capacity;
@@ -277,8 +308,8 @@ struct idempotency_client_channel *idempotency_client_channel_get(
             break;
         }
 
-        channel->task = alloc_channel_task(channel,
-                hash_code, server_ip, server_port, err_no);
+        channel->task = alloc_channel_task(channel, hash_code,
+                comm_type, server_ip, server_port, err_no);
         if (channel->task == NULL) {
             fast_mblock_free_object(&channel_context.
                     channel_allocator, channel);
@@ -323,8 +354,8 @@ int idempotency_client_channel_push(struct idempotency_client_channel *channel,
     receipt->req_id = req_id;
     fc_queue_push_ex(&channel->queue, receipt, &notify);
     if (notify) {
-        if (__sync_add_and_fetch(&channel->in_ioevent, 0)) {
-            if (__sync_add_and_fetch(&channel->established, 0)) {
+        if (FC_ATOMIC_GET(channel->in_ioevent)) {
+            if (FC_ATOMIC_GET(channel->established)) {
                 sf_nio_notify(channel->task, SF_NIO_STAGE_CONTINUE);
             }
         } else {

src/idempotency/client/client_channel.h

@@ -22,6 +22,7 @@
 #include "fastcommon/pthread_func.h"
 #include "fastcommon/sched_thread.h"
 #include "fastcommon/fc_atomic.h"
+#include "sf/sf_types.h"
 #include "client_types.h"
 
 #ifdef __cplusplus
@@ -40,8 +41,8 @@ void idempotency_client_channel_config_to_string_ex(
         char *output, const int size, const bool add_comma);
 
 struct idempotency_client_channel *idempotency_client_channel_get(
-        const char *server_ip, const uint16_t server_port,
-        const int timeout, int *err_no);
+        const FCCommunicationType comm_type, const char *server_ip,
+        const uint16_t server_port, const int timeout, int *err_no);
 
 static inline uint64_t idempotency_client_channel_next_seq_id(
         struct idempotency_client_channel *channel)
@@ -75,20 +76,22 @@ static inline void idempotency_client_channel_set_id_key(
 static inline int idempotency_client_channel_check_wait_ex(
         struct idempotency_client_channel *channel, const int timeout)
 {
-    if (__sync_add_and_fetch(&channel->established, 0)) {
+    if (FC_ATOMIC_GET(channel->established)) {
         return 0;
     }
 
     idempotency_client_channel_check_reconnect(channel);
     lcp_timedwait_sec(&channel->lcp, timeout);
-    if (__sync_add_and_fetch(&channel->established, 0)) {
+    if (FC_ATOMIC_GET(channel->established)) {
         return 0;
     } else {
         /*
+        char formatted_ip[FORMATTED_IP_SIZE];
+        format_ip_address(channel->task->server_ip, formatted_ip);
         logInfo("file: "__FILE__", line: %d, "
                 "channel_check fail, server %s:%u, in_ioevent: %d, "
                 "canceled: %d, req count: %"PRId64, __LINE__,
-                channel->task->server_ip, channel->task->port,
+                formatted_ip, channel->task->port,
                 __sync_add_and_fetch(&channel->in_ioevent, 0),
                 __sync_add_and_fetch(&channel->task->canceled, 0),
                 channel->task->req_count);

src/idempotency/client/client_types.h

@@ -63,6 +63,14 @@ typedef struct idempotency_receipt_thread_context {
     } last_check_times;
 } IdempotencyReceiptThreadContext;
 
+typedef struct idempotency_receipt_global_vars {
+    struct {
+        int task_padding_size;
+        sf_init_connection_callback init_connection;
+    } rdma;
+    IdempotencyReceiptThreadContext *thread_contexts;
+} IdempotencyReceiptGlobalVars;
+
 #ifdef __cplusplus
 extern "C" {
 #endif

src/idempotency/client/receipt_handler.c

@@ -41,23 +41,35 @@
 #include "client_channel.h"
 #include "receipt_handler.h"
 
-static IdempotencyReceiptThreadContext *receipt_thread_contexts = NULL;
+static IdempotencyReceiptGlobalVars receipt_global_vars;
 
-static int receipt_init_task(struct fast_task_info *task)
+#define RECEIPT_THREAD_CONTEXTS  receipt_global_vars.thread_contexts
+#define TASK_PADDING_SIZE        receipt_global_vars.rdma.task_padding_size
+#define RDMA_INIT_CONNECTION     receipt_global_vars.rdma.init_connection
+
+static int receipt_init_task(struct fast_task_info *task, void *arg)
 {
-    task->connect_timeout = SF_G_CONNECT_TIMEOUT; //for client side
-    task->network_timeout = SF_G_NETWORK_TIMEOUT;
-    return 0;
+#if IOEVENT_USE_URING
+    FC_URING_IS_CLIENT(task) = true;
+#endif
+
+    if (RDMA_INIT_CONNECTION != NULL) {
+        return RDMA_INIT_CONNECTION(task, arg);
+    } else {
+        return 0;
+    }
 }
 
 static int receipt_recv_timeout_callback(struct fast_task_info *task)
 {
     IdempotencyClientChannel *channel;
+    char formatted_ip[FORMATTED_IP_SIZE];
 
+    format_ip_address(task->server_ip, formatted_ip);
     if (SF_NIO_TASK_STAGE_FETCH(task) == SF_NIO_STAGE_CONNECT) {
         logError("file: "__FILE__", line: %d, "
                 "connect to server %s:%u timeout",
-                __LINE__, task->server_ip, task->port);
+                __LINE__, formatted_ip, task->port);
         return ETIMEDOUT;
     }
 
@@ -65,12 +77,12 @@ static int receipt_recv_timeout_callback(struct fast_task_info *task)
     if (channel->waiting_resp_qinfo.head != NULL) {
         logError("file: "__FILE__", line: %d, "
                 "waiting receipt response from server %s:%u timeout",
-                __LINE__, task->server_ip, task->port);
+                __LINE__, formatted_ip, task->port);
     } else {
         logError("file: "__FILE__", line: %d, "
                 "%s server %s:%u timeout, channel established: %d",
                 __LINE__, task->nio_stages.current == SF_NIO_STAGE_SEND ?
-                "send to" : "recv from", task->server_ip, task->port,
+                "send to" : "recv from", formatted_ip, task->port,
                 FC_ATOMIC_GET(channel->established));
     }
 
@@ -80,25 +92,27 @@ static int receipt_recv_timeout_callback(struct fast_task_info *task)
 static void receipt_task_finish_cleanup(struct fast_task_info *task)
 {
     IdempotencyClientChannel *channel;
+    char formatted_ip[FORMATTED_IP_SIZE];
 
     if (task->event.fd >= 0) {
         sf_task_detach_thread(task);
-        close(task->event.fd);
-        task->event.fd = -1;
     }
 
-    task->length = 0;
-    task->offset = 0;
+    sf_nio_reset_task_length(task);
     task->req_count = 0;
+    task->pending_send_count = 0;
 
     channel = (IdempotencyClientChannel *)task->arg;
     fc_list_del_init(&channel->dlink);
     __sync_bool_compare_and_swap(&channel->established, 1, 0);
     __sync_bool_compare_and_swap(&channel->in_ioevent, 1, 0);
 
-    logDebug("file: "__FILE__", line: %d, "
-            "receipt task for server %s:%u exit",
-            __LINE__, task->server_ip, task->port);
+    if (FC_LOG_BY_LEVEL(LOG_DEBUG)) {
+        format_ip_address(task->server_ip, formatted_ip);
+        logDebug("file: "__FILE__", line: %d, "
+                "receipt task for server %s:%u exit",
+                __LINE__, formatted_ip, task->port);
+    }
 }
 
 static void setup_channel_request(struct fast_task_info *task)
@@ -108,14 +122,15 @@ static void setup_channel_request(struct fast_task_info *task)
     SFProtoSetupChannelReq *req;
 
     channel = (IdempotencyClientChannel *)task->arg;
-    header = (SFCommonProtoHeader *)task->data;
+    header = (SFCommonProtoHeader *)task->send.ptr->data;
     req = (SFProtoSetupChannelReq *)(header + 1);
     int2buff(__sync_add_and_fetch(&channel->id, 0), req->channel_id);
     int2buff(__sync_add_and_fetch(&channel->key, 0), req->key);
 
     SF_PROTO_SET_HEADER(header, SF_SERVICE_PROTO_SETUP_CHANNEL_REQ,
             sizeof(SFProtoSetupChannelReq));
-    task->length = sizeof(SFCommonProtoHeader) + sizeof(SFProtoSetupChannelReq);
+    task->send.ptr->length = sizeof(SFCommonProtoHeader) +
+        sizeof(SFProtoSetupChannelReq);
     sf_send_add_event(task);
 }
 
@@ -142,10 +157,10 @@ static int check_report_req_receipt(struct fast_task_info *task)
         return 0;
     }
 
-    header = (SFCommonProtoHeader *)task->data;
+    header = (SFCommonProtoHeader *)task->send.ptr->data;
     rheader = (SFProtoReportReqReceiptHeader *)(header + 1);
     rbody = rstart = (SFProtoReportReqReceiptBody *)(rheader + 1);
-    buff_end = task->data + channel->buffer_size;
+    buff_end = task->send.ptr->data + channel->buffer_size;
     last = NULL;
     receipt = channel->waiting_resp_qinfo.head;
     do {
@@ -175,8 +190,9 @@ static int check_report_req_receipt(struct fast_task_info *task)
 
     count = rbody - rstart;
     int2buff(count, rheader->count);
-    task->length = (char *)rbody - task->data;
-    int2buff(task->length - sizeof(SFCommonProtoHeader), header->body_len);
+    task->send.ptr->length = (char *)rbody - task->send.ptr->data;
+    int2buff(task->send.ptr->length - sizeof(SFCommonProtoHeader),
+            header->body_len);
     header->cmd = SF_SERVICE_PROTO_REPORT_REQ_RECEIPT_REQ;
     sf_send_add_event(task);
     return count;
@@ -190,18 +206,18 @@ static void close_channel_request(struct fast_task_info *task)
     channel = (IdempotencyClientChannel *)task->arg;
     idempotency_client_channel_set_id_key(channel, 0, 0);
 
-    header = (SFCommonProtoHeader *)task->data;
+    header = (SFCommonProtoHeader *)task->send.ptr->data;
     SF_PROTO_SET_HEADER(header, SF_SERVICE_PROTO_CLOSE_CHANNEL_REQ, 0);
-    task->length = sizeof(SFCommonProtoHeader);
+    task->send.ptr->length = sizeof(SFCommonProtoHeader);
     sf_send_add_event(task);
 }
 
 static void active_test_request(struct fast_task_info *task)
 {
     SFCommonProtoHeader *header;
-    header = (SFCommonProtoHeader *)task->data;
+    header = (SFCommonProtoHeader *)task->send.ptr->data;
     SF_PROTO_SET_HEADER(header, SF_PROTO_ACTIVE_TEST_REQ, 0);
-    task->length = sizeof(SFCommonProtoHeader);
+    task->send.ptr->length = sizeof(SFCommonProtoHeader);
     sf_send_add_event(task);
 }
 
@@ -229,17 +245,22 @@ static void report_req_receipt_request(struct fast_task_info *task,
         if (update_lru) {
             update_lru_chain(task);
         }
+        task->pending_send_count++;
     }
 }
 
 static inline int receipt_expect_body_length(struct fast_task_info *task,
         const int expect_body_len)
 {
-    if ((int)(task->length - sizeof(SFCommonProtoHeader)) != expect_body_len) {
+    int body_len;
+    char formatted_ip[FORMATTED_IP_SIZE];
+
+    body_len = task->recv.ptr->length - sizeof(SFCommonProtoHeader);
+    if (body_len != expect_body_len) {
+        format_ip_address(task->server_ip, formatted_ip);
         logError("file: "__FILE__", line: %d, "
-                "server %s:%u, response body length: %d != %d",
-                __LINE__, task->server_ip, task->port, (int)(task->length -
-                    sizeof(SFCommonProtoHeader)), expect_body_len);
+                "server %s:%u, response body length: %d != %d", __LINE__,
+                formatted_ip, task->port, body_len, expect_body_len);
         return EINVAL;
     }
 
@@ -252,6 +273,7 @@ static int deal_setup_channel_response(struct fast_task_info *task)
     IdempotencyReceiptThreadContext *thread_ctx;
     SFProtoSetupChannelResp *resp;
     IdempotencyClientChannel *channel;
+    char formatted_ip[FORMATTED_IP_SIZE];
     int channel_id;
     int channel_key;
     int buffer_size;
@@ -263,16 +285,16 @@ static int deal_setup_channel_response(struct fast_task_info *task)
     }
 
     channel = (IdempotencyClientChannel *)task->arg;
-    if (__sync_add_and_fetch(&channel->established, 0)) {
+    if (FC_ATOMIC_GET(channel->established)) {
+        format_ip_address(task->server_ip, formatted_ip);
         logWarning("file: "__FILE__", line: %d, "
                 "response from server %s:%u, unexpected cmd: "
                 "SETUP_CHANNEL_RESP, ignore it!",
-                __LINE__, task->server_ip, task->port);
+                __LINE__, formatted_ip, task->port);
         return 0;
     }
 
-    resp = (SFProtoSetupChannelResp *)(task->data +
-            sizeof(SFCommonProtoHeader));
+    resp = (SFProtoSetupChannelResp *)SF_PROTO_RECV_BODY(task);
     channel_id = buff2int(resp->channel_id);
     channel_key = buff2int(resp->key);
     buffer_size = buff2int(resp->buffer_size);
@@ -282,7 +304,7 @@ static int deal_setup_channel_response(struct fast_task_info *task)
         thread_ctx = (IdempotencyReceiptThreadContext *)task->thread_data->arg;
         fc_list_add_tail(&channel->dlink, &thread_ctx->head);
     }
-    channel->buffer_size = FC_MIN(buffer_size, task->size);
+    channel->buffer_size = FC_MIN(buffer_size, task->send.ptr->size);
 
     PTHREAD_MUTEX_LOCK(&channel->lcp.lock);
     pthread_cond_broadcast(&channel->lcp.cond);
@@ -305,6 +327,7 @@ static inline int deal_report_req_receipt_response(struct fast_task_info *task)
     IdempotencyClientChannel *channel;
     IdempotencyClientReceipt *current;
     IdempotencyClientReceipt *deleted;
+    char formatted_ip[FORMATTED_IP_SIZE];
 
     if ((result=receipt_expect_body_length(task, 0)) != 0) {
         return result;
@@ -312,13 +335,15 @@ static inline int deal_report_req_receipt_response(struct fast_task_info *task)
 
     channel = (IdempotencyClientChannel *)task->arg;
     if (channel->waiting_resp_qinfo.head == NULL) {
+        format_ip_address(task->server_ip, formatted_ip);
         logWarning("file: "__FILE__", line: %d, "
                 "response from server %s:%u, unexpect cmd: "
                 "REPORT_REQ_RECEIPT_RESP", __LINE__,
-                task->server_ip, task->port);
-        return 0;
+                formatted_ip, task->port);
+        return EINVAL;
     }
 
+    task->pending_send_count--;
     current = channel->waiting_resp_qinfo.head;
     do {
         deleted = current;
@@ -335,6 +360,8 @@ static inline int deal_report_req_receipt_response(struct fast_task_info *task)
 static int receipt_deal_task(struct fast_task_info *task, const int stage)
 {
     int result;
+    SFCommonProtoHeader *header;
+    char formatted_ip[FORMATTED_IP_SIZE];
 
     do {
         if (stage == SF_NIO_STAGE_HANDSHAKE) {
@@ -342,7 +369,7 @@ static int receipt_deal_task(struct fast_task_info *task, const int stage)
             result = 0;
             break;
         } else if (stage == SF_NIO_STAGE_CONTINUE) {
-            if (task->length == 0 && task->offset == 0) {
+            if (task->pending_send_count == 0) {
                 if (((IdempotencyClientChannel *)task->arg)->established) {
                     report_req_receipt_request(task, true);
                 } else if (task->req_count > 0) {
@@ -354,24 +381,25 @@ static int receipt_deal_task(struct fast_task_info *task, const int stage)
             break;
         }
 
-        result = buff2short(((SFCommonProtoHeader *)task->data)->status);
+        header = (SFCommonProtoHeader *)task->recv.ptr->data;
+        result = buff2short(header->status);
         if (result != 0) {
             int msg_len;
             char *message;
 
-            msg_len = task->length - sizeof(SFCommonProtoHeader);
-            message = task->data + sizeof(SFCommonProtoHeader);
+            msg_len = SF_RECV_BODY_LENGTH(task);
+            message = SF_PROTO_RECV_BODY(task);
+            format_ip_address(task->server_ip, formatted_ip);
             logError("file: "__FILE__", line: %d, "
                     "response from server %s:%u, cmd: %d (%s), "
-                    "status: %d, error info: %.*s",
-                    __LINE__, task->server_ip, task->port,
-                    ((SFCommonProtoHeader *)task->data)->cmd,
-                    sf_get_cmd_caption(((SFCommonProtoHeader *)task->data)->cmd),
+                    "status: %d, error info: %.*s", __LINE__,
+                    formatted_ip, task->port, header->cmd,
+                    sf_get_cmd_caption(header->cmd),
                     result, msg_len, message);
             break;
         }
 
-        switch (((SFCommonProtoHeader *)task->data)->cmd) {
+        switch (header->cmd) {
             case SF_SERVICE_PROTO_SETUP_CHANNEL_RESP:
                 result = deal_setup_channel_response(task);
                 break;
@@ -379,28 +407,35 @@ static int receipt_deal_task(struct fast_task_info *task, const int stage)
                 result = deal_report_req_receipt_response(task);
                 break;
             case SF_PROTO_ACTIVE_TEST_RESP:
+                task->pending_send_count--;
                 result = 0;
                 break;
             case SF_SERVICE_PROTO_CLOSE_CHANNEL_RESP:
                 result = ECONNRESET; //force to close socket
-                logDebug("file: "__FILE__", line: %d, "
-                    "close channel to server %s:%u !!!",
-                    __LINE__, task->server_ip, task->port);
+                if (FC_LOG_BY_LEVEL(LOG_DEBUG)) {
+                    format_ip_address(task->server_ip, formatted_ip);
+                    logDebug("file: "__FILE__", line: %d, "
+                            "close channel to server %s:%u !!!",
+                            __LINE__, formatted_ip, task->port);
+                }
                 break;
             default:
+                format_ip_address(task->server_ip, formatted_ip);
                 logError("file: "__FILE__", line: %d, "
                         "response from server %s:%u, unexpect cmd: %d (%s)",
-                        __LINE__, task->server_ip, task->port,
-                        ((SFCommonProtoHeader *)task->data)->cmd,
-                        sf_get_cmd_caption(((SFCommonProtoHeader *)task->data)->cmd));
+                        __LINE__, formatted_ip, task->port, header->cmd,
+                        sf_get_cmd_caption(header->cmd));
                 result = EINVAL;
                 break;
         }
 
         if (result == 0) {
             update_lru_chain(task);
-            task->offset = task->length = 0;
-            report_req_receipt_request(task, false);
+            task->recv.ptr->length = 0;
+            task->recv.ptr->offset = 0;
+            if (task->pending_send_count == 0) {
+                report_req_receipt_request(task, false);
+            }
         }
     } while (0);
 
@@ -420,9 +455,10 @@ static void receipt_thread_check_heartbeat(
             break;
         }
 
-        if (sf_nio_task_is_idle(channel->task)) {
+        if (channel->task->pending_send_count == 0) {
             channel->last_pkg_time = g_current_time;
             active_test_request(channel->task);
+            channel->task->pending_send_count++;
         }
     }
 }
@@ -432,18 +468,22 @@ static void receipt_thread_close_idle_channel(
 {
     IdempotencyClientChannel *channel;
     IdempotencyClientChannel *tmp;
+    char formatted_ip[FORMATTED_IP_SIZE];
 
     fc_list_for_each_entry_safe(channel, tmp, &thread_ctx->head, dlink) {
-        if (!sf_nio_task_is_idle(channel->task)) {
+        if (channel->task->pending_send_count > 0) {
             continue;
         }
 
         if (g_current_time - channel->last_report_time >
                  g_idempotency_client_cfg.channel_max_idle_time)
         {
-            logDebug("file: "__FILE__", line: %d, "
-                    "close channel to server %s:%u because idle too long",
-                    __LINE__, channel->task->server_ip, channel->task->port);
+            if (FC_LOG_BY_LEVEL(LOG_DEBUG)) {
+                format_ip_address(channel->task->server_ip, formatted_ip);
+                logDebug("file: "__FILE__", line: %d, "
+                        "close channel to server %s:%u because idle too long",
+                        __LINE__, formatted_ip, channel->task->port);
+            }
             close_channel_request(channel->task);
         }
     }
@@ -474,40 +514,61 @@ static void *receipt_alloc_thread_extra_data(const int thread_index)
 {
     IdempotencyReceiptThreadContext *ctx;
 
-    ctx = receipt_thread_contexts + thread_index;
+    ctx = RECEIPT_THREAD_CONTEXTS + thread_index;
     FC_INIT_LIST_HEAD(&ctx->head);
     return ctx;
 }
 
-static int do_init()
+static int do_init(FCAddressPtrArray *address_array)
 {
+    const int task_arg_size = 0;
+    const bool double_buffers = false;
+    const bool need_shrink_task_buffer = false;
+    const bool explicit_post_recv = false;
+    int result;
     int bytes;
+    SFNetworkHandler *rdma_handler;
+    struct ibv_pd *pd;
 
     bytes = sizeof(IdempotencyReceiptThreadContext) * SF_G_WORK_THREADS;
-    receipt_thread_contexts = (IdempotencyReceiptThreadContext *)
+    RECEIPT_THREAD_CONTEXTS = (IdempotencyReceiptThreadContext *)
         fc_malloc(bytes);
-    if (receipt_thread_contexts == NULL) {
+    if (RECEIPT_THREAD_CONTEXTS == NULL) {
         return ENOMEM;
     }
-    memset(receipt_thread_contexts, 0, bytes);
+    memset(RECEIPT_THREAD_CONTEXTS, 0, bytes);
 
+    if ((rdma_handler=sf_get_rdma_network_handler(&g_sf_context)) != NULL) {
+        if ((result=sf_alloc_rdma_pd(&g_sf_context, address_array)) != 0) {
+            return result;
+        }
+
+        TASK_PADDING_SIZE = rdma_handler->get_connection_size();
+        RDMA_INIT_CONNECTION = rdma_handler->init_connection;
+        pd = rdma_handler->pd;
+    } else {
+        TASK_PADDING_SIZE = 0;
+        RDMA_INIT_CONNECTION = NULL;
+        pd = NULL;
+    }
     return sf_service_init_ex2(&g_sf_context, "idemp-receipt",
             receipt_alloc_thread_extra_data, receipt_thread_loop_callback,
             NULL, sf_proto_set_body_length, NULL, NULL, receipt_deal_task,
             receipt_task_finish_cleanup, receipt_recv_timeout_callback,
-            1000, sizeof(SFCommonProtoHeader), 0, receipt_init_task, NULL);
+            1000, sizeof(SFCommonProtoHeader), TASK_PADDING_SIZE,
+            task_arg_size, double_buffers, need_shrink_task_buffer,
+            explicit_post_recv, receipt_init_task, pd, NULL);
 }
 
-int receipt_handler_init()
+int receipt_handler_init(FCAddressPtrArray *address_array)
 {
     int result;
 
-    if ((result=do_init()) != 0) {
+    if ((result=do_init(address_array)) != 0) {
         return result;
     }
 
     sf_enable_thread_notify(true);
-    sf_set_remove_from_ready_list(false);
     fc_sleep_ms(100);
 
     return 0;

src/idempotency/client/receipt_handler.h

@@ -24,7 +24,7 @@
 extern "C" {
 #endif
 
-int receipt_handler_init();
+int receipt_handler_init(FCAddressPtrArray *address_array);
 int receipt_handler_destroy();
 
 #ifdef __cplusplus

src/idempotency/server/server_handler.c

@@ -37,9 +37,6 @@
 #include "server_channel.h"
 #include "server_handler.h"
 
-#define SF_TASK_BODY_LENGTH(task) \
-    (task->length - sizeof(SFCommonProtoHeader))
-
 int sf_server_deal_setup_channel(struct fast_task_info *task,
         int *task_type, const int server_id, IdempotencyChannel
         **channel, SFResponseInfo *response)
@@ -52,13 +49,13 @@ int sf_server_deal_setup_channel(struct fast_task_info *task,
 
     response->header.cmd = SF_SERVICE_PROTO_SETUP_CHANNEL_RESP;
     if ((result=sf_server_expect_body_length(response,
-                    SF_TASK_BODY_LENGTH(task),
+                    SF_RECV_BODY_LENGTH(task),
                     sizeof(SFProtoSetupChannelReq))) != 0)
     {
         return result;
     }
 
-    req = (SFProtoSetupChannelReq *)(task->data + sizeof(SFCommonProtoHeader));
+    req = (SFProtoSetupChannelReq *)SF_PROTO_RECV_BODY(task);
     channel_id = buff2int(req->channel_id);
     key = buff2int(req->key);
     if (*channel != NULL) {
@@ -76,12 +73,11 @@ int sf_server_deal_setup_channel(struct fast_task_info *task,
     }
     *task_type = SF_SERVER_TASK_TYPE_CHANNEL_HOLDER;
 
-    resp = (SFProtoSetupChannelResp *)(task->data +
-            sizeof(SFCommonProtoHeader));
+    resp = (SFProtoSetupChannelResp *)SF_PROTO_SEND_BODY(task);
     int2buff((*channel)->id, resp->channel_id);
     int2buff((*channel)->key, resp->key);
     int2buff(server_id, resp->server_id);
-    int2buff(task->size, resp->buffer_size);
+    int2buff(task->send.ptr->size, resp->buffer_size);
     response->header.body_len = sizeof(SFProtoSetupChannelResp);
     return 0;
 }
@@ -135,19 +131,19 @@ int sf_server_deal_report_req_receipt(struct fast_task_info *task,
     SFProtoReportReqReceiptBody *body_part;
     SFProtoReportReqReceiptBody *body_end;
 
+    response->header.cmd = SF_SERVICE_PROTO_REPORT_REQ_RECEIPT_RESP;
     if ((result=check_holder_channel(task_type, channel, response)) != 0) {
         return result;
     }
 
-    body_len = SF_TASK_BODY_LENGTH(task);
+    body_len = SF_RECV_BODY_LENGTH(task);
     if ((result=sf_server_check_min_body_length(response, body_len,
                     sizeof(SFProtoReportReqReceiptHeader))) != 0)
     {
         return result;
     }
 
-    body_header = (SFProtoReportReqReceiptHeader *)
-    (task->data + sizeof(SFCommonProtoHeader));
+    body_header = (SFProtoReportReqReceiptHeader *)SF_PROTO_RECV_BODY(task);
     count = buff2int(body_header->count);
     calc_body_len = sizeof(SFProtoReportReqReceiptHeader) +
         sizeof(SFProtoReportReqReceiptBody) * count;
@@ -169,7 +165,6 @@ int sf_server_deal_report_req_receipt(struct fast_task_info *task,
     }
 
     //logInfo("receipt count: %d, success: %d", count, success);
-    response->header.cmd = SF_SERVICE_PROTO_REPORT_REQ_RECEIPT_RESP;
     return 0;
 }
 
@@ -220,7 +215,7 @@ int sf_server_deal_rebind_channel(struct fast_task_info *task,
     SFProtoRebindChannelReq *req;
 
     if ((result=sf_server_expect_body_length(response,
-                    SF_TASK_BODY_LENGTH(task),
+                    SF_RECV_BODY_LENGTH(task),
                     sizeof(SFProtoRebindChannelReq))) != 0)
     {
         return result;
@@ -240,7 +235,7 @@ int sf_server_deal_rebind_channel(struct fast_task_info *task,
     }
     idempotency_channel_release(*channel, false);
 
-    req = (SFProtoRebindChannelReq *)(task->data + sizeof(SFCommonProtoHeader));
+    req = (SFProtoRebindChannelReq *)SF_PROTO_RECV_BODY(task);
     channel_id = buff2int(req->channel_id);
     key = buff2int(req->key);
     *channel = idempotency_channel_find_and_hold(channel_id, key, &result);

src/sf_binlog_index.c

@@ -68,10 +68,6 @@ static int parse(SFBinlogIndexContext *ctx, const string_t *lines,
     const string_t *end;
     void *bindex;
 
-    if (row_count < 1) {
-        return EINVAL;
-    }
-
     if ((result=parse_header(lines, &record_count, &ctx->
                     last_version, error_info)) != 0)
     {
@@ -140,7 +136,9 @@ static int load(SFBinlogIndexContext *ctx)
     }
 
     row_count = split_string_ex(&context, '\n', lines, row_count, true);
-    result = parse(ctx, lines, row_count);
+    if (row_count > 0) {
+        result = parse(ctx, lines, row_count);
+    }
     free(lines);
     free(context.str);
     return result;
@@ -188,9 +186,11 @@ static int save(SFBinlogIndexContext *ctx, const char *filename)
     result = 0;
     p = buff;
     bend = buff + sizeof(buff);
-    p += sprintf(p, "%d %"PRId64"\n",
-            ctx->index_array.count,
-            ctx->last_version);
+
+    p += fc_itoa(ctx->index_array.count, p);
+    *p++ = ' ';
+    p += fc_itoa(ctx->last_version, p);
+    *p++ = '\n';
 
     index = ctx->index_array.indexes;
     for (i=0; i<ctx->index_array.count; i++) {
@@ -229,7 +229,7 @@ int sf_binlog_index_save(SFBinlogIndexContext *ctx)
     int result;
     char tmp_filename[PATH_MAX];
 
-    snprintf(tmp_filename, sizeof(tmp_filename), "%s.tmp", ctx->filename);
+    fc_combine_two_strings(ctx->filename, "tmp", '.', tmp_filename);
     if ((result=save(ctx, tmp_filename)) != 0) {
         return result;
     }

src/sf_binlog_writer.c

@@ -168,6 +168,7 @@ static int deal_binlog_records(SFBinlogWriterThread *thread,
         SFBinlogWriterBuffer *wb_head, uint32_t *last_timestamp)
 {
     int result;
+    bool skip_empty_file;
     SFBinlogWriterBuffer *wbuffer;
     SFBinlogWriterBuffer *current;
 
@@ -196,11 +197,15 @@ static int deal_binlog_records(SFBinlogWriterThread *thread,
                         thread->mblock, current);
                 break;
             case SF_BINLOG_BUFFER_TYPE_ROTATE_FILE:
-                if ((result=sf_file_writer_set_binlog_write_index(&current->
-                                writer->fw, current->writer->fw.binlog.
-                                last_index + 1)) != 0)
-                {
-                    return result;
+                flush_writer_files(thread);
+                skip_empty_file = current->version.first;
+                if (!(skip_empty_file && current->writer->fw.file.size == 0)) {
+                    if ((result=sf_file_writer_set_binlog_write_index(&current->
+                                    writer->fw, current->writer->fw.binlog.
+                                    last_index + 1)) != 0)
+                    {
+                        return result;
+                    }
                 }
                 fast_mblock_free_object(&current->writer->
                         thread->mblock, current);
@@ -300,7 +305,7 @@ void sf_binlog_writer_finish(SFBinlogWriterInfo *writer)
     uint32_t last_timestamp;
     int count;
 
-    if (writer->fw.file.name != NULL) {
+    if (writer->fw.file.name.str != NULL) {
         while (writer->thread->running && !fc_queue_empty(
                     &writer->thread->queue))
         {
@@ -328,8 +333,8 @@ void sf_binlog_writer_finish(SFBinlogWriterInfo *writer)
             deal_binlog_records(writer->thread, wb_head, &last_timestamp);
         }
 
-        free(writer->fw.file.name);
-        writer->fw.file.name = NULL;
+        free(writer->fw.file.name.str);
+        writer->fw.file.name.str = NULL;
     }
 
     if (writer->fw.file.fd >= 0) {
@@ -342,6 +347,7 @@ static void *binlog_writer_func(void *arg)
 {
     SFBinlogWriterThread *thread;
     SFBinlogWriterBuffer *wb_head;
+    uint32_t last_record_time;
     uint32_t current_timestamp;
     uint32_t last_timestamp;
     int result;
@@ -351,13 +357,12 @@ static void *binlog_writer_func(void *arg)
 #ifdef OS_LINUX
     {
         char thread_name[64];
-        snprintf(thread_name, sizeof(thread_name),
-                "%s-writer", thread->name);
+        fc_combine_two_strings(thread->name, "writer", '-', thread_name);
         prctl(PR_SET_NAME, thread_name);
     }
 #endif
 
-    current_timestamp = last_timestamp = 0;
+    last_record_time = current_timestamp = last_timestamp = 0;
     thread->running = true;
     while (SF_G_CONTINUE_FLAG) {
         wb_head = (SFBinlogWriterBuffer *)fc_queue_pop_all(&thread->queue);
@@ -366,7 +371,7 @@ static void *binlog_writer_func(void *arg)
         }
 
         if ((result=deal_binlog_records(thread, wb_head,
-                        &current_timestamp)) != 0)
+                        &last_record_time)) != 0)
         {
             if (result != ERRNO_THREAD_EXIT) {
                 logCrit("file: "__FILE__", line: %d, "
@@ -379,6 +384,8 @@ static void *binlog_writer_func(void *arg)
 
         if (fc_queue_empty(&thread->queue)) {
             current_timestamp = 0;
+        } else {
+            current_timestamp = last_record_time;
         }
         if ((current_timestamp == 0 && last_timestamp != 0) ||
                 (current_timestamp > last_timestamp))
@@ -393,6 +400,12 @@ static void *binlog_writer_func(void *arg)
             }
             PTHREAD_MUTEX_UNLOCK(&thread->flow_ctrol.lcp.lock);
         }
+
+        if (thread->write_interval_ms > 0 &&
+                last_record_time == g_current_time)
+        {
+            fc_sleep_ms(thread->write_interval_ms);
+        }
     }
 
     thread->running = false;
@@ -430,20 +443,23 @@ static void binlog_wbuffer_destroy_func(void *element, void *args)
 
 int sf_binlog_writer_init_normal_ex(SFBinlogWriterInfo *writer,
         const char *data_path, const char *subdir_name,
-        const char *file_prefix, const int buffer_size,
-        const int64_t file_rotate_size, const bool call_fsync)
+        const char *file_prefix, const int max_record_size,
+        const int buffer_size, const int64_t file_rotate_size,
+        const bool call_fsync)
 {
     memset(writer, 0, sizeof(*writer));
     writer->order_by = SF_BINLOG_WRITER_TYPE_ORDER_BY_NONE;
     return sf_file_writer_init(&writer->fw, data_path, subdir_name,
-            file_prefix, buffer_size, file_rotate_size, call_fsync);
+            file_prefix, max_record_size, buffer_size,
+            file_rotate_size, call_fsync);
 }
 
 int sf_binlog_writer_init_by_version_ex(SFBinlogWriterInfo *writer,
         const char *data_path, const char *subdir_name,
-        const char *file_prefix, const uint64_t next_version,
-        const int buffer_size, const int ring_size,
-        const int64_t file_rotate_size, const bool call_fsync)
+        const char *file_prefix, const int max_record_size,
+        const uint64_t next_version, const int buffer_size,
+        const int ring_size, const int64_t file_rotate_size,
+        const bool call_fsync)
 {
     int bytes;
 
@@ -462,13 +478,15 @@ int sf_binlog_writer_init_by_version_ex(SFBinlogWriterInfo *writer,
     binlog_writer_set_next_version(writer, next_version);
     writer->flush.in_queue = false;
     return sf_file_writer_init(&writer->fw, data_path, subdir_name,
-            file_prefix, buffer_size, file_rotate_size, call_fsync);
+            file_prefix, max_record_size, buffer_size,
+            file_rotate_size, call_fsync);
 }
 
 int sf_binlog_writer_init_thread_ex(SFBinlogWriterThread *thread,
         const char *name, SFBinlogWriterInfo *writer, const short order_mode,
-        const int max_delay, const int max_record_size, const bool
-        use_fixed_buffer_size, const bool passive_write)
+        const int write_interval_ms, const int max_delay,
+        const int max_record_size, const bool use_fixed_buffer_size,
+        const bool passive_write)
 {
     const int alloc_elements_once = 1024;
     const int64_t alloc_elements_limit = 0;
@@ -478,10 +496,11 @@ int sf_binlog_writer_init_thread_ex(SFBinlogWriterThread *thread,
     pthread_t tid;
     struct fast_mblock_object_callbacks callbacks;
 
-    snprintf(thread->name, sizeof(thread->name), "%s", name);
+    fc_safe_strcpy(thread->name, name);
     thread->order_mode = order_mode;
     thread->use_fixed_buffer_size = use_fixed_buffer_size;
     thread->passive_write = passive_write;
+    thread->write_interval_ms = write_interval_ms;
     thread->flow_ctrol.max_delay = max_delay;
     writer->fw.cfg.max_record_size = max_record_size;
     writer->thread = thread;
@@ -608,10 +627,12 @@ int sf_binlog_writer_change_write_index(SFBinlogWriterInfo *writer,
             SF_BINLOG_BUFFER_TYPE_SET_WRITE_INDEX, write_index);
 }
 
-int sf_binlog_writer_rotate_file(SFBinlogWriterInfo *writer)
+int sf_binlog_writer_rotate_file_ex(SFBinlogWriterInfo *writer,
+        const bool skip_empty_file)
 {
     return sf_binlog_writer_push_directive(writer,
-            SF_BINLOG_BUFFER_TYPE_ROTATE_FILE, 0);
+            SF_BINLOG_BUFFER_TYPE_ROTATE_FILE,
+            skip_empty_file ? 1 : 0);
 }
 
 int sf_binlog_writer_flush_file(SFBinlogWriterInfo *writer)
@@ -629,24 +650,28 @@ int sf_binlog_writer_notify_exit(SFBinlogWriterInfo *writer)
 void sf_push_to_binlog_write_queue(SFBinlogWriterInfo *writer,
         SFBinlogWriterBuffer *buffer)
 {
+    time_t current_time;
     int64_t last_timestamp;
 
+    current_time = g_current_time;
     last_timestamp = FC_ATOMIC_GET(writer->thread->flow_ctrol.last_timestamp);
-    if (last_timestamp > 0 && g_current_time - last_timestamp >
-            writer->thread->flow_ctrol.max_delay)
+    if ((last_timestamp > 0 && current_time - last_timestamp > writer->
+                thread->flow_ctrol.max_delay) && !(writer->order_by ==
+                    SF_BINLOG_WRITER_TYPE_ORDER_BY_VERSION && buffer->
+                    version.first - writer->version_ctx.next < 128))
     {
-        time_t start_time;
         time_t last_log_timestamp;
         int time_used;
         int log_level;
 
-        start_time = g_current_time;
         PTHREAD_MUTEX_LOCK(&writer->thread->flow_ctrol.lcp.lock);
         writer->thread->flow_ctrol.waiting_count++;
         last_timestamp = FC_ATOMIC_GET(writer->thread->
                 flow_ctrol.last_timestamp);
-        while (last_timestamp > 0 && g_current_time - last_timestamp >
-                writer->thread->flow_ctrol.max_delay)
+        while ((last_timestamp > 0 && current_time - last_timestamp > writer->
+                    thread->flow_ctrol.max_delay) && !(writer->order_by ==
+                        SF_BINLOG_WRITER_TYPE_ORDER_BY_VERSION && buffer->
+                        version.first - writer->version_ctx.next < 128))
         {
             pthread_cond_wait(&writer->thread->flow_ctrol.lcp.cond,
                     &writer->thread->flow_ctrol.lcp.lock);
@@ -656,7 +681,7 @@ void sf_push_to_binlog_write_queue(SFBinlogWriterInfo *writer,
         writer->thread->flow_ctrol.waiting_count--;
         PTHREAD_MUTEX_UNLOCK(&writer->thread->flow_ctrol.lcp.lock);
 
-        time_used = g_current_time - start_time;
+        time_used = g_current_time - current_time;
         if (time_used > 0) {
             last_log_timestamp = FC_ATOMIC_GET(
                     LAST_BINLOG_WRITER_LOG_TIMESTAMP);

src/sf_binlog_writer.h

@@ -72,6 +72,7 @@ typedef struct binlog_writer_thread {
     bool use_fixed_buffer_size;
     bool passive_write;
     char order_mode;
+    int write_interval_ms;
     struct {
         int max_delay;  //in seconds
         volatile uint32_t last_timestamp;
@@ -89,7 +90,7 @@ typedef struct sf_binlog_writer_info {
 
     struct {
         SFBinlogWriterBufferRing ring;
-        int64_t next;
+        volatile int64_t next;
         int64_t change_count;  //version change count
     } version_ctx;
     SFBinlogWriterThread *thread;
@@ -112,61 +113,64 @@ extern "C" {
 
 int sf_binlog_writer_init_normal_ex(SFBinlogWriterInfo *writer,
         const char *data_path, const char *subdir_name,
-        const char *file_prefix, const int buffer_size,
-        const int64_t file_rotate_size, const bool call_fsync);
+        const char *file_prefix, const int max_record_size,
+        const int buffer_size, const int64_t file_rotate_size,
+        const bool call_fsync);
 
 int sf_binlog_writer_init_by_version_ex(SFBinlogWriterInfo *writer,
         const char *data_path, const char *subdir_name,
-        const char *file_prefix, const uint64_t next_version,
-        const int buffer_size, const int ring_size,
-        const int64_t file_rotate_size, const bool call_fsync);
+        const char *file_prefix, const int max_record_size,
+        const uint64_t next_version, const int buffer_size,
+        const int ring_size, const int64_t file_rotate_size,
+        const bool call_fsync);
 
 int sf_binlog_writer_init_thread_ex(SFBinlogWriterThread *thread,
         const char *name, SFBinlogWriterInfo *writer, const short order_mode,
-        const int max_delay, const int max_record_size, const bool
-        use_fixed_buffer_size, const bool passive_write);
+        const int write_interval_ms, const int max_delay,
+        const int max_record_size, const bool use_fixed_buffer_size,
+        const bool passive_write);
 
-#define sf_binlog_writer_init_normal(writer,  \
-        data_path, subdir_name, buffer_size)  \
-    sf_binlog_writer_init_normal_ex(writer, data_path, subdir_name, \
-            SF_BINLOG_FILE_PREFIX, buffer_size, \
+#define sf_binlog_writer_init_normal(writer, data_path, \
+        subdir_name, max_record_size, buffer_size)      \
+    sf_binlog_writer_init_normal_ex(writer, data_path, subdir_name,  \
+            SF_BINLOG_FILE_PREFIX_STR, max_record_size, buffer_size, \
             SF_BINLOG_DEFAULT_ROTATE_SIZE, true)
 
-#define sf_binlog_writer_init_by_version(writer, data_path,   \
-        subdir_name, next_version, buffer_size, ring_size)    \
-    sf_binlog_writer_init_by_version_ex(writer, data_path, subdir_name, \
-            SF_BINLOG_FILE_PREFIX, next_version, buffer_size, \
-            ring_size, SF_BINLOG_DEFAULT_ROTATE_SIZE, true)
+#define sf_binlog_writer_init_by_version(writer, data_path, subdir_name, \
+        max_record_size, next_version, buffer_size, ring_size)           \
+    sf_binlog_writer_init_by_version_ex(writer, data_path, subdir_name,  \
+            SF_BINLOG_FILE_PREFIX_STR, max_record_size, next_version,    \
+            buffer_size, ring_size, SF_BINLOG_DEFAULT_ROTATE_SIZE, true)
 
 #define sf_binlog_writer_init_thread(thread, name, \
-        writer, max_delay, max_record_size) \
-    sf_binlog_writer_init_thread_ex(thread, name, writer, \
-            SF_BINLOG_THREAD_ORDER_MODE_FIXED, max_delay, \
-            max_record_size, true, false)
+        writer, write_interval_ms, max_delay, max_record_size)    \
+    sf_binlog_writer_init_thread_ex(thread, name, writer,         \
+            SF_BINLOG_THREAD_ORDER_MODE_FIXED, write_interval_ms, \
+            max_delay, max_record_size, true, false)
 
 static inline int sf_binlog_writer_init_ex(SFBinlogWriterContext *context,
         const char *data_path, const char *subdir_name,
         const char *file_prefix, const int buffer_size,
-        const int max_delay, const int max_record_size,
-        const bool call_fsync)
+        const int write_interval_ms, const int max_delay,
+        const int max_record_size, const bool call_fsync)
 {
     int result;
-    if ((result=sf_binlog_writer_init_normal_ex(&context->writer,
-                    data_path, subdir_name, file_prefix, buffer_size,
+    if ((result=sf_binlog_writer_init_normal_ex(&context->writer, data_path,
+                    subdir_name, file_prefix, max_record_size, buffer_size,
                     SF_BINLOG_DEFAULT_ROTATE_SIZE, call_fsync)) != 0)
     {
         return result;
     }
 
     return sf_binlog_writer_init_thread(&context->thread, subdir_name,
-            &context->writer, max_delay, max_record_size);
+            &context->writer, write_interval_ms, max_delay, max_record_size);
 }
 
-#define sf_binlog_writer_init(context, data_path, subdir_name, \
-        buffer_size, max_delay, max_record_size) \
-    sf_binlog_writer_init_ex(context, data_path, subdir_name,  \
-            SF_BINLOG_FILE_PREFIX, buffer_size, max_delay,     \
-            max_record_size, true)
+#define sf_binlog_writer_init(context, data_path, subdir_name,      \
+        buffer_size, write_interval_ms, max_delay, max_record_size) \
+    sf_binlog_writer_init_ex(context, data_path, subdir_name,       \
+            SF_BINLOG_FILE_PREFIX_STR, buffer_size, write_interval_ms,  \
+            max_delay, max_record_size, true)
 
 void sf_binlog_writer_finish(SFBinlogWriterInfo *writer);
 
@@ -213,7 +217,32 @@ static inline int64_t sf_binlog_writer_get_next_version(
     return writer->version_ctx.next;
 }
 
-int sf_binlog_writer_rotate_file(SFBinlogWriterInfo *writer);
+static inline int sf_binlog_writer_get_waiting_count(
+        SFBinlogWriterInfo *writer)
+{
+    return writer->version_ctx.ring.waiting_count;
+}
+
+static inline int sf_binlog_writer_get_thread_waiting_count(
+        SFBinlogWriterThread *thread)
+{
+    int waiting_count;
+
+    PTHREAD_MUTEX_LOCK(&thread->flow_ctrol.lcp.lock);
+    waiting_count = thread->flow_ctrol.waiting_count;
+    PTHREAD_MUTEX_UNLOCK(&thread->flow_ctrol.lcp.lock);
+
+    return waiting_count;
+}
+
+int sf_binlog_writer_rotate_file_ex(SFBinlogWriterInfo *writer,
+        const bool skip_empty_file);
+
+static inline int sf_binlog_writer_rotate_file(SFBinlogWriterInfo *writer)
+{
+    const bool skip_empty_file = false;
+    return sf_binlog_writer_rotate_file_ex(writer, skip_empty_file);
+}
 
 int sf_binlog_writer_flush_file(SFBinlogWriterInfo *writer);
 
@@ -225,6 +254,9 @@ int sf_binlog_writer_notify_exit(SFBinlogWriterInfo *writer);
 #define sf_binlog_writer_set_flags(writer, flags) \
     sf_file_writer_set_flags(&(writer)->fw, flags)
 
+#define sf_binlog_writer_set_write_done_callback(writer, callback, args) \
+    sf_file_writer_set_write_done_callback(&(writer)->fw, callback, args)
+
 #define sf_binlog_writer_get_last_version_ex(writer, log_level) \
     sf_file_writer_get_last_version_ex(&(writer)->fw, log_level)
 
@@ -254,7 +286,9 @@ static inline SFBinlogWriterBuffer *sf_binlog_writer_alloc_buffer(
 {
     SFBinlogWriterBuffer *buffer;
 
-    if ((buffer=fast_mblock_alloc_object(&thread->mblock)) != NULL) {
+    if ((buffer=(SFBinlogWriterBuffer *)fast_mblock_alloc_object(
+                    &thread->mblock)) != NULL)
+    {
         buffer->type = SF_BINLOG_BUFFER_TYPE_WRITE_TO_FILE;
     }
     return buffer;

src/sf_buffered_writer.h

@@ -30,8 +30,11 @@ typedef struct {
 #define sf_buffered_writer_init(writer, filename) \
     sf_buffered_writer_init_ex(writer, filename, 1024 * 1024)
 
-#define SF_BUFFERED_WRITER_LENGTH(bw) ((bw).buffer.current - (bw).buffer.buff)
-#define SF_BUFFERED_WRITER_REMAIN(bw) ((bw).buffer.end - (bw).buffer.current)
+#define SF_BUFFERED_WRITER_LENGTH(bw)  \
+    SF_BINLOG_BUFFER_PRODUCER_DATA_LENGTH((bw).buffer)
+
+#define SF_BUFFERED_WRITER_REMAIN(bw)  \
+    SF_BINLOG_BUFFER_PRODUCER_BUFF_REMAIN((bw).buffer)
 
 #ifdef __cplusplus
 extern "C" {
@@ -56,7 +59,6 @@ extern "C" {
         if ((result=sf_binlog_buffer_init(&writer->buffer, buffer_size)) != 0) {
             return result;
         }
-        writer->buffer.end = writer->buffer.buff + writer->buffer.size;
         return 0;
     }
 
@@ -65,7 +67,7 @@ extern "C" {
         int result;
         int length;
 
-        length = writer->buffer.current - writer->buffer.buff;
+        length = writer->buffer.data_end - writer->buffer.buff;
         if (fc_safe_write(writer->fd, writer->buffer.buff, length) != length) {
             result = errno != 0 ? errno : EIO;
             logError("file: "__FILE__", line: %d, "
@@ -74,17 +76,27 @@ extern "C" {
             return result;
         }
 
-        writer->buffer.current = writer->buffer.buff;
+        writer->buffer.data_end = writer->buffer.buff;
         return 0;
     }
 
-    static inline void sf_buffered_writer_destroy(SFBufferedWriter *writer)
+    static inline int sf_buffered_writer_destroy(SFBufferedWriter *writer)
     {
+        int result;
+
         if (writer->fd >= 0) {
+            if (fsync(writer->fd) != 0) {
+                result = errno != 0 ? errno : EIO;
+                logError("file: "__FILE__", line: %d, "
+                        "fsync to file %s fail, errno: %d, error info: %s",
+                        __LINE__, writer->filename, result, STRERROR(result));
+                return result;
+            }
             close(writer->fd);
             writer->fd = -1;
         }
         sf_binlog_buffer_destroy(&writer->buffer);
+        return 0;
     }
 
 #ifdef __cplusplus

src/sf_cluster_cfg.c

@@ -23,7 +23,7 @@ static int calc_cluster_config_sign(SFClusterConfig *cluster)
     FastBuffer buffer;
     int result;
 
-    if ((result=fast_buffer_init_ex(&buffer, 1024)) != 0) {
+    if ((result=fast_buffer_init1(&buffer, 1024)) != 0) {
         return result;
     }
     fc_server_to_config_string(&cluster->server_cfg, &buffer);

src/sf_connection_manager.c

@@ -35,14 +35,14 @@ static int get_group_servers(SFConnectionManager *cm,
         SFCMConnGroupEntry *group);
 
 static ConnectionInfo *get_spec_connection(SFConnectionManager *cm,
-        const ConnectionInfo *target, int *err_no)
+        const ConnectionInfo *target, const bool shared, int *err_no)
 {
     return conn_pool_get_connection_ex(&cm->cpool,
-            target, cm->module_name, err_no);
+            target, cm->module_name, shared, err_no);
 }
 
 static ConnectionInfo *make_connection(SFConnectionManager *cm,
-        FCAddressPtrArray *addr_array, int *err_no)
+        FCAddressPtrArray *addr_array, const bool shared, int *err_no)
 {
     FCAddressInfo **current;
     FCAddressInfo **addr;
@@ -56,7 +56,7 @@ static ConnectionInfo *make_connection(SFConnectionManager *cm,
 
     current = addr_array->addrs + addr_array->index;
     if ((conn=get_spec_connection(cm, &(*current)->conn,
-                    err_no)) != NULL)
+                    shared, err_no)) != NULL)
     {
         return conn;
     }
@@ -72,7 +72,7 @@ static ConnectionInfo *make_connection(SFConnectionManager *cm,
         }
 
         if ((conn=get_spec_connection(cm, &(*addr)->conn,
-                        err_no)) != NULL)
+                        shared, err_no)) != NULL)
         {
             addr_array->index = addr - addr_array->addrs;
             return conn;
@@ -83,13 +83,13 @@ static ConnectionInfo *make_connection(SFConnectionManager *cm,
 }
 
 static ConnectionInfo *get_server_connection(SFConnectionManager *cm,
-        FCServerInfo *server, int *err_no)
+        FCServerInfo *server, const bool shared, int *err_no)
 {
     FCAddressPtrArray *addr_array;
     ConnectionInfo *conn;
 
     addr_array = &server->group_addrs[cm->server_group_index].address_array;
-    if ((conn=make_connection(cm, addr_array, err_no)) == NULL) {
+    if ((conn=make_connection(cm, addr_array, shared, err_no)) == NULL) {
         logError("file: "__FILE__", line: %d, "
                 "%s server id: %d, address count: %d, get_server_connection fail",
                 __LINE__, cm->module_name, server->id, addr_array->count);
@@ -98,7 +98,7 @@ static ConnectionInfo *get_server_connection(SFConnectionManager *cm,
 }
 
 static ConnectionInfo *get_connection(SFConnectionManager *cm,
-        const int group_index, int *err_no)
+        const int group_index, const bool shared, int *err_no)
 {
     SFCMServerArray *server_array;
     ConnectionInfo *conn;
@@ -110,7 +110,7 @@ static ConnectionInfo *get_connection(SFConnectionManager *cm,
     server_hash_code = rand();
     server_index = server_hash_code % server_array->count;
     if ((conn=make_connection(cm, server_array->servers[server_index].
-                    addr_array, err_no)) != NULL)
+                    addr_array, shared, err_no)) != NULL)
     {
         return conn;
     }
@@ -122,7 +122,7 @@ static ConnectionInfo *get_connection(SFConnectionManager *cm,
             }
 
             if ((conn=make_connection(cm, server_array->servers[i].
-                            addr_array, err_no)) != NULL)
+                            addr_array, shared, err_no)) != NULL)
             {
                 return conn;
             }
@@ -176,7 +176,7 @@ static inline bool alive_array_cas(SFConnectionManager *cm,
         push_to_detect_queue(cm, group, new_alives);
         fast_mblock_delay_free_object(&cm->sptr_array_allocator, old_alives,
                 (cm->common_cfg->connect_timeout + cm->common_cfg->
-                 network_timeout) * group->all.count);
+                 network_timeout) * group->all.count * 4);
         return true;
     } else {
         fast_mblock_free_object(&cm->sptr_array_allocator, new_alives);
@@ -225,7 +225,7 @@ static int remove_from_alives(SFConnectionManager *cm,
 }
 
 static inline ConnectionInfo *make_master_connection(SFConnectionManager *cm,
-        SFCMConnGroupEntry *group, int *err_no)
+        SFCMConnGroupEntry *group, const bool shared, int *err_no)
 {
     SFCMServerEntry *master;
     ConnectionInfo *conn;
@@ -234,7 +234,7 @@ static inline ConnectionInfo *make_master_connection(SFConnectionManager *cm,
     master = (SFCMServerEntry *)FC_ATOMIC_GET(group->master);
     if (master != NULL) {
         if ((conn=make_connection(cm, master->addr_array,
-                        err_no)) != NULL)
+                        shared, err_no)) != NULL)
         {
             alives = (SFCMServerPtrArray *)FC_ATOMIC_GET(group->alives);
             set_connection_params(conn, master, alives);
@@ -254,12 +254,12 @@ static inline ConnectionInfo *make_master_connection(SFConnectionManager *cm,
 
 static inline ConnectionInfo *make_readable_connection(SFConnectionManager *cm,
         SFCMConnGroupEntry *group, SFCMServerPtrArray *alives,
-        const int index, int *err_no)
+        const int index, const bool shared, int *err_no)
 {
     ConnectionInfo *conn;
 
     if ((conn=make_connection(cm, alives->servers[index]->
-                    addr_array, err_no)) == NULL)
+                    addr_array, shared, err_no)) == NULL)
     {
         remove_from_alives(cm, group, alives, alives->servers[index]);
     } else {
@@ -270,7 +270,7 @@ static inline ConnectionInfo *make_readable_connection(SFConnectionManager *cm,
 }
 
 static ConnectionInfo *get_master_connection(SFConnectionManager *cm,
-        const int group_index, int *err_no)
+        const int group_index, const bool shared, int *err_no)
 {
     SFCMConnGroupEntry *group;
     ConnectionInfo *conn;
@@ -283,7 +283,7 @@ static ConnectionInfo *get_master_connection(SFConnectionManager *cm,
             &cm->common_cfg->net_retry_cfg.connect);
     retry_count = 0;
     while (1) {
-        if ((conn=make_master_connection(cm, group, err_no)) != NULL) {
+        if ((conn=make_master_connection(cm, group, shared, err_no)) != NULL) {
             return conn;
         }
 
@@ -313,7 +313,7 @@ static ConnectionInfo *get_master_connection(SFConnectionManager *cm,
 }
 
 static ConnectionInfo *get_readable_connection(SFConnectionManager *cm,
-        const int group_index, int *err_no)
+        const int group_index, const bool shared, int *err_no)
 {
     SFCMConnGroupEntry *group;
     SFCMServerPtrArray *alives;
@@ -326,7 +326,7 @@ static ConnectionInfo *get_readable_connection(SFConnectionManager *cm,
     if ((cm->common_cfg->read_rule == sf_data_read_rule_master_only) ||
             (group->all.count == 1))
     {
-        return get_master_connection(cm, group_index, err_no);
+        return get_master_connection(cm, group_index, shared, err_no);
     }
 
     sf_init_net_retry_interval_context(&net_retry_ctx,
@@ -338,14 +338,14 @@ static ConnectionInfo *get_readable_connection(SFConnectionManager *cm,
         if (alives->count > 0) {
             index = rand() % alives->count;
             if ((conn=make_readable_connection(cm, group, alives,
-                            index, err_no)) != NULL)
+                            index, shared, err_no)) != NULL)
             {
                 return conn;
             }
         }
 
         if (cm->common_cfg->read_rule == sf_data_read_rule_slave_first) {
-            if ((conn=make_master_connection(cm, group, err_no)) != NULL) {
+            if ((conn=make_master_connection(cm, group, shared, err_no)) != NULL) {
                 return conn;
             }
         }
@@ -400,11 +400,12 @@ static void close_connection(SFConnectionManager *cm, ConnectionInfo *conn)
 }
 
 static ConnectionInfo *get_leader_connection(SFConnectionManager *cm,
-        FCServerInfo *server, int *err_no)
+        FCServerInfo *server, const bool shared, int *err_no)
 {
     ConnectionInfo *conn;
     SFClientServerEntry leader;
     SFNetRetryIntervalContext net_retry_ctx;
+    char formatted_ip[FORMATTED_IP_SIZE];
     int i;
     int connect_fails;
 
@@ -415,7 +416,7 @@ static ConnectionInfo *get_leader_connection(SFConnectionManager *cm,
     while (1) {
         do {
             if ((conn=get_server_connection(cm, server,
-                            err_no)) == NULL)
+                            shared, err_no)) == NULL)
             {
                 connect_fails++;
                 break;
@@ -432,8 +433,9 @@ static ConnectionInfo *get_leader_connection(SFConnectionManager *cm,
                 return conn;
             }
             release_connection(cm, conn);
+
             if ((conn=get_spec_connection(cm, &leader.conn,
-                            err_no)) == NULL)
+                            shared, err_no)) == NULL)
             {
                 if (cm->server_cfg != NULL) {
                     FCServerInfo *ls;
@@ -444,7 +446,7 @@ static ConnectionInfo *get_leader_connection(SFConnectionManager *cm,
                                 address_array.count > 1)
                         {
                             if ((conn=get_server_connection(cm, ls,
-                                            err_no)) != NULL)
+                                            shared, err_no)) != NULL)
                             {
                                 return conn;
                             }
@@ -467,10 +469,11 @@ static ConnectionInfo *get_leader_connection(SFConnectionManager *cm,
                 connect.times, ++i, *err_no);
     }
 
+    format_ip_address(server->group_addrs[cm->server_group_index].
+            address_array.addrs[0]->conn.ip_addr, formatted_ip);
     logWarning("file: "__FILE__", line: %d, "
             "%s get_leader_connection fail, server id: %d, %s:%u, errno: %d",
-            __LINE__, cm->module_name, server->id, server->group_addrs
-            [cm->server_group_index].  address_array.addrs[0]->conn.ip_addr,
+            __LINE__, cm->module_name, server->id, formatted_ip,
             server->group_addrs[cm->server_group_index].address_array.
             addrs[0]->conn.port, *err_no);
     return NULL;
@@ -521,19 +524,49 @@ int sf_connection_manager_init_ex(SFConnectionManager *cm,
         connect_done_callback, void *args, FCServerConfig *server_cfg,
         const bool bg_thread_enabled)
 {
-    const int socket_domain = AF_INET;
-    int htable_init_capacity;
+    struct {
+        ConnectionExtraParams holder;
+        ConnectionExtraParams *ptr;
+    } extra_params;
+    FCServerGroupInfo *server_group;
+
+    int htable_capacity;
     int result;
 
-    htable_init_capacity = 4 * server_count;
-    if (htable_init_capacity < 256) {
-        htable_init_capacity = 256;
+    if (server_count <= 4) {
+        htable_capacity = 16;
+    } else if (server_count <= 16) {
+        htable_capacity = 64;
+    } else if (server_count <= 32) {
+        htable_capacity = 128;
+    } else if (server_count < 64) {
+        htable_capacity = 256;
+    } else {
+        htable_capacity = 4 * server_count;
+    }
+
+    if ((server_group=fc_server_get_group_by_index(server_cfg,
+                    server_group_index)) == NULL)
+    {
+        return ENOENT;
+    }
+
+    if (server_group->comm_type == fc_comm_type_sock) {
+        extra_params.ptr = NULL;
+    } else {
+        if ((result=conn_pool_set_rdma_extra_params(&extra_params.holder,
+                        server_cfg, server_group_index)) != 0)
+        {
+            return result;
+        }
+        extra_params.ptr = &extra_params.holder;
     }
     if ((result=conn_pool_init_ex1(&cm->cpool, common_cfg->connect_timeout,
-                    max_count_per_entry, max_idle_time, socket_domain,
-                    htable_init_capacity, connect_done_callback, args,
+                    max_count_per_entry, max_idle_time, htable_capacity,
+                    connect_done_callback, args,
                     sf_cm_validate_connection_callback, cm,
-                    sizeof(SFConnectionParameters))) != 0)
+                    sizeof(SFConnectionParameters),
+                    extra_params.ptr)) != 0)
     {
         return result;
     }
@@ -745,6 +778,7 @@ static int do_get_group_servers(SFConnectionManager *cm,
 static int get_group_servers_by_active(SFConnectionManager *cm,
         SFCMConnGroupEntry *group)
 {
+    const bool shared = true;
     SFCMServerPtrArray *alives;
     SFCMServerEntry **server;
     SFCMServerEntry **end;
@@ -760,7 +794,7 @@ static int get_group_servers_by_active(SFConnectionManager *cm,
     end = alives->servers + alives->count;
     for (server=alives->servers; server<end; server++) {
         if ((conn=make_connection(cm, (*server)->addr_array,
-                        &result)) == NULL)
+                        shared, &result)) == NULL)
         {
             continue;
         }
@@ -778,6 +812,7 @@ static int get_group_servers_by_active(SFConnectionManager *cm,
 static int get_group_servers_by_all(SFConnectionManager *cm,
         SFCMConnGroupEntry *group)
 {
+    const bool shared = true;
     SFCMServerEntry *server;
     SFCMServerEntry *end;
     ConnectionInfo *conn;
@@ -795,7 +830,7 @@ static int get_group_servers_by_all(SFConnectionManager *cm,
         }
 
         if ((conn=make_connection(cm, server->addr_array,
-                        &result)) == NULL)
+                        shared, &result)) == NULL)
         {
             continue;
         }

src/sf_connection_manager.h

@@ -26,16 +26,17 @@
 struct sf_connection_manager;
 
 typedef ConnectionInfo *(*sf_get_connection_func)(
-        struct sf_connection_manager *cm,
-        const int group_index, int *err_no);
+        struct sf_connection_manager *cm, const int group_index,
+        const bool shared, int *err_no);
 
 typedef ConnectionInfo *(*sf_get_server_connection_func)(
         struct sf_connection_manager *cm,
-        FCServerInfo *server, int *err_no);
+        FCServerInfo *server, const bool shared, int *err_no);
 
 typedef ConnectionInfo *(*sf_get_spec_connection_func)(
         struct sf_connection_manager *cm,
-        const ConnectionInfo *target, int *err_no);
+        const ConnectionInfo *target,
+        const bool shared, int *err_no);
 
 typedef void (*sf_release_connection_func)(
         struct sf_connection_manager *cm, ConnectionInfo *conn);

src/sf_define.h

@@ -20,8 +20,8 @@
 
 #include "fastcommon/sockopt.h"
 
-#define SF_DEFAULT_CONNECT_TIMEOUT    2
-#define SF_DEFAULT_NETWORK_TIMEOUT   10
+#define SF_DEFAULT_CONNECT_TIMEOUT   10
+#define SF_DEFAULT_NETWORK_TIMEOUT   60
 
 #define SF_DEF_THREAD_STACK_SIZE  (256 * 1024)
 #define SF_MIN_THREAD_STACK_SIZE  (64 * 1024)
@@ -96,6 +96,8 @@
 #define SF_BINLOG_SOURCE_USER        'U'  //by user call
 #define SF_BINLOG_SOURCE_REPLAY      'R'  //by binlog replay
 
+#define SF_LOG_SCHEDULE_ENTRIES_COUNT 3
+
 #ifdef __cplusplus
 extern "C" {
 #endif

src/sf_file_writer.c

@@ -34,49 +34,108 @@
 #include "sf_func.h"
 #include "sf_file_writer.h"
 
-#define BINLOG_INDEX_ITEM_START_INDEX       "start_index"
-#define BINLOG_INDEX_ITEM_CURRENT_WRITE     "current_write"
-#define BINLOG_INDEX_ITEM_CURRENT_COMPRESS  "current_compress"
+#define BINLOG_INDEX_ITEM_START_INDEX_STR       "start_index"
+#define BINLOG_INDEX_ITEM_START_INDEX_LEN      \
+    (sizeof(BINLOG_INDEX_ITEM_START_INDEX_STR) - 1)
 
-#define GET_BINLOG_FILENAME(writer) \
-    sprintf(writer->file.name, "%s/%s/%s"SF_BINLOG_FILE_EXT_FMT, \
-            writer->cfg.data_path, writer->cfg.subdir_name, \
-            writer->cfg.file_prefix, writer->binlog.last_index)
+#define BINLOG_INDEX_ITEM_CURRENT_WRITE_STR     "current_write"
+#define BINLOG_INDEX_ITEM_CURRENT_WRITE_LEN      \
+    (sizeof(BINLOG_INDEX_ITEM_CURRENT_WRITE_STR) - 1)
 
-#define GET_BINLOG_INDEX_FILENAME_EX(data_path,    \
-        subdir_name, file_prefix, filename, size)  \
-    snprintf(filename, size, "%s/%s/%s_index.dat", \
-            data_path, subdir_name, file_prefix)
+#define BINLOG_INDEX_ITEM_CURRENT_COMPRESS_STR  "current_compress"
+#define BINLOG_INDEX_ITEM_CURRENT_COMPRESS_LEN      \
+    (sizeof(BINLOG_INDEX_ITEM_CURRENT_COMPRESS_STR) - 1)
 
-#define GET_BINLOG_INDEX_FILENAME(writer, filename, size) \
-    GET_BINLOG_INDEX_FILENAME_EX(writer->cfg.data_path,   \
-            writer->cfg.subdir_name, writer->cfg.file_prefix, filename, size)
+static inline void sf_file_writer_get_binlog_filename(SFFileWriterInfo *writer)
+{
+    sf_file_writer_get_filename_ex(
+            writer->cfg.data_path, writer->cfg.subdir_name,
+            writer->cfg.file_prefix, writer->binlog.last_index,
+            writer->file.name.str, writer->file.name.size);
+}
+
+static inline void sf_file_writer_get_index_filename_ex(
+        const char *data_path, const char *subdir_name,
+        const char *file_prefix, const int file_prefix_len,
+        char *filename, const int size)
+{
+#define INDEX_FILENAME_AFFIX_STR "_index.dat"
+#define INDEX_FILENAME_AFFIX_LEN (sizeof(INDEX_FILENAME_AFFIX_STR) - 1)
+
+    char *p;
+    int data_path_len;
+    int subdir_name_len;
+
+    data_path_len = strlen(data_path);
+    subdir_name_len = strlen(subdir_name);
+    if (data_path_len + 1 + subdir_name_len + 1 + file_prefix_len +
+            INDEX_FILENAME_AFFIX_LEN >= size)
+    {
+        *filename = '\0';
+        return;
+    }
+
+    memcpy(filename, data_path, data_path_len);
+    p = filename + data_path_len;
+    *p++ = '/';
+
+    memcpy(p, subdir_name, subdir_name_len);
+    p += subdir_name_len;
+    *p++ = '/';
+
+    memcpy(p, file_prefix, file_prefix_len);
+    p += file_prefix_len;
+
+    memcpy(p, INDEX_FILENAME_AFFIX_STR, INDEX_FILENAME_AFFIX_LEN);
+    p += INDEX_FILENAME_AFFIX_LEN;
+    *p = '\0';
+}
 
 const char *sf_file_writer_get_index_filename(const char *data_path,
         const char *subdir_name, char *filename, const int size)
 {
-    GET_BINLOG_INDEX_FILENAME_EX(data_path, subdir_name,
-            SF_BINLOG_FILE_PREFIX, filename, size);
+    sf_file_writer_get_index_filename_ex(data_path, subdir_name,
+            SF_BINLOG_FILE_PREFIX_STR, SF_BINLOG_FILE_PREFIX_LEN,
+            filename, size);
     return filename;
 }
 
-static int write_to_binlog_index_file(SFFileWriterInfo *writer)
+int sf_file_writer_write_to_binlog_index_file_ex(const char *data_path,
+        const char *subdir_name, const char *file_prefix,
+        const int start_index, const int last_index,
+        const int compress_index)
 {
     char filename[PATH_MAX];
     char buff[256];
+    char *p;
     int result;
     int len;
 
-    GET_BINLOG_INDEX_FILENAME(writer, filename, sizeof(filename));
-    len = sprintf(buff, "%s=%d\n"
-            "%s=%d\n"
-            "%s=%d\n",
-            BINLOG_INDEX_ITEM_START_INDEX,
-            writer->binlog.start_index,
-            BINLOG_INDEX_ITEM_CURRENT_WRITE,
-            writer->binlog.last_index,
-            BINLOG_INDEX_ITEM_CURRENT_COMPRESS,
-            writer->binlog.compress_index);
+    sf_file_writer_get_index_filename_ex(data_path, subdir_name, file_prefix,
+            strlen(file_prefix), filename, sizeof(filename));
+    p = buff;
+    memcpy(p, BINLOG_INDEX_ITEM_START_INDEX_STR,
+            BINLOG_INDEX_ITEM_START_INDEX_LEN);
+    p += BINLOG_INDEX_ITEM_START_INDEX_LEN;
+    *p++ = '=';
+    p += fc_itoa(start_index, p);
+    *p++ = '\n';
+
+    memcpy(p, BINLOG_INDEX_ITEM_CURRENT_WRITE_STR,
+            BINLOG_INDEX_ITEM_CURRENT_WRITE_LEN);
+    p += BINLOG_INDEX_ITEM_CURRENT_WRITE_LEN;
+    *p++ = '=';
+    p += fc_itoa(last_index, p);
+    *p++ = '\n';
+
+    memcpy(p, BINLOG_INDEX_ITEM_CURRENT_COMPRESS_STR,
+            BINLOG_INDEX_ITEM_CURRENT_COMPRESS_LEN);
+    p += BINLOG_INDEX_ITEM_CURRENT_COMPRESS_LEN;
+    *p++ = '=';
+    p += fc_itoa(compress_index, p);
+    *p++ = '\n';
+
+    len = p - buff;
     if ((result=safeWriteToFile(filename, buff, len)) != 0) {
         logError("file: "__FILE__", line: %d, "
                 "write to file \"%s\" fail, errno: %d, error info: %s",
@@ -86,6 +145,14 @@ static int write_to_binlog_index_file(SFFileWriterInfo *writer)
     return result;
 }
 
+static inline int write_to_binlog_index_file(SFFileWriterInfo *writer)
+{
+    return sf_file_writer_write_to_binlog_index_file_ex(
+            writer->cfg.data_path, writer->cfg.subdir_name,
+            writer->cfg.file_prefix, writer->binlog.start_index,
+            writer->binlog.last_index, writer->binlog.compress_index);
+}
+
 static int get_binlog_info_from_file(const char *data_path,
         const char *subdir_name, int *start_index,
         int *last_index, int *compress_index)
@@ -94,8 +161,8 @@ static int get_binlog_info_from_file(const char *data_path,
     IniContext ini_context;
     int result;
 
-    GET_BINLOG_INDEX_FILENAME_EX(data_path,
-            subdir_name, SF_BINLOG_FILE_PREFIX,
+    sf_file_writer_get_index_filename_ex(data_path, subdir_name,
+            SF_BINLOG_FILE_PREFIX_STR, SF_BINLOG_FILE_PREFIX_LEN,
             full_filename, sizeof(full_filename));
     if (access(full_filename, F_OK) != 0) {
         return errno != 0 ? errno : EPERM;
@@ -109,13 +176,13 @@ static int get_binlog_info_from_file(const char *data_path,
     }
 
     *start_index = iniGetIntValue(NULL,
-            BINLOG_INDEX_ITEM_START_INDEX,
+            BINLOG_INDEX_ITEM_START_INDEX_STR,
             &ini_context, 0);
     *last_index = iniGetIntValue(NULL,
-            BINLOG_INDEX_ITEM_CURRENT_WRITE,
+            BINLOG_INDEX_ITEM_CURRENT_WRITE_STR,
             &ini_context, 0);
     *compress_index = iniGetIntValue(NULL,
-            BINLOG_INDEX_ITEM_CURRENT_COMPRESS,
+            BINLOG_INDEX_ITEM_CURRENT_COMPRESS_STR,
             &ini_context, 0);
 
     iniFreeContext(&ini_context);
@@ -165,14 +232,14 @@ static int open_writable_binlog(SFFileWriterInfo *writer)
         close(writer->file.fd);
     }
 
-    GET_BINLOG_FILENAME(writer);
-    writer->file.fd = open(writer->file.name, O_WRONLY |
+    sf_file_writer_get_binlog_filename(writer);
+    writer->file.fd = open(writer->file.name.str, O_WRONLY |
             O_CREAT | O_APPEND | O_CLOEXEC, 0644);
     if (writer->file.fd < 0) {
         logError("file: "__FILE__", line: %d, "
                 "open file \"%s\" fail, "
                 "errno: %d, error info: %s",
-                __LINE__, writer->file.name,
+                __LINE__, writer->file.name.str,
                 errno, STRERROR(errno));
         return errno != 0 ? errno : EACCES;
     }
@@ -182,7 +249,7 @@ static int open_writable_binlog(SFFileWriterInfo *writer)
         logError("file: "__FILE__", line: %d, "
                 "lseek file \"%s\" fail, "
                 "errno: %d, error info: %s",
-                __LINE__, writer->file.name,
+                __LINE__, writer->file.name.str,
                 errno, STRERROR(errno));
         return errno != 0 ? errno : EIO;
     }
@@ -192,23 +259,24 @@ static int open_writable_binlog(SFFileWriterInfo *writer)
 
 static int open_next_binlog(SFFileWriterInfo *writer)
 {
-    GET_BINLOG_FILENAME(writer);
-    if (access(writer->file.name, F_OK) == 0) {
+    sf_file_writer_get_binlog_filename(writer);
+    if (access(writer->file.name.str, F_OK) == 0) {
         char bak_filename[PATH_MAX];
         char date_str[32];
 
-        snprintf(bak_filename, sizeof(bak_filename), "%s.%s",
-                writer->file.name, formatDatetime(g_current_time,
-                    "%Y%m%d%H%M%S", date_str, sizeof(date_str)));
-        if (rename(writer->file.name, bak_filename) == 0) {
+        formatDatetime(g_current_time, "%Y%m%d%H%M%S",
+                date_str, sizeof(date_str));
+        fc_combine_two_strings(writer->file.name.str,
+                date_str, '.', bak_filename);
+        if (rename(writer->file.name.str, bak_filename) == 0) {
             logWarning("file: "__FILE__", line: %d, "
                     "binlog file %s exist, rename to %s",
-                    __LINE__, writer->file.name, bak_filename);
+                    __LINE__, writer->file.name.str, bak_filename);
         } else {
             logError("file: "__FILE__", line: %d, "
                     "rename binlog %s to backup %s fail, "
                     "errno: %d, error info: %s",
-                    __LINE__, writer->file.name, bak_filename,
+                    __LINE__, writer->file.name.str, bak_filename,
                     errno, STRERROR(errno));
             return errno != 0 ? errno : EPERM;
         }
@@ -227,7 +295,7 @@ static int do_write_to_file(SFFileWriterInfo *writer,
         logError("file: "__FILE__", line: %d, "
                 "write to binlog file \"%s\" fail, "
                 "errno: %d, error info: %s",
-                __LINE__, writer->file.name,
+                __LINE__, writer->file.name.str,
                 result, STRERROR(result));
         return result;
     }
@@ -236,19 +304,23 @@ static int do_write_to_file(SFFileWriterInfo *writer,
         if (fsync(writer->file.fd) != 0) {
             result = errno != 0 ? errno : EIO;
             logError("file: "__FILE__", line: %d, "
-                    "fsync to binlog file \"%s\" fail, "
-                    "errno: %d, error info: %s",
-                    __LINE__, writer->file.name,
+                    "fsync to binlog file \"%s\" fail, errno: %d, "
+                    "error info: %s", __LINE__, writer->file.name.str,
                     result, STRERROR(result));
             return result;
         }
     }
 
     writer->file.size += len;
+    if (writer->write_done_callback.func != NULL) {
+        writer->write_done_callback.func(writer,
+                writer->write_done_callback.args);
+    }
+
     return 0;
 }
 
-static int check_write_to_file(SFFileWriterInfo *writer,
+int sf_file_writer_direct_write(SFFileWriterInfo *writer,
         char *buff, const int len)
 {
     int result;
@@ -267,7 +339,7 @@ static int check_write_to_file(SFFileWriterInfo *writer,
     if (result != 0) {
         logError("file: "__FILE__", line: %d, "
                 "open binlog file \"%s\" fail",
-                __LINE__, writer->file.name);
+                __LINE__, writer->file.name.str);
         return result;
     }
 
@@ -279,12 +351,12 @@ int sf_file_writer_flush(SFFileWriterInfo *writer)
     int result;
     int len;
 
-    len = SF_BINLOG_BUFFER_LENGTH(writer->binlog_buffer);
+    len = SF_BINLOG_BUFFER_PRODUCER_DATA_LENGTH(writer->binlog_buffer);
     if (len == 0) {
         return 0;
     }
 
-    if ((result=check_write_to_file(writer, writer->
+    if ((result=sf_file_writer_direct_write(writer, writer->
                     binlog_buffer.buff, len)) == 0)
     {
         if (writer->flags & SF_FILE_WRITER_FLAGS_WANT_DONE_VERSION) {
@@ -292,10 +364,30 @@ int sf_file_writer_flush(SFFileWriterInfo *writer)
         }
     }
 
-    writer->binlog_buffer.end = writer->binlog_buffer.buff;
+    writer->binlog_buffer.data_end = writer->binlog_buffer.buff;
     return result;
 }
 
+int sf_file_writer_fsync(SFFileWriterInfo *writer)
+{
+    int result;
+
+    if ((result=sf_file_writer_flush(writer)) != 0) {
+        return result;
+    }
+
+    if (fsync(writer->file.fd) == 0) {
+        return 0;
+    } else {
+        result = errno != 0 ? errno : EIO;
+        logError("file: "__FILE__", line: %d, "
+                "fsync to binlog file \"%s\" fail, errno: %d, "
+                "error info: %s", __LINE__, writer->file.name.str,
+                result, STRERROR(result));
+        return result;
+    }
+}
+
 int sf_file_writer_get_indexes(SFFileWriterInfo *writer,
         int *start_index, int *last_index)
 {
@@ -324,14 +416,14 @@ int sf_file_writer_deal_versioned_buffer(SFFileWriterInfo *writer,
     int result;
 
     if (buffer->length >= writer->binlog_buffer.size / 4) {
-        if (SF_BINLOG_BUFFER_LENGTH(writer->binlog_buffer) > 0) {
+        if (SF_BINLOG_BUFFER_PRODUCER_DATA_LENGTH(writer->binlog_buffer) > 0) {
             if ((result=sf_file_writer_flush(writer)) != 0) {
                 return result;
             }
         }
 
-        if ((result=check_write_to_file(writer, buffer->buff,
-                        buffer->length)) == 0)
+        if ((result=sf_file_writer_direct_write(writer, buffer->
+                        buff, buffer->length)) == 0)
         {
             if (writer->flags & SF_FILE_WRITER_FLAGS_WANT_DONE_VERSION) {
                 writer->last_versions.pending = version;
@@ -342,13 +434,13 @@ int sf_file_writer_deal_versioned_buffer(SFFileWriterInfo *writer,
     }
 
     if (writer->cfg.file_rotate_size > 0 && writer->file.size +
-            SF_BINLOG_BUFFER_LENGTH(writer->binlog_buffer) +
+            SF_BINLOG_BUFFER_PRODUCER_DATA_LENGTH(writer->binlog_buffer) +
             buffer->length > writer->cfg.file_rotate_size)
     {
         if ((result=sf_file_writer_flush(writer)) != 0) {
             return result;
         }
-    } else if (writer->binlog_buffer.size - SF_BINLOG_BUFFER_LENGTH(
+    } else if (SF_BINLOG_BUFFER_PRODUCER_BUFF_REMAIN(
                 writer->binlog_buffer) < buffer->length)
     {
         if ((result=sf_file_writer_flush(writer)) != 0) {
@@ -359,16 +451,40 @@ int sf_file_writer_deal_versioned_buffer(SFFileWriterInfo *writer,
     if (writer->flags & SF_FILE_WRITER_FLAGS_WANT_DONE_VERSION) {
         writer->last_versions.pending = version;
     }
-    memcpy(writer->binlog_buffer.end, buffer->buff, buffer->length);
-    writer->binlog_buffer.end += buffer->length;
+    memcpy(writer->binlog_buffer.data_end, buffer->buff, buffer->length);
+    writer->binlog_buffer.data_end += buffer->length;
 
     return 0;
 }
 
+int sf_file_writer_save_buffer_ex(SFFileWriterInfo *writer,
+        const int length, const bool flush)
+{
+    int result;
+
+    if (writer->cfg.file_rotate_size > 0 && writer->file.size +
+            SF_BINLOG_BUFFER_PRODUCER_DATA_LENGTH(writer->binlog_buffer) +
+            length > writer->cfg.file_rotate_size)
+    {
+        if ((result=sf_file_writer_flush(writer)) != 0) {
+            return result;
+        }
+    }
+
+    writer->binlog_buffer.data_end += length;
+    if (flush || SF_BINLOG_BUFFER_PRODUCER_BUFF_REMAIN(writer->
+                binlog_buffer) < writer->cfg.max_record_size)
+    {
+        return sf_file_writer_flush(writer);
+    } else {
+        return 0;
+    }
+}
+
 int sf_file_writer_init(SFFileWriterInfo *writer, const char *data_path,
         const char *subdir_name, const char *file_prefix,
-        const int buffer_size, const int64_t file_rotate_size,
-        const bool call_fsync)
+        const int max_record_size, const int buffer_size,
+        const int64_t file_rotate_size, const bool call_fsync)
 {
     int result;
     int path_len;
@@ -379,17 +495,18 @@ int sf_file_writer_init(SFFileWriterInfo *writer, const char *data_path,
     writer->last_versions.pending = 0;
     writer->last_versions.done = 0;
     writer->flags = 0;
+    sf_file_writer_set_write_done_callback(writer, NULL, NULL);
     if ((result=sf_binlog_buffer_init(&writer->
                     binlog_buffer, buffer_size)) != 0)
     {
         return result;
     }
 
+    writer->cfg.max_record_size = max_record_size;
     writer->cfg.call_fsync = call_fsync;
     writer->cfg.file_rotate_size = file_rotate_size;
     writer->cfg.data_path = data_path;
-    path_len = snprintf(filepath, sizeof(filepath),
-            "%s/%s", data_path, subdir_name);
+    path_len = fc_combine_full_filepath(data_path, subdir_name, filepath);
     if ((result=fc_check_mkdir_ex(filepath, 0775, &create)) != 0) {
         return result;
     }
@@ -398,14 +515,11 @@ int sf_file_writer_init(SFFileWriterInfo *writer, const char *data_path,
     }
 
     writer->file.fd = -1;
-    snprintf(writer->cfg.subdir_name,
-            sizeof(writer->cfg.subdir_name),
-            "%s", subdir_name);
-    snprintf(writer->cfg.file_prefix,
-            sizeof(writer->cfg.file_prefix),
-            "%s", file_prefix);
-    writer->file.name = (char *)fc_malloc(path_len + 32);
-    if (writer->file.name == NULL) {
+    fc_safe_strcpy(writer->cfg.subdir_name, subdir_name);
+    fc_safe_strcpy(writer->cfg.file_prefix, file_prefix);
+    writer->file.name.size = path_len + 32;
+    writer->file.name.str = (char *)fc_malloc(writer->file.name.size);
+    if (writer->file.name.str == NULL) {
         return ENOMEM;
     }
 
@@ -426,9 +540,9 @@ void sf_file_writer_destroy(SFFileWriterInfo *writer)
         close(writer->file.fd);
         writer->file.fd = -1;
     }
-    if (writer->file.name != NULL) {
-        free(writer->file.name);
-        writer->file.name = NULL;
+    if (writer->file.name.str != NULL) {
+        free(writer->file.name.str);
+        writer->file.name.str = NULL;
     }
     sf_binlog_buffer_destroy(&writer->binlog_buffer);
 }
@@ -572,3 +686,22 @@ int sf_file_writer_get_last_lines(const char *data_path,
 
     return 0;
 }
+
+int sf_file_writer_get_last_line(const char *data_path,
+        const char *subdir_name, char *buff,
+        const int buff_size, int *length)
+{
+    int result;
+    int last_index;
+    int count = 1;
+
+    if ((result=sf_file_writer_get_binlog_last_index(data_path,
+                    subdir_name, &last_index)) != 0)
+    {
+        *length = 0;
+        return result;
+    }
+
+    return sf_file_writer_get_last_lines(data_path, subdir_name,
+            last_index, buff, buff_size, &count, length);
+}

src/sf_file_writer.h

@@ -24,20 +24,24 @@
 #define SF_FILE_WRITER_FLAGS_WANT_DONE_VERSION  1
 
 #define SF_BINLOG_SUBDIR_NAME_SIZE     128
-#define SF_BINLOG_FILE_PREFIX_SIZE      64
+#define SF_BINLOG_FILE_PREFIX_STR_SIZE 64
 #define SF_BINLOG_DEFAULT_ROTATE_SIZE  (1024 * 1024 * 1024)
 #define SF_BINLOG_NEVER_ROTATE_FILE    0
-#define SF_BINLOG_FILE_PREFIX          "binlog"
-#define SF_BINLOG_FILE_EXT_FMT         ".%06d"
+#define SF_BINLOG_FILE_PREFIX_STR      "binlog"
+#define SF_BINLOG_FILE_PREFIX_LEN      (sizeof(SF_BINLOG_FILE_PREFIX_STR) - 1)
+#define SF_BINLOG_FILE_EXT_LEN 6
+#define SF_BINLOG_FILE_EXT_FMT ".%0"FC_MACRO_TOSTRING(SF_BINLOG_FILE_EXT_LEN)"d"
 
-#define SF_BINLOG_BUFFER_LENGTH(buffer) ((buffer).end - (buffer).buff)
-#define SF_BINLOG_BUFFER_REMAIN(buffer) ((buffer).end - (buffer).current)
+struct sf_file_writer_info;
+
+typedef void (*sf_file_write_done_callback)(
+        struct sf_file_writer_info *writer, void *args);
 
 typedef struct sf_file_writer_info {
     struct {
         const char *data_path;
         char subdir_name[SF_BINLOG_SUBDIR_NAME_SIZE];
-        char file_prefix[SF_BINLOG_FILE_PREFIX_SIZE];
+        char file_prefix[SF_BINLOG_FILE_PREFIX_STR_SIZE];
         int64_t file_rotate_size;
         int max_record_size;
         bool call_fsync;
@@ -51,8 +55,11 @@ typedef struct sf_file_writer_info {
 
     struct {
         int fd;
-        int64_t size;
-        char *name;
+        int64_t size;  //file size
+        struct {
+            char *str;
+            int size;
+        } name;
     } file;
 
     int64_t total_count;
@@ -63,6 +70,12 @@ typedef struct sf_file_writer_info {
         int64_t pending;
         volatile int64_t done;
     } last_versions;
+
+    struct {
+        sf_file_write_done_callback func;
+        void *args;
+    } write_done_callback;
+
 } SFFileWriterInfo;
 
 #ifdef __cplusplus
@@ -71,11 +84,14 @@ extern "C" {
 
 int sf_file_writer_init(SFFileWriterInfo *writer, const char *data_path,
         const char *subdir_name, const char *file_prefix,
-        const int buffer_size, const int64_t file_rotate_size,
-        const bool call_fsync);
+        const int max_record_size, const int buffer_size,
+        const int64_t file_rotate_size, const bool call_fsync);
 
 void sf_file_writer_destroy(SFFileWriterInfo *writer);
 
+int sf_file_writer_direct_write(SFFileWriterInfo *writer,
+        char *buff, const int len);
+
 int sf_file_writer_deal_versioned_buffer(SFFileWriterInfo *writer,
         BufferInfo *buffer, const int64_t version);
 
@@ -84,12 +100,51 @@ int sf_file_writer_deal_versioned_buffer(SFFileWriterInfo *writer,
 
 int sf_file_writer_flush(SFFileWriterInfo *writer);
 
+int sf_file_writer_fsync(SFFileWriterInfo *writer);
+
+#define SF_FILE_WRITER_DATA_END_BUFF(writer) (writer)->binlog_buffer.data_end
+#define SF_FILE_WRITER_CURRENT_DATA_VERSION(writer) \
+    (writer)->last_versions.pending
+#define SF_FILE_WRITER_NEXT_DATA_VERSION(writer) \
+    ++((writer)->last_versions.pending)
+
+int sf_file_writer_save_buffer_ex(SFFileWriterInfo *writer,
+        const int length, const bool flush);
+
+static inline int sf_file_writer_save_buffer(
+        SFFileWriterInfo *writer, const int length)
+{
+    const bool flush = false;
+    return sf_file_writer_save_buffer_ex(writer, length, flush);
+}
+
+static inline int sf_file_writer_flush_buffer(
+        SFFileWriterInfo *writer, const int length)
+{
+    const bool flush = true;
+    return sf_file_writer_save_buffer_ex(writer, length, flush);
+}
+
 static inline void sf_file_writer_set_flags(
         SFFileWriterInfo *writer, const short flags)
 {
     writer->flags = flags;
 }
 
+static inline void sf_file_writer_set_call_fsync(
+        SFFileWriterInfo *writer, const bool call_fsync)
+{
+    writer->cfg.call_fsync = call_fsync;
+}
+
+static inline void sf_file_writer_set_write_done_callback (
+        SFFileWriterInfo *writer, sf_file_write_done_callback callback,
+        void *args)
+{
+    writer->write_done_callback.func = callback;
+    writer->write_done_callback.args = args;
+}
+
 static inline int64_t sf_file_writer_get_last_version_ex(
         SFFileWriterInfo *writer, const int log_level)
 {
@@ -172,7 +227,8 @@ static inline const char *sf_file_writer_get_filepath(
         const char *data_path, const char *subdir_name,
         char *filepath, const int size)
 {
-    snprintf(filepath, size, "%s/%s", data_path, subdir_name);
+    fc_get_full_filepath_ex(data_path, strlen(data_path),
+            subdir_name, strlen(subdir_name), filepath, size);
     return filepath;
 }
 
@@ -181,15 +237,41 @@ static inline const char *sf_file_writer_get_filename_ex(
         const char *file_prefix, const int binlog_index,
         char *filename, const int size)
 {
-    snprintf(filename, size, "%s/%s/%s"SF_BINLOG_FILE_EXT_FMT,
-            data_path, subdir_name, file_prefix, binlog_index);
+    char *p;
+    int data_path_len;
+    int subdir_name_len;
+    int file_prefix_len;
+
+    data_path_len = strlen(data_path);
+    subdir_name_len = strlen(subdir_name);
+    file_prefix_len = strlen(file_prefix);
+    if (data_path_len + subdir_name_len + file_prefix_len +
+            4 + SF_BINLOG_FILE_EXT_LEN >= size)
+    {
+        snprintf(filename, size, "%s/%s/%s"SF_BINLOG_FILE_EXT_FMT,
+                data_path, subdir_name, file_prefix, binlog_index);
+        return filename;
+    }
+
+    p = filename;
+    memcpy(p, data_path, data_path_len);
+    p += data_path_len;
+    *p++ = '/';
+    memcpy(p, subdir_name, subdir_name_len);
+    p += subdir_name_len;
+    *p++ = '/';
+    memcpy(p, file_prefix, file_prefix_len);
+    p += file_prefix_len;
+    *p++ = '.';
+    fc_ltostr_ex(binlog_index, p, SF_BINLOG_FILE_EXT_LEN);
+
     return filename;
 }
 
 #define sf_file_writer_get_filename(data_path, subdir_name, \
         binlog_index, filename, size) \
     sf_file_writer_get_filename_ex(data_path, subdir_name, \
-        SF_BINLOG_FILE_PREFIX, binlog_index, filename, size)
+        SF_BINLOG_FILE_PREFIX_STR, binlog_index, filename, size)
 
 const char *sf_file_writer_get_index_filename(const char *data_path,
         const char *subdir_name, char *filename, const int size);
@@ -200,10 +282,40 @@ int sf_file_writer_set_binlog_start_index(SFFileWriterInfo *writer,
 int sf_file_writer_set_binlog_write_index(SFFileWriterInfo *writer,
         const int last_index);
 
+static inline int sf_file_writer_rotate_file(SFFileWriterInfo *writer)
+{
+    int last_index;
+    last_index = sf_file_writer_get_current_write_index(writer);
+    return sf_file_writer_set_binlog_write_index(writer, last_index + 1);
+}
+
 int sf_file_writer_get_last_lines(const char *data_path,
         const char *subdir_name, const int current_write_index,
         char *buff, const int buff_size, int *count, int *length);
 
+static inline int sf_file_writer_get_last_line_ex(const char *data_path,
+        const char *subdir_name, const int current_write_index,
+        char *buff, const int buff_size, int *length)
+{
+    int count = 1;
+    return sf_file_writer_get_last_lines(data_path, subdir_name,
+            current_write_index, buff, buff_size, &count, length);
+}
+
+int sf_file_writer_get_last_line(const char *data_path,
+        const char *subdir_name, char *buff,
+        const int buff_size, int *length);
+
+int sf_file_writer_write_to_binlog_index_file_ex(const char *data_path,
+        const char *subdir_name, const char *file_prefix,
+        const int start_index, const int last_index,
+        const int compress_index);
+
+#define sf_file_writer_write_to_binlog_index_file(data_path,  \
+        subdir_name, start_index, last_index) \
+    sf_file_writer_write_to_binlog_index_file_ex(data_path, subdir_name, \
+            SF_BINLOG_FILE_PREFIX_STR, start_index, last_index, 0)
+
 #ifdef __cplusplus
 }
 #endif

src/sf_func.c

@@ -38,7 +38,7 @@ int sf_connect_to_server(const char *ip_addr, const int port, int *sock)
     if(*sock < 0) {
         return errno != 0 ? errno : ENOMEM;
     }
-    tcpsetserveropt(*sock, g_sf_global_vars.network_timeout);
+    tcpsetserveropt(*sock, g_sf_global_vars.net_buffer_cfg.network_timeout);
 
     if ((result=tcpsetnonblockopt(*sock)) != 0) {
         close(*sock);
@@ -47,8 +47,8 @@ int sf_connect_to_server(const char *ip_addr, const int port, int *sock)
     }
     FC_SET_CLOEXEC(*sock);
 
-    if ((result=connectserverbyip_nb(*sock, ip_addr, port,
-                    g_sf_global_vars.connect_timeout)) != 0)
+    if ((result=connectserverbyip_nb(*sock, ip_addr, port, g_sf_global_vars.
+                    net_buffer_cfg.connect_timeout)) != 0)
     {
         close(*sock);
         *sock = -1;

src/sf_func.h

@@ -56,7 +56,8 @@ static inline int sf_binlog_buffer_init(SFBinlogBuffer *buffer, const int size)
         return ENOMEM;
     }
 
-    buffer->current = buffer->end = buffer->buff;
+    buffer->current = buffer->data_end = buffer->buff;
+    buffer->buff_end = buffer->buff + size;
     buffer->size = size;
     return 0;
 }
@@ -65,7 +66,8 @@ static inline void sf_binlog_buffer_destroy(SFBinlogBuffer *buffer)
 {
     if (buffer->buff != NULL) {
         free(buffer->buff);
-        buffer->current = buffer->end = buffer->buff = NULL;
+        buffer->current = buffer->buff = NULL;
+        buffer->data_end = buffer->buff_end = NULL;
         buffer->size = 0;
     }
 }

src/sf_global.h

@@ -30,10 +30,9 @@ typedef struct sf_connection_stat {
 } SFConnectionStat;
 
 typedef struct sf_global_variables {
-    int connect_timeout;
-    int network_timeout;
     struct {
         char str[MAX_PATH_SIZE];
+        int len;
         bool inited;
         bool created;
     } base_path;
@@ -41,18 +40,20 @@ typedef struct sf_global_variables {
     volatile bool continue_flag;
     bool tcp_quick_ack;
     bool epoll_edge_trigger;
-    int max_connections;
-    int max_pkg_size;
-    int min_buff_size;
-    int max_buff_size;
+
+    SFNetBufferConfig net_buffer_cfg;
+
     int task_buffer_extra_size;
     int thread_stack_size;
 
     time_t up_time;
-    gid_t run_by_gid;
-    uid_t run_by_uid;
-    char run_by_group[32];
-    char run_by_user[32];
+    struct {
+        bool inited;
+        gid_t gid;
+        uid_t uid;
+        char group[32];
+        char user[32];
+    } run_by;
 
     SFLogConfig error_log;
     SFConnectionStat connection_stat;
@@ -66,6 +67,8 @@ typedef struct sf_context_ini_config {
     int default_inner_port;
     int default_outer_port;
     int default_work_threads;
+    int max_pkg_size_min_value;
+    FCCommunicationType comm_type;
     const char *max_pkg_size_item_name;
 } SFContextIniConfig;
 
@@ -77,18 +80,34 @@ extern SFGlobalVariables         g_sf_global_vars;
 extern SFContext                 g_sf_context;
 
 #define SF_G_BASE_PATH_STR       g_sf_global_vars.base_path.str
+#define SF_G_BASE_PATH_LEN       g_sf_global_vars.base_path.len
 #define SF_G_BASE_PATH_INITED    g_sf_global_vars.base_path.inited
 #define SF_G_BASE_PATH_CREATED   g_sf_global_vars.base_path.created
 #define SF_G_CONTINUE_FLAG       g_sf_global_vars.continue_flag
-#define SF_G_CONNECT_TIMEOUT     g_sf_global_vars.connect_timeout
-#define SF_G_NETWORK_TIMEOUT     g_sf_global_vars.network_timeout
-#define SF_G_MAX_CONNECTIONS     g_sf_global_vars.max_connections
+#define SF_G_CONNECT_TIMEOUT     g_sf_global_vars.net_buffer_cfg.connect_timeout
+#define SF_G_NETWORK_TIMEOUT     g_sf_global_vars.net_buffer_cfg.network_timeout
+#define SF_G_MAX_CONNECTIONS     g_sf_global_vars.net_buffer_cfg.max_connections
 #define SF_G_THREAD_STACK_SIZE   g_sf_global_vars.thread_stack_size
+#define SF_G_UP_TIME             g_sf_global_vars.up_time
 
-#define SF_G_OUTER_PORT          g_sf_context.outer_port
-#define SF_G_INNER_PORT          g_sf_context.inner_port
-#define SF_G_OUTER_BIND_ADDR     g_sf_context.outer_bind_addr
-#define SF_G_INNER_BIND_ADDR     g_sf_context.inner_bind_addr
+#define SF_G_SOCK_HANDLER        (g_sf_context.handlers  \
+        [SF_IPV4_ADDRESS_FAMILY_INDEX].handlers + \
+        SF_SOCKET_NETWORK_HANDLER_INDEX)
+#define SF_G_OUTER_PORT          SF_G_SOCK_HANDLER->outer.port
+#define SF_G_INNER_PORT          SF_G_SOCK_HANDLER->inner.port
+#define SF_G_OUTER_BIND_ADDR4     g_sf_context.handlers  \
+        [SF_IPV4_ADDRESS_FAMILY_INDEX].outer_bind_addr
+#define SF_G_INNER_BIND_ADDR4     g_sf_context.handlers  \
+        [SF_IPV4_ADDRESS_FAMILY_INDEX].inner_bind_addr
+#define SF_G_OUTER_BIND_ADDR6     g_sf_context.handlers  \
+        [SF_IPV6_ADDRESS_FAMILY_INDEX].outer_bind_addr
+#define SF_G_INNER_BIND_ADDR6     g_sf_context.handlers  \
+        [SF_IPV6_ADDRESS_FAMILY_INDEX].inner_bind_addr
+
+#define SF_G_IPV4_ENABLED     (g_sf_context.handlers  \
+        [SF_IPV4_ADDRESS_FAMILY_INDEX].af == AF_INET)
+#define SF_G_IPV6_ENABLED     (g_sf_context.handlers  \
+        [SF_IPV6_ADDRESS_FAMILY_INDEX].af == AF_INET6)
 
 #define SF_G_ACCEPT_THREADS      g_sf_context.accept_threads
 #define SF_G_WORK_THREADS        g_sf_context.work_threads
@@ -104,25 +123,31 @@ extern SFContext                 g_sf_context;
 
 #define SF_G_EPOLL_EDGE_TRIGGER  g_sf_global_vars.epoll_edge_trigger
 
-#define SF_WORK_THREADS(sf_context)        sf_context.work_threads
-#define SF_ALIVE_THREAD_COUNT(sf_context)  sf_context.thread_count
-#define SF_THREAD_INDEX(sf_context, tdata) (int)(tdata - sf_context.thread_data)
+#define SF_WORK_THREADS(sf_context)        (sf_context).work_threads
+#define SF_ALIVE_THREAD_COUNT(sf_context)  (sf_context).thread_count
+#define SF_THREAD_INDEX(sf_context, tdata) (int)(tdata - (sf_context).thread_data)
+
+#define SF_IPV4_ENABLED(sf_context)   ((sf_context).handlers  \
+        [SF_IPV4_ADDRESS_FAMILY_INDEX].af == AF_INET)
+#define SF_IPV6_ENABLED(sf_context)   ((sf_context).handlers  \
+        [SF_IPV6_ADDRESS_FAMILY_INDEX].af == AF_INET6)
 
 #define SF_CHOWN_RETURN_ON_ERROR(path, current_uid, current_gid) \
     do { \
-    if (!(g_sf_global_vars.run_by_gid == current_gid && \
-                g_sf_global_vars.run_by_uid == current_uid)) \
-    { \
-        if (chown(path, g_sf_global_vars.run_by_uid, \
-                    g_sf_global_vars.run_by_gid) != 0) \
+        if (g_sf_global_vars.run_by.inited && !(g_sf_global_vars.  \
+                    run_by.gid == current_gid && g_sf_global_vars. \
+                    run_by.uid == current_uid)) \
         { \
-            logError("file: "__FILE__", line: %d, " \
-                "chown \"%s\" fail, " \
-                "errno: %d, error info: %s", \
-                __LINE__, path, errno, STRERROR(errno)); \
-            return errno != 0 ? errno : EPERM; \
+            if (chown(path, g_sf_global_vars.run_by.uid, \
+                        g_sf_global_vars.run_by.gid) != 0) \
+            { \
+                logError("file: "__FILE__", line: %d, " \
+                        "chown \"%s\" fail, " \
+                        "errno: %d, error info: %s", \
+                        __LINE__, path, errno, STRERROR(errno)); \
+                return errno != 0 ? errno : EPERM; \
+            } \
         } \
-    } \
     } while (0)
 
 #define SF_CHOWN_TO_RUNBY_RETURN_ON_ERROR(path) \
@@ -131,93 +156,112 @@ extern SFContext                 g_sf_context;
 
 #define SF_FCHOWN_RETURN_ON_ERROR(fd, path, current_uid, current_gid) \
     do { \
-    if (!(g_sf_global_vars.run_by_gid == current_gid && \
-                g_sf_global_vars.run_by_uid == current_uid)) \
-    { \
-        if (fchown(fd, g_sf_global_vars.run_by_uid, \
-                    g_sf_global_vars.run_by_gid) != 0) \
+        if (g_sf_global_vars.run_by.inited && !(g_sf_global_vars.  \
+                    run_by.gid == current_gid && g_sf_global_vars. \
+                    run_by.uid == current_uid)) \
         { \
-            logError("file: "__FILE__", line: %d, " \
-                "fchown \"%s\" fail, " \
-                "errno: %d, error info: %s", \
-                __LINE__, path, errno, STRERROR(errno)); \
-            return errno != 0 ? errno : EPERM; \
+            if (fchown(fd, g_sf_global_vars.run_by.uid, \
+                        g_sf_global_vars.run_by.gid) != 0) \
+            { \
+                logError("file: "__FILE__", line: %d, " \
+                        "fchown \"%s\" fail, " \
+                        "errno: %d, error info: %s", \
+                        __LINE__, path, errno, STRERROR(errno)); \
+                return errno != 0 ? errno : EPERM; \
+            } \
         } \
-    } \
     } while (0)
 
 #define SF_FCHOWN_TO_RUNBY_RETURN_ON_ERROR(fd, path) \
     SF_FCHOWN_RETURN_ON_ERROR(fd, path, geteuid(), getegid())
 
-#define SF_SET_CONTEXT_INI_CONFIG_EX(config, filename, pIniContext,     \
-        section_name, def_inner_port, def_outer_port, def_work_threads, \
-        max_pkg_size_item_nm) \
+#define SF_SET_CONTEXT_INI_CONFIG_EX(config, the_comm_type, filename, \
+        pIniContext, section_name, def_inner_port, def_outer_port,    \
+        def_work_threads, max_pkg_size_item_nm, max_pkg_size_min_val) \
     do { \
         FAST_INI_SET_FULL_CTX_EX(config.ini_ctx, filename, \
                 section_name, pIniContext);   \
+        config.comm_type = the_comm_type; \
         config.default_inner_port = def_inner_port; \
         config.default_outer_port = def_outer_port; \
         config.default_work_threads = def_work_threads; \
         config.max_pkg_size_item_name = max_pkg_size_item_nm; \
+        config.max_pkg_size_min_value = max_pkg_size_min_val; \
     } while (0)
 
-#define SF_SET_CONTEXT_INI_CONFIG(config, filename, pIniContext, \
-        section_name, def_inner_port, def_outer_port, def_work_threads) \
-     SF_SET_CONTEXT_INI_CONFIG_EX(config, filename, pIniContext,     \
-        section_name, def_inner_port, def_outer_port, def_work_threads, \
-        "max_pkg_size")
+#define SF_SET_CONTEXT_INI_CONFIG(config, the_comm_type,     \
+        filename, pIniContext, section_name, def_inner_port, \
+        def_outer_port, def_work_threads) \
+     SF_SET_CONTEXT_INI_CONFIG_EX(config, the_comm_type, filename, \
+             pIniContext, section_name, def_inner_port, def_outer_port, \
+             def_work_threads, "max_pkg_size", 0)
 
-int sf_load_global_config_ex(const char *server_name,
+int sf_load_global_config_ex(const char *log_filename_prefix,
         IniFullContext *ini_ctx, const bool load_network_params,
-        const char *max_pkg_size_item_nm, const int task_buffer_extra_size,
-        const bool need_set_run_by);
+        const char *max_pkg_size_item_nm, const int fixed_buff_size,
+        const int task_buffer_extra_size, const bool need_set_run_by);
 
-static inline int sf_load_global_config(const char *server_name,
+static inline int sf_load_global_config(const char *log_filename_prefix,
         IniFullContext *ini_ctx)
 {
     const bool load_network_params = true;
     const char *max_pkg_size_item_nm = "max_pkg_size";
+    const int fixed_buff_size = 0;
     const int task_buffer_extra_size = 0;
     const bool need_set_run_by = true;
 
-    return sf_load_global_config_ex(server_name, ini_ctx, load_network_params,
-            max_pkg_size_item_nm, task_buffer_extra_size, need_set_run_by);
+    return sf_load_global_config_ex(log_filename_prefix, ini_ctx,
+            load_network_params, max_pkg_size_item_nm, fixed_buff_size,
+            task_buffer_extra_size, need_set_run_by);
 }
 
-int sf_load_config_ex(const char *server_name, SFContextIniConfig *config,
+int sf_load_config_ex(const char *log_filename_prefix,
+        SFContextIniConfig *config, const int fixed_buff_size,
         const int task_buffer_extra_size, const bool need_set_run_by);
 
-static inline int sf_load_config(const char *server_name,
+static inline int sf_load_config(const char *log_filename_prefix,
+        const FCCommunicationType comm_type,
         const char *filename, IniContext *pIniContext,
         const char *section_name, const int default_inner_port,
-        const int default_outer_port, const int task_buffer_extra_size)
+        const int default_outer_port, const int fixed_buff_size,
+        const int task_buffer_extra_size)
 {
     const bool need_set_run_by = true;
     SFContextIniConfig config;
 
-    SF_SET_CONTEXT_INI_CONFIG(config, filename, pIniContext,
+    SF_SET_CONTEXT_INI_CONFIG(config, comm_type, filename, pIniContext,
             section_name, default_inner_port, default_outer_port,
             DEFAULT_WORK_THREADS);
-    return sf_load_config_ex(server_name, &config,
+    return sf_load_config_ex(log_filename_prefix, &config, fixed_buff_size,
             task_buffer_extra_size, need_set_run_by);
 }
 
 int sf_load_context_from_config_ex(SFContext *sf_context,
-        SFContextIniConfig *config);
+        SFContextIniConfig *config, const int fixed_buff_size,
+        const int task_buffer_extra_size);
 
 static inline int sf_load_context_from_config(SFContext *sf_context,
+        const FCCommunicationType comm_type,
         const char *filename, IniContext *pIniContext,
         const char *section_name, const int default_inner_port,
-        const int default_outer_port)
+        const int default_outer_port, const int fixed_buff_size,
+        const int task_buffer_extra_size)
 {
     SFContextIniConfig config;
 
-    SF_SET_CONTEXT_INI_CONFIG(config, filename, pIniContext,
+    SF_SET_CONTEXT_INI_CONFIG(config, comm_type, filename, pIniContext,
             section_name, default_inner_port, default_outer_port,
             DEFAULT_WORK_THREADS);
-    return sf_load_context_from_config_ex(sf_context, &config);
+    return sf_load_context_from_config_ex(sf_context, &config,
+            fixed_buff_size, task_buffer_extra_size);
 }
 
+int sf_alloc_rdma_pd(SFContext *sf_context,
+        FCAddressPtrArray *address_array);
+
+void sf_set_address_family_by_ip(SFContext *sf_context,
+        FCAddressPtrArray *address_array);
+
 int sf_load_log_config(IniFullContext *ini_ctx, LogContext *log_ctx,
         SFLogConfig *log_cfg);
 
@@ -275,8 +319,8 @@ static inline void sf_set_global_base_path(const char *base_path)
     string_t path_string;
 
     FC_SET_STRING(path_string, (char *)base_path);
-    normalize_path(NULL, &path_string, SF_G_BASE_PATH_STR,
-            sizeof(SF_G_BASE_PATH_STR));
+    SF_G_BASE_PATH_LEN = normalize_path(NULL, &path_string,
+            SF_G_BASE_PATH_STR, sizeof(SF_G_BASE_PATH_STR));
     SF_G_BASE_PATH_INITED = true;
 }
 

src/sf_nio.h

@@ -25,8 +25,10 @@
 #include "fastcommon/ioevent_loop.h"
 #include "sf_define.h"
 #include "sf_types.h"
+#include "sf_global.h"
 
-#define SF_CTX  ((SFContext *)(task->ctx))
+#define SF_CTX              (task->handler->fh->ctx)
+#define SF_NET_BUFFER_CFG   SF_CTX->net_buffer_cfg
 
 #ifdef __cplusplus
 extern "C" {
@@ -36,7 +38,7 @@ void sf_set_parameters_ex(SFContext *sf_context, const int header_size,
         sf_set_body_length_callback set_body_length_func,
         sf_alloc_recv_buffer_callback alloc_recv_buffer_func,
         sf_send_done_callback send_done_callback,
-        sf_deal_task_func deal_func, TaskCleanUpCallback cleanup_func,
+        sf_deal_task_callback deal_func, TaskCleanUpCallback cleanup_func,
         sf_recv_timeout_callback timeout_callback, sf_release_buffer_callback
         release_buffer_callback);
 
@@ -46,40 +48,51 @@ void sf_set_parameters_ex(SFContext *sf_context, const int header_size,
             set_body_length_func, alloc_recv_buffer_func, \
             deal_func, cleanup_func, timeout_callback, NULL)
 
-static inline void sf_set_deal_task_func_ex(SFContext *sf_context,
-        sf_deal_task_func deal_func)
+static inline void sf_set_deal_task_callback_ex(SFContext *sf_context,
+        sf_deal_task_callback deal_func)
 {
-    sf_context->deal_task = deal_func;
+    sf_context->callbacks.deal_task = deal_func;
 }
 
-#define sf_set_deal_task_func(deal_func) \
-    sf_set_deal_task_func_ex(&g_sf_context, deal_func)
+#define sf_set_deal_task_callback(deal_func) \
+    sf_set_deal_task_callback_ex(&g_sf_context, deal_func)
 
-static inline void sf_set_remove_from_ready_list_ex(SFContext *sf_context,
-        const bool enabled)
+
+static inline void sf_set_connect_done_callback_ex(SFContext *sf_context,
+        sf_connect_done_callback done_callback)
 {
-    sf_context->remove_from_ready_list = enabled;
+    sf_context->callbacks.connect_done = done_callback;
 }
 
-#define sf_set_remove_from_ready_list(enabled) \
-    sf_set_remove_from_ready_list_ex(&g_sf_context, enabled);
+#define sf_set_connect_done_callback(done_callback) \
+    sf_set_connect_done_callback_ex(&g_sf_context, done_callback)
 
-static inline TaskCleanUpCallback sf_get_task_cleanup_func_ex(
+
+static inline TaskCleanUpCallback sf_get_task_cleanup_callback_ex(
         SFContext *sf_context)
 {
-    return sf_context->task_cleanup_func;
+    return sf_context->callbacks.task_cleanup;
 }
 
-#define sf_get_task_cleanup_func() \
-    sf_get_task_cleanup_func_ex(&g_sf_context)
+#define sf_get_task_cleanup_callback() \
+    sf_get_task_cleanup_callback_ex(&g_sf_context)
 
-#define sf_nio_task_is_idle(task) \
-    (task->offset == 0 && task->length == 0)
+#define sf_nio_task_send_done(task) \
+    (task->send.ptr->offset == 0 && task->send.ptr->length == 0)
 
-void sf_recv_notify_read(int sock, short event, void *arg);
+static inline void sf_nio_reset_task_length(struct fast_task_info *task)
+{
+    task->send.ptr->length = 0;
+    task->send.ptr->offset = 0;
+    if (task->recv.ptr != task->send.ptr) {
+        task->recv.ptr->length = 0;
+        task->recv.ptr->offset = 0;
+    }
+}
+
+void sf_socket_close_connection(struct fast_task_info *task);
+void sf_recv_notify_read(int sock, const int event, void *arg);
 int sf_send_add_event(struct fast_task_info *task);
-int sf_client_sock_write(int sock, short event, void *arg);
-int sf_client_sock_read(int sock, short event, void *arg);
 
 void sf_task_finish_clean_up(struct fast_task_info *task);
 
@@ -92,6 +105,42 @@ void sf_task_switch_thread(struct fast_task_info *task,
 
 void sf_task_detach_thread(struct fast_task_info *task);
 
+static inline int sf_set_body_length(struct fast_task_info *task)
+{
+    if (SF_CTX->callbacks.set_body_length(task) != 0) {
+        return -1;
+    }
+    if (task->recv.ptr->length < 0) {
+        logError("file: "__FILE__", line: %d, "
+                "client ip: %s, pkg length: %d < 0",
+                __LINE__, task->client_ip,
+                task->recv.ptr->length);
+        return -1;
+    }
+
+    task->recv.ptr->length += SF_CTX->header_size;
+    if (task->recv.ptr->length > SF_NET_BUFFER_CFG.max_pkg_size) {
+        logError("file: "__FILE__", line: %d, "
+                "client ip: %s, pkg length: %d > "
+                "max pkg size: %d", __LINE__,
+                task->client_ip, task->recv.ptr->length,
+                SF_NET_BUFFER_CFG.max_pkg_size);
+        return -1;
+    }
+
+    return 0;
+}
+
+int sf_socket_async_connect_server(struct fast_task_info *task);
+int sf_socket_async_connect_check(struct fast_task_info *task);
+
+ssize_t sf_socket_send_data(struct fast_task_info *task,
+        SFCommAction *action, bool *send_done);
+ssize_t sf_socket_recv_data(struct fast_task_info *task,
+        const bool call_post_recv, SFCommAction *action);
+
+int sf_rdma_busy_polling_callback(struct nio_thread_data *thread_data);
+
 static inline int sf_nio_forward_request(struct fast_task_info *task,
         const int new_thread_index)
 {
@@ -99,11 +148,6 @@ static inline int sf_nio_forward_request(struct fast_task_info *task,
     return sf_nio_notify(task, SF_NIO_STAGE_FORWARDED);
 }
 
-static inline bool sf_client_sock_in_read_stage(struct fast_task_info *task)
-{
-    return (task->event.callback == (IOEventCallback)sf_client_sock_read);
-}
-
 static inline void sf_nio_add_to_deleted_list(struct nio_thread_data
         *thread_data, struct fast_task_info *task)
 {
@@ -114,6 +158,8 @@ static inline void sf_nio_add_to_deleted_list(struct nio_thread_data
     }
 }
 
+bool sf_client_sock_in_read_stage(struct fast_task_info *task);
+
 #ifdef __cplusplus
 }
 #endif

src/sf_ordered_writer.c

@@ -106,7 +106,7 @@ void sf_ordered_writer_finish(SFOrderedWriterContext *ctx)
 {
     int count;
 
-    if (ctx->writer.fw.file.name != NULL) {
+    if (ctx->writer.fw.file.name.str != NULL) {
         fc_queue_terminate(&ctx->thread.queues.version);
 
         count = 0;
@@ -120,8 +120,8 @@ void sf_ordered_writer_finish(SFOrderedWriterContext *ctx)
                     __LINE__, ctx->writer.fw.cfg.subdir_name);
         }
 
-        free(ctx->writer.fw.file.name);
-        ctx->writer.fw.file.name = NULL;
+        free(ctx->writer.fw.file.name.str);
+        ctx->writer.fw.file.name.str = NULL;
     }
 
     if (ctx->writer.fw.file.fd >= 0) {
@@ -142,8 +142,7 @@ static void *binlog_writer_func(void *arg)
 #ifdef OS_LINUX
     {
         char thread_name[64];
-        snprintf(thread_name, sizeof(thread_name),
-                "%s-writer", thread->name);
+        fc_combine_two_strings(thread->name, "writer", '-', thread_name);
         prctl(PR_SET_NAME, thread_name);
     }
 #endif
@@ -203,7 +202,7 @@ static int sf_ordered_writer_init_thread(SFOrderedWriterContext *context,
 
     thread = &context->thread;
     writer = &context->writer;
-    snprintf(thread->name, sizeof(thread->name), "%s", name);
+    fc_safe_strcpy(thread->name, name);
     writer->fw.cfg.max_record_size = max_record_size;
     writer->thread = thread;
 
@@ -250,8 +249,8 @@ int sf_ordered_writer_init_ex(SFOrderedWriterContext *context,
 {
     int result;
     if ((result=sf_file_writer_init(&context->writer.fw, data_path,
-                    subdir_name, file_prefix, buffer_size,
-                    file_rotate_size, call_fsync)) != 0)
+                    subdir_name, file_prefix, max_record_size,
+                    buffer_size, file_rotate_size, call_fsync)) != 0)
     {
         return result;
     }

src/sf_ordered_writer.h

@@ -71,7 +71,7 @@ int sf_ordered_writer_init_ex(SFOrderedWriterContext *context,
 #define sf_ordered_writer_init(context, data_path, \
         subdir_name, buffer_size, max_record_size) \
     sf_ordered_writer_init_ex(context, data_path, subdir_name,   \
-            SF_BINLOG_FILE_PREFIX, buffer_size, max_record_size, \
+            SF_BINLOG_FILE_PREFIX_STR, buffer_size, max_record_size, \
             SF_BINLOG_DEFAULT_ROTATE_SIZE, true)
 
 #define sf_ordered_writer_set_flags(ctx, flags) \

src/sf_proto.c

@@ -14,8 +14,6 @@
  */
 
 
-#include <errno.h>
-#include "fastcommon/shared_func.h"
 #include "sf_util.h"
 #include "sf_nio.h"
 #include "sf_proto.h"
@@ -29,19 +27,23 @@ static int64_t log_slower_than_us = 0;
 int sf_proto_set_body_length(struct fast_task_info *task)
 {
     SFCommonProtoHeader *header;
+    char formatted_ip[FORMATTED_IP_SIZE];
 
-    header = (SFCommonProtoHeader *)task->data;
+    header = (SFCommonProtoHeader *)task->recv.ptr->data;
     if (!SF_PROTO_CHECK_MAGIC(header->magic)) {
+        format_ip_address(task->client_ip, formatted_ip);
         logError("file: "__FILE__", line: %d, "
-                "peer %s:%u, magic "SF_PROTO_MAGIC_FORMAT
-                " is invalid, expect: "SF_PROTO_MAGIC_FORMAT,
-                __LINE__, task->client_ip, task->port,
+                "%s peer %s:%u, magic "SF_PROTO_MAGIC_FORMAT" is invalid, "
+                "expect: "SF_PROTO_MAGIC_FORMAT", cmd: %d, body length: %d",
+                __LINE__, (task->handler != NULL ? task->handler->fh->ctx->
+                    name : ""), formatted_ip, task->port,
                 SF_PROTO_MAGIC_PARAMS(header->magic),
-                SF_PROTO_MAGIC_EXPECT_PARAMS);
+                SF_PROTO_MAGIC_EXPECT_PARAMS, header->cmd,
+                buff2int(header->body_len));
         return EINVAL;
     }
 
-    task->length = buff2int(header->body_len); //set body length
+    task->recv.ptr->length = buff2int(header->body_len); //set body length
     return 0;
 }
 
@@ -70,8 +72,14 @@ int sf_check_response(ConnectionInfo *conn, SFResponseInfo *response,
             response->error.length = response->header.body_len;
         }
 
-        if ((result=tcprecvdata_nb_ex(conn->sock, response->error.message,
-                response->error.length, network_timeout, &recv_bytes)) == 0)
+        if (conn->comm_type == fc_comm_type_rdma) {
+            memcpy(response->error.message, G_RDMA_CONNECTION_CALLBACKS.
+                    get_recv_buffer(conn)->buff + sizeof(SFCommonProtoHeader),
+                    response->error.length);
+            response->error.message[response->error.length] = '\0';
+        } else if ((result=tcprecvdata_nb_ex(conn->sock, response->
+                        error.message, response->error.length,
+                        network_timeout, &recv_bytes)) == 0)
         {
             response->error.message[response->error.length] = '\0';
         } else {
@@ -96,30 +104,48 @@ static inline int sf_recv_response_header(ConnectionInfo *conn,
         SFResponseInfo *response, const int network_timeout)
 {
     int result;
+    BufferInfo *buffer;
     SFCommonProtoHeader header_proto;
 
-    if ((result=tcprecvdata_nb(conn->sock, &header_proto,
-            sizeof(SFCommonProtoHeader), network_timeout)) != 0)
-    {
-        response->error.length = snprintf(response->error.message,
-                sizeof(response->error.message),
-                "recv data fail, errno: %d, error info: %s",
-                result, STRERROR(result));
-        return result;
-    }
+    if (conn->comm_type == fc_comm_type_rdma) {
+        buffer = G_RDMA_CONNECTION_CALLBACKS.get_recv_buffer(conn);
+        if (buffer->length < sizeof(SFCommonProtoHeader)) {
+            response->error.length = sprintf(response->error.message,
+                    "recv pkg length: %d < header size: %d",
+                    buffer->length, (int)sizeof(SFCommonProtoHeader));
+            return EINVAL;
+        }
 
-    if (!SF_PROTO_CHECK_MAGIC(header_proto.magic)) {
-        response->error.length = snprintf(response->error.message,
-                sizeof(response->error.message),
-                "magic "SF_PROTO_MAGIC_FORMAT" is invalid, "
-                "expect: "SF_PROTO_MAGIC_FORMAT,
-                SF_PROTO_MAGIC_PARAMS(header_proto.magic),
-                SF_PROTO_MAGIC_EXPECT_PARAMS);
-        return EINVAL;
-    }
+        if ((result=sf_proto_parse_header((SFCommonProtoHeader *)
+                        buffer->buff, response)) != 0)
+        {
+            return result;
+        }
 
-    sf_proto_extract_header(&header_proto, &response->header);
-    return 0;
+        if (buffer->length != (sizeof(SFCommonProtoHeader) +
+                    response->header.body_len))
+        {
+            response->error.length = snprintf(response->error.message,
+                    sizeof(response->error.message),
+                    "recv package length: %d != calculate: %d",
+                    buffer->length, (int)(sizeof(SFCommonProtoHeader) +
+                        response->header.body_len));
+            return EINVAL;
+        }
+
+        return 0;
+    } else {
+        if ((result=tcprecvdata_nb(conn->sock, &header_proto,
+                        sizeof(SFCommonProtoHeader), network_timeout)) != 0)
+        {
+            response->error.length = snprintf(response->error.message,
+                    sizeof(response->error.message),
+                    "recv data fail, errno: %d, error info: %s",
+                    result, STRERROR(result));
+            return result;
+        }
+        return sf_proto_parse_header(&header_proto, response);
+    }
 }
 
 int sf_send_and_recv_response_header(ConnectionInfo *conn, char *data,
@@ -127,11 +153,9 @@ int sf_send_and_recv_response_header(ConnectionInfo *conn, char *data,
 {
     int result;
 
-    if ((result=tcpsenddata_nb(conn->sock, data, len, network_timeout)) != 0) {
-        response->error.length = snprintf(response->error.message,
-                sizeof(response->error.message),
-                "send data fail, errno: %d, error info: %s",
-                result, STRERROR(result));
+    if ((result=sf_proto_send_buf1(conn, data, len,
+                    response, network_timeout)) != 0)
+    {
         return result;
     }
 
@@ -194,7 +218,10 @@ int sf_send_and_recv_response_ex(ConnectionInfo *conn, char *send_data,
         return 0;
     }
 
-    if ((result=tcprecvdata_nb_ex(conn->sock, recv_data, response->
+    if (conn->comm_type == fc_comm_type_rdma) {
+        memcpy(recv_data, G_RDMA_CONNECTION_CALLBACKS.get_recv_buffer(conn)->
+                buff + sizeof(SFCommonProtoHeader), response->header.body_len);
+    } else if ((result=tcprecvdata_nb_ex(conn->sock, recv_data, response->
                     header.body_len, network_timeout, &recv_bytes)) != 0)
     {
         response->error.length = snprintf(response->error.message,
@@ -234,7 +261,11 @@ int sf_send_and_recv_response_ex1(ConnectionInfo *conn, char *send_data,
         return EOVERFLOW;
     }
 
-    if ((result=tcprecvdata_nb_ex(conn->sock, recv_data, response->
+    if (conn->comm_type == fc_comm_type_rdma) {
+        memcpy(recv_data, G_RDMA_CONNECTION_CALLBACKS.get_recv_buffer(conn)->
+                buff + sizeof(SFCommonProtoHeader), response->header.body_len);
+        *body_len = response->header.body_len;
+    } else if ((result=tcprecvdata_nb_ex(conn->sock, recv_data, response->
                     header.body_len, network_timeout, body_len)) != 0)
     {
         response->error.length = snprintf(response->error.message,
@@ -275,7 +306,10 @@ int sf_recv_response(ConnectionInfo *conn, SFResponseInfo *response,
         return 0;
     }
 
-    if ((result=tcprecvdata_nb_ex(conn->sock, recv_data, expect_body_len,
+    if (conn->comm_type == fc_comm_type_rdma) {
+        memcpy(recv_data, G_RDMA_CONNECTION_CALLBACKS.get_recv_buffer(conn)->
+                buff + sizeof(SFCommonProtoHeader), response->header.body_len);
+    } else if ((result=tcprecvdata_nb_ex(conn->sock, recv_data, expect_body_len,
                     network_timeout, &recv_bytes)) != 0)
     {
         response->error.length = snprintf(response->error.message,
@@ -343,7 +377,10 @@ int sf_recv_vary_response(ConnectionInfo *conn, SFResponseInfo *response,
         buffer->alloc_size = alloc_size;
     }
 
-    if ((result=tcprecvdata_nb_ex(conn->sock, buffer->buff, response->
+    if (conn->comm_type == fc_comm_type_rdma) {
+        memcpy(buffer->buff, G_RDMA_CONNECTION_CALLBACKS.get_recv_buffer(conn)->
+                buff + sizeof(SFCommonProtoHeader), response->header.body_len);
+    } else if ((result=tcprecvdata_nb_ex(conn->sock, buffer->buff, response->
                     header.body_len, network_timeout, &recv_bytes)) != 0)
     {
         response->error.length = snprintf(response->error.message,
@@ -364,13 +401,9 @@ int sf_send_and_recv_vary_response(ConnectionInfo *conn,
 {
     int result;
 
-    if ((result=tcpsenddata_nb(conn->sock, send_data,
-                    send_len, network_timeout)) != 0)
+    if ((result=sf_proto_send_buf1(conn, send_data, send_len,
+                    response, network_timeout)) != 0)
     {
-        response->error.length = snprintf(response->error.message,
-                sizeof(response->error.message),
-                "send data fail, errno: %d, error info: %s",
-                result, STRERROR(result));
         return result;
     }
 
@@ -423,14 +456,17 @@ const char *sf_get_cmd_caption(const int cmd)
 int sf_proto_deal_ack(struct fast_task_info *task,
         SFRequestInfo *request, SFResponseInfo *response)
 {
+    char formatted_ip[FORMATTED_IP_SIZE];
+
     if (request->header.status != 0) {
         if (request->header.body_len > 0) {
             int remain_size;
             int len;
 
+            format_ip_address(task->client_ip, formatted_ip);
             response->error.length = sprintf(response->error.message,
                     "message from peer %s:%u => ",
-                    task->client_ip, task->port);
+                    formatted_ip, task->port);
             remain_size = sizeof(response->error.message) -
                 response->error.length;
             if (request->header.body_len >= remain_size) {
@@ -492,6 +528,7 @@ int sf_proto_get_group_servers(ConnectionInfo *conn,
     char out_buff[sizeof(SFCommonProtoHeader) +
         sizeof(SFProtoGetGroupServersReq)];
     char in_buff[1024];
+    char formatted_ip[FORMATTED_IP_SIZE];
     SFCommonProtoHeader *header;
     SFProtoGetGroupServersReq *req;
     SFProtoGetGroupServersRespBodyHeader *body_header;
@@ -519,9 +556,10 @@ int sf_proto_get_group_servers(ConnectionInfo *conn,
     }
 
     if (body_len < sizeof(SFProtoGetGroupServersRespBodyHeader)) {
+        format_ip_address(conn->ip_addr, formatted_ip);
         logError("file: "__FILE__", line: %d, "
-                "server %s:%d response body length: %d < %d",
-                __LINE__, conn->ip_addr, conn->port, body_len,
+                "server %s:%u response body length: %d < %d",
+                __LINE__, formatted_ip, conn->port, body_len,
                 (int)sizeof(SFProtoGetGroupServersRespBodyHeader));
         return EINVAL;
     }
@@ -529,15 +567,17 @@ int sf_proto_get_group_servers(ConnectionInfo *conn,
     body_header = (SFProtoGetGroupServersRespBodyHeader *)in_buff;
     count = buff2int(body_header->count);
     if (count <= 0) {
+        format_ip_address(conn->ip_addr, formatted_ip);
         logError("file: "__FILE__", line: %d, "
-                "server %s:%d response server count: %d <= 0",
-                __LINE__, conn->ip_addr, conn->port, count);
+                "server %s:%u response server count: %d <= 0",
+                __LINE__, formatted_ip, conn->port, count);
         return EINVAL;
     }
     if (count > sarray->alloc) {
+        format_ip_address(conn->ip_addr, formatted_ip);
         logError("file: "__FILE__", line: %d, "
-                "server %s:%d response server count: %d is too large, "
-                "exceeds %d", __LINE__, conn->ip_addr, conn->port,
+                "server %s:%u response server count: %d is too large, "
+                "exceeds %d", __LINE__, formatted_ip, conn->port,
                 count, sarray->alloc);
         return EOVERFLOW;
     }
@@ -577,6 +617,7 @@ int sf_proto_get_leader(ConnectionInfo *conn, const char *service_name,
         memcpy(leader->conn.ip_addr, server_resp.ip_addr, IP_ADDRESS_SIZE);
         *(leader->conn.ip_addr + IP_ADDRESS_SIZE - 1) = '\0';
         leader->conn.port = buff2short(server_resp.port);
+        leader->conn.comm_type = conn->comm_type;
     }
 
     return result;
@@ -589,20 +630,22 @@ void sf_proto_set_handler_context(const SFHandlerContext *ctx)
 }
 
 int sf_proto_deal_task_done(struct fast_task_info *task,
-        SFCommonTaskContext *ctx)
+        const char *service_name, SFCommonTaskContext *ctx)
 {
     SFCommonProtoHeader *proto_header;
     int status;
     int r;
     int64_t time_used;
     int log_level;
+    char formatted_ip[FORMATTED_IP_SIZE];
     char time_buff[32];
 
     if (ctx->log_level != LOG_NOTHING && ctx->response.error.length > 0) {
         log_it_ex(&g_log_context, ctx->log_level,
-                "file: "__FILE__", line: %d, "
+                "file: "__FILE__", line: %d, %s "
                 "peer %s:%u, cmd: %d (%s), req body length: %d, "
-                "resp status: %d, %s", __LINE__, task->client_ip,
+                "resp status: %d, %s", __LINE__, service_name,
+                format_ip_address(task->client_ip, formatted_ip),
                 task->port, ctx->request.header.cmd,
                 GET_CMD_CAPTION(ctx->request.header.cmd),
                 ctx->request.header.body_len, ctx->response.header.status,
@@ -614,36 +657,38 @@ int sf_proto_deal_task_done(struct fast_task_info *task,
             time_used = get_current_time_us() - ctx->req_start_time;
             log_level = GET_CMD_LOG_LEVEL(ctx->request.header.cmd);
             log_it_ex(&g_log_context, log_level, "file: "__FILE__", line: %d, "
-                    "client %s:%u, req cmd: %d (%s), req body_len: %d, "
-                    "resp status: %d, time used: %s us", __LINE__,
-                    task->client_ip, task->port, ctx->request.header.cmd,
+                    "%s client %s:%u, req cmd: %d (%s), req body_len: %d, "
+                    "resp status: %d, time used: %s us", __LINE__, service_name,
+                    format_ip_address(task->client_ip, formatted_ip),
+                    task->port, ctx->request.header.cmd,
                     GET_CMD_CAPTION(ctx->request.header.cmd),
                     ctx->request.header.body_len, ctx->response.header.status,
                     long_to_comma_str(time_used, time_buff));
         }
 
         if (ctx->response.header.status == 0) {
-            task->offset = task->length = 0;
             return sf_set_read_event(task);
         } else {
             return FC_NEGATIVE(ctx->response.header.status);
         }
     }
 
-    proto_header = (SFCommonProtoHeader *)task->data;
+    proto_header = (SFCommonProtoHeader *)task->send.ptr->data;
     if (!ctx->response_done) {
         ctx->response.header.body_len = ctx->response.error.length;
         if (ctx->response.error.length > 0) {
-            memcpy(task->data + sizeof(SFCommonProtoHeader),
+            memcpy(task->send.ptr->data + sizeof(SFCommonProtoHeader),
                     ctx->response.error.message, ctx->response.error.length);
         }
     }
 
     status = sf_unify_errno(FC_ABS(ctx->response.header.status));
     short2buff(status, proto_header->status);
+    short2buff(ctx->response.header.flags, proto_header->flags);
     proto_header->cmd = ctx->response.header.cmd;
     int2buff(ctx->response.header.body_len, proto_header->body_len);
-    task->length = sizeof(SFCommonProtoHeader) + ctx->response.header.body_len;
+    task->send.ptr->length = sizeof(SFCommonProtoHeader) +
+        ctx->response.header.body_len;
 
     r = sf_send_add_event(task);
     time_used = get_current_time_us() - ctx->req_start_time;
@@ -653,10 +698,11 @@ int sf_proto_deal_task_done(struct fast_task_info *task,
         char buff[256];
         int blen;
 
-        blen = sprintf(buff, "timed used: %s us, client %s:%u, "
+        blen = sprintf(buff, "timed used: %s us, %s client %s:%u, "
                 "req cmd: %d (%s), req body len: %d, resp cmd: %d (%s), "
                 "status: %d, resp body len: %d", long_to_comma_str(time_used,
-                    time_buff), task->client_ip, task->port, ctx->request.
+                    time_buff), service_name, format_ip_address(task->
+                        client_ip, formatted_ip), task->port, ctx->request.
                 header.cmd, GET_CMD_CAPTION(ctx->request.header.cmd),
                 ctx->request.header.body_len, ctx->response.header.cmd,
                 GET_CMD_CAPTION(ctx->response.header.cmd),
@@ -667,10 +713,11 @@ int sf_proto_deal_task_done(struct fast_task_info *task,
     if (sf_handler_ctx.callbacks.get_cmd_log_level != NULL) {
         log_level = GET_CMD_LOG_LEVEL(ctx->request.header.cmd);
         log_it_ex(&g_log_context, log_level, "file: "__FILE__", line: %d, "
-                "client %s:%u, req cmd: %d (%s), req body_len: %d, "
+                "%s client %s:%u, req cmd: %d (%s), req body_len: %d, "
                 "resp cmd: %d (%s), status: %d, resp body_len: %d, "
-                "time used: %s us", __LINE__,
-                task->client_ip, task->port, ctx->request.header.cmd,
+                "time used: %s us", __LINE__, service_name,
+                format_ip_address(task->client_ip, formatted_ip),
+                task->port, ctx->request.header.cmd,
                 GET_CMD_CAPTION(ctx->request.header.cmd),
                 ctx->request.header.body_len, ctx->response.header.cmd,
                 GET_CMD_CAPTION(ctx->response.header.cmd),

src/sf_proto.h

@@ -68,19 +68,17 @@
 #define SF_PROTO_MAGIC_PARAMS(m) \
     m[0], m[1], m[2], m[3]
 
-#define SF_PROTO_SET_HEADER(header, _cmd, _body_len) \
+#define SF_PROTO_SET_HEADER_EX(header, _cmd, _flags, _body_len) \
     do {  \
         SF_PROTO_SET_MAGIC((header)->magic);   \
         (header)->cmd = _cmd;      \
         (header)->status[0] = (header)->status[1] = 0; \
+        short2buff(_flags, (header)->flags); \
         int2buff(_body_len, (header)->body_len); \
     } while (0)
 
-#define SF_PROTO_SET_HEADER_EX(header, _cmd, _flags, _body_len) \
-    do {  \
-        SF_PROTO_SET_HEADER(header, _cmd, _body_len); \
-        short2buff(_flags, (header)->flags); \
-    } while (0)
+#define SF_PROTO_SET_HEADER(header, _cmd, _body_len) \
+        SF_PROTO_SET_HEADER_EX(header, _cmd, 0, _body_len)
 
 #define SF_PROTO_SET_RESPONSE_HEADER(proto_header, resp_header) \
     do {  \
@@ -89,8 +87,18 @@
         int2buff((resp_header).body_len, (proto_header)->body_len);\
     } while (0)
 
-#define SF_PROTO_RESP_BODY(task)  \
-    (task->data + sizeof(SFCommonProtoHeader))
+
+#define SF_PROTO_SEND_BODY(task)  \
+    (task->send.ptr->data + sizeof(SFCommonProtoHeader))
+
+#define SF_PROTO_RECV_BODY(task) \
+    (task->recv.ptr->data + sizeof(SFCommonProtoHeader))
+
+#define SF_RECV_BODY_LENGTH(task) \
+    (task->recv.ptr->length - sizeof(SFCommonProtoHeader))
+
+#define SF_SEND_BUFF_END(task) (task->send.ptr->data + task->send.ptr->size)
+#define SF_RECV_BUFF_END(task) (task->recv.ptr->data + task->recv.ptr->size)
 
 #define SF_PROTO_UPDATE_EXTRA_BODY_SIZE \
     sizeof(SFProtoIdempotencyAdditionalHeader) + FCFS_AUTH_SESSION_ID_LEN
@@ -280,7 +288,17 @@ int sf_proto_set_body_length(struct fast_task_info *task);
 const char *sf_get_cmd_caption(const int cmd);
 
 int sf_proto_deal_task_done(struct fast_task_info *task,
-        SFCommonTaskContext *ctx);
+        const char *service_name, SFCommonTaskContext *ctx);
+
+static inline void sf_proto_init_task_magic(struct fast_task_info *task)
+{
+    SF_PROTO_SET_MAGIC(((SFCommonProtoHeader *)
+                task->send.ptr->data)->magic);
+    if (task->recv.ptr != task->send.ptr) {
+        SF_PROTO_SET_MAGIC(((SFCommonProtoHeader *)
+                    task->recv.ptr->data)->magic);
+    }
+}
 
 static inline void sf_proto_init_task_context(struct fast_task_info *task,
         SFCommonTaskContext *ctx)
@@ -289,23 +307,125 @@ static inline void sf_proto_init_task_context(struct fast_task_info *task,
     ctx->response.header.cmd = SF_PROTO_ACK;
     ctx->response.header.body_len = 0;
     ctx->response.header.status = 0;
+    ctx->response.header.flags = 0;
     ctx->response.error.length = 0;
     ctx->response.error.message[0] = '\0';
     ctx->log_level = LOG_ERR;
     ctx->response_done = false;
     ctx->need_response = true;
 
-    ctx->request.header.cmd = ((SFCommonProtoHeader *)task->data)->cmd;
-    ctx->request.header.body_len = task->length - sizeof(SFCommonProtoHeader);
+    ctx->request.header.cmd = ((SFCommonProtoHeader *)
+            task->recv.ptr->data)->cmd;
+    ctx->request.header.body_len = SF_RECV_BODY_LENGTH(task);
     ctx->request.header.status = buff2short(((SFCommonProtoHeader *)
-                task->data)->status);
+                task->recv.ptr->data)->status);
+    ctx->request.header.flags = buff2short(((SFCommonProtoHeader *)
+                task->recv.ptr->data)->flags);
     if (task->recv_body != NULL) {
         ctx->request.body = task->recv_body;
     } else {
-        ctx->request.body = task->data + sizeof(SFCommonProtoHeader);
+        ctx->request.body = SF_PROTO_RECV_BODY(task);
     }
 }
 
+/* task send and recv buffer operations */
+static inline int sf_set_task_send_buffer_size(
+        struct fast_task_info *task, const int expect_size)
+{
+    int result;
+    if ((result=free_queue_set_buffer_size(task, task->send.ptr,
+                    expect_size)) == 0)
+    {
+        SF_PROTO_SET_MAGIC(((SFCommonProtoHeader *)
+                    task->send.ptr->data)->magic);
+    }
+    return result;
+}
+
+static inline int sf_set_task_recv_buffer_size(
+        struct fast_task_info *task, const int expect_size)
+{
+    int result;
+    if ((result=free_queue_set_buffer_size(task, task->recv.ptr,
+                    expect_size)) == 0)
+    {
+        SF_PROTO_SET_MAGIC(((SFCommonProtoHeader *)
+                    task->recv.ptr->data)->magic);
+    }
+    return result;
+}
+
+static inline int sf_set_task_send_max_buffer_size(
+        struct fast_task_info *task)
+{
+    int result;
+    if ((result=free_queue_set_max_buffer_size(task, task->send.ptr)) == 0) {
+        SF_PROTO_SET_MAGIC(((SFCommonProtoHeader *)
+                    task->send.ptr->data)->magic);
+    }
+    return result;
+}
+
+static inline int sf_set_task_recv_max_buffer_size(
+        struct fast_task_info *task)
+{
+    int result;
+    if ((result=free_queue_set_max_buffer_size(task, task->recv.ptr)) == 0) {
+        SF_PROTO_SET_MAGIC(((SFCommonProtoHeader *)
+                    task->recv.ptr->data)->magic);
+    }
+    return result;
+}
+
+static inline int sf_realloc_task_send_buffer(
+        struct fast_task_info *task, const int expect_size)
+{
+    int result;
+    if ((result=free_queue_realloc_buffer(task, task->send.ptr,
+                    expect_size)) == 0)
+    {
+        SF_PROTO_SET_MAGIC(((SFCommonProtoHeader *)
+                    task->send.ptr->data)->magic);
+    }
+    return result;
+}
+
+static inline int sf_realloc_task_recv_buffer(
+        struct fast_task_info *task, const int expect_size)
+{
+    int result;
+    if ((result=free_queue_realloc_buffer(task, task->recv.ptr,
+                    expect_size)) == 0)
+    {
+        SF_PROTO_SET_MAGIC(((SFCommonProtoHeader *)
+                    task->recv.ptr->data)->magic);
+    }
+    return result;
+}
+
+static inline int sf_realloc_task_send_max_buffer(
+        struct fast_task_info *task)
+{
+    int result;
+    if ((result=free_queue_realloc_max_buffer(task, task->send.ptr)) == 0) {
+        SF_PROTO_SET_MAGIC(((SFCommonProtoHeader *)
+                    task->send.ptr->data)->magic);
+    }
+    return result;
+}
+
+static inline int sf_realloc_task_recv_max_buffer(
+        struct fast_task_info *task)
+{
+    int result;
+    if ((result=free_queue_realloc_max_buffer(task, task->recv.ptr)) == 0) {
+        SF_PROTO_SET_MAGIC(((SFCommonProtoHeader *)
+                    task->recv.ptr->data)->magic);
+    }
+    return result;
+}
+
+
 static inline void sf_log_network_error_ex1(SFResponseInfo *response,
         const ConnectionInfo *conn, const char *service_name,
         const int result, const int log_level,
@@ -338,15 +458,16 @@ static inline void sf_log_network_error_ex1(SFResponseInfo *response,
     sf_log_network_error_ex1(response, conn, service_name, result, \
             LOG_ERR, __FILE__, __LINE__)
 
-#define sf_log_network_error_for_update_ex(response, \
-        conn, service_name, result, file, line) \
+#define sf_log_network_error_for_update_ex(response, conn,  \
+        service_name, result, enoent_log_level, file, line) \
         sf_log_network_error_ex1(response, conn, service_name, result, \
-                (result == SF_RETRIABLE_ERROR_CHANNEL_INVALID) ? \
-                LOG_DEBUG : LOG_ERR, file, line)
+                (result == SF_RETRIABLE_ERROR_CHANNEL_INVALID) ?       \
+                LOG_DEBUG : ((result == ENOENT || result == ENODATA) ? \
+                    enoent_log_level : LOG_ERR), file, line)
 
 #define sf_log_network_error_for_update(response, conn, service_name, result) \
-    sf_log_network_error_for_update_ex(response, conn, \
-            service_name, result, __FILE__, __LINE__)
+    sf_log_network_error_for_update_ex(response, conn, service_name, \
+            result, LOG_ERR, __FILE__, __LINE__)
 
 #define sf_log_network_error_for_delete_ex(response, conn,   \
         service_name, result, enoent_log_level, file, line)  \
@@ -441,6 +562,16 @@ int sf_recv_response(ConnectionInfo *conn, SFResponseInfo *response,
         const int network_timeout, const unsigned char expect_cmd,
         char *recv_data, const int expect_body_len);
 
+static inline int sf_recv_none_body_response(ConnectionInfo *conn,
+        SFResponseInfo *response, const int network_timeout,
+        const unsigned char expect_cmd)
+{
+    char *recv_data = NULL;
+    const int expect_body_len = 0;
+    return sf_recv_response(conn, response, network_timeout,
+            expect_cmd, recv_data, expect_body_len);
+}
+
 int sf_recv_vary_response(ConnectionInfo *conn, SFResponseInfo *response,
         const int network_timeout, const unsigned char expect_cmd,
         SFProtoRecvBuffer *buffer, const int min_body_len);
@@ -475,6 +606,56 @@ static inline void sf_free_recv_buffer(SFProtoRecvBuffer *buffer)
     }
 }
 
+static inline int sf_proto_send_buf1(ConnectionInfo *conn, char *data,
+        const int len, SFResponseInfo *response, const int network_timeout)
+{
+    int result;
+
+    if (conn->comm_type == fc_comm_type_rdma) {
+        result = G_RDMA_CONNECTION_CALLBACKS.request_by_buf1(
+                conn, data, len, network_timeout * 1000);
+    } else {
+        result = tcpsenddata_nb(conn->sock, data, len, network_timeout);
+    }
+    if (result != 0) {
+        response->error.length = snprintf(response->error.message,
+                sizeof(response->error.message),
+                "send data fail, errno: %d, error info: %s",
+                result, STRERROR(result));
+    }
+
+    return result;
+}
+
+static inline int sf_proto_send_buf2(ConnectionInfo *conn, char *buff1,
+        const int length1, char *buff2, const int length2,
+        SFResponseInfo *response, const int network_timeout)
+{
+    int result;
+
+    if (conn->comm_type == fc_comm_type_rdma) {
+        result = G_RDMA_CONNECTION_CALLBACKS.request_by_buf2(
+                conn, buff1, length1, buff2, length2,
+                network_timeout * 1000);
+    } else {
+        if ((result=tcpsenddata_nb(conn->sock, buff1, length1,
+                        network_timeout)) == 0)
+        {
+            result = tcpsenddata_nb(conn->sock, buff2, length2,
+                    network_timeout);
+        }
+    }
+
+    if (result != 0) {
+        response->error.length = snprintf(response->error.message,
+                sizeof(response->error.message),
+                "send data fail, errno: %d, error info: %s",
+                result, STRERROR(result));
+    }
+
+    return result;
+}
+
 int sf_send_and_recv_response_header(ConnectionInfo *conn, char *data,
         const int len, SFResponseInfo *response, const int network_timeout);
 
@@ -535,16 +716,27 @@ int sf_send_and_recv_vary_response(ConnectionInfo *conn,
         const int network_timeout, const unsigned char expect_cmd,
         SFProtoRecvBuffer *buffer, const int min_body_len);
 
-static inline void sf_proto_extract_header(const SFCommonProtoHeader
-        *header_proto, SFHeaderInfo *header_info)
+static inline int sf_proto_parse_header(const SFCommonProtoHeader
+        *header_proto, SFResponseInfo *response)
 {
-    header_info->cmd = header_proto->cmd;
-    header_info->body_len = buff2int(header_proto->body_len);
-    header_info->flags = buff2short(header_proto->flags);
-    header_info->status = buff2short(header_proto->status);
-    if (header_info->status > 255) {
-        header_info->status = sf_localize_errno(header_info->status);
+    if (!SF_PROTO_CHECK_MAGIC(header_proto->magic)) {
+        response->error.length = snprintf(response->error.message,
+                sizeof(response->error.message),
+                "magic "SF_PROTO_MAGIC_FORMAT" is invalid, "
+                "expect: "SF_PROTO_MAGIC_FORMAT,
+                SF_PROTO_MAGIC_PARAMS(header_proto->magic),
+                SF_PROTO_MAGIC_EXPECT_PARAMS);
+        return EINVAL;
     }
+
+    response->header.cmd = header_proto->cmd;
+    response->header.body_len = buff2int(header_proto->body_len);
+    response->header.flags = buff2short(header_proto->flags);
+    response->header.status = buff2short(header_proto->status);
+    if (response->header.status > 255) {
+        response->header.status = sf_localize_errno(response->header.status);
+    }
+    return 0;
 }
 
 static inline void sf_proto_pack_limit(const SFListLimitInfo

src/sf_serializer.h

@@ -21,6 +21,7 @@
 #include "fastcommon/common_define.h"
 #include "fastcommon/shared_func.h"
 #include "fastcommon/fast_buffer.h"
+#include "fastcommon/uniq_skiplist.h"
 #include "fastcommon/hash.h"
 
 #define SF_SERIALIZER_VALUE_TYPE_COUNT  12
@@ -438,6 +439,44 @@ static inline int sf_serializer_pack_id_name_array(FastBuffer *buffer,
     return 0;
 }
 
+static inline int sf_serializer_pack_id_name_skiplist(
+        FastBuffer *buffer, const unsigned char fid,
+        UniqSkiplist *sl)
+{
+    int result;
+    int length;
+    SFSerializerPackFieldArray *obj;
+    const id_name_pair_t *pair;
+    UniqSkiplistIterator it;
+    char *p;
+
+    length = sizeof(SFSerializerPackFieldArray);
+    uniq_skiplist_iterator(sl, &it);
+    while ((pair=uniq_skiplist_next(&it)) != NULL) {
+        length += sizeof(int64_t) + pair->name.len +
+            sizeof(SFSerializerPackStringValue);
+    }
+
+    if ((result=fast_buffer_check_inc_size(buffer, length)) != 0) {
+        return result;
+    }
+
+    obj = (SFSerializerPackFieldArray *)(buffer->data + buffer->length);
+    obj->field.id = fid;
+    obj->field.type = sf_serializer_value_type_id_name_array;
+    int2buff(uniq_skiplist_count(sl), obj->value.count);
+
+    p = obj->value.ptr;
+    uniq_skiplist_iterator(sl, &it);
+    while ((pair=uniq_skiplist_next(&it)) != NULL) {
+        long2buff(pair->id, p);
+        p += sizeof(int64_t);
+        SF_SERIALIZER_PACK_STRING_AND_MOVE_PTR(p, &pair->name);
+    }
+    buffer->length += length;
+    return 0;
+}
+
 static inline int sf_serializer_pack_map(FastBuffer *buffer,
         const unsigned char fid, const key_value_pair_t *kv_pairs,
         const int count)

src/sf_service.c

@@ -25,6 +25,7 @@
 #include <string.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <ifaddrs.h>
 #include "fastcommon/logger.h"
 #include "fastcommon/sockopt.h"
 #include "fastcommon/shared_func.h"
@@ -32,9 +33,8 @@
 #include "fastcommon/sched_thread.h"
 #include "fastcommon/ioevent_loop.h"
 #include "fastcommon/fc_memory.h"
-#include "sf_nio.h"
+#include "sf_proto.h"
 #include "sf_util.h"
-#include "sf_global.h"
 #include "sf_service.h"
 
 #if defined(OS_LINUX)
@@ -57,62 +57,46 @@ struct worker_thread_context {
     struct nio_thread_data *thread_data;
 };
 
-struct accept_thread_context {
-    SFContext *sf_context;
-    int server_sock;
-};
-
-
-int sf_init_task(struct fast_task_info *task)
-{
-    task->connect_timeout = SF_G_CONNECT_TIMEOUT; //for client side
-    task->network_timeout = SF_G_NETWORK_TIMEOUT;
-    return 0;
-}
-
 static void *worker_thread_entrance(void *arg);
 
-static int sf_init_free_queues(const int task_arg_size,
-        TaskInitCallback init_callback)
+static int sf_init_free_queue(SFContext *sf_context, const char *name,
+        const bool double_buffers, const bool need_shrink_task_buffer,
+        const int task_padding_size, const int task_arg_size,
+        TaskInitCallback init_callback, void *init_arg)
 {
-#define ALLOC_CONNECTIONS_ONCE 1024
-
-    static bool sf_inited = false;
     int result;
+    int buffer_size;
     int m;
-    int init_connections;
+    int max_m;
     int alloc_conn_once;
 
-    if (sf_inited) {
-        return 0;
-    }
-
-    sf_inited = true;
     if ((result=set_rand_seed()) != 0) {
         logCrit("file: "__FILE__", line: %d, "
                 "set_rand_seed fail, program exit!", __LINE__);
         return result;
     }
 
-    m = g_sf_global_vars.min_buff_size / (64 * 1024);
+    if (strcmp(name, "cluster") == 0 || strcmp(name, "replica") == 0) {
+        buffer_size = FC_MAX(4 * 1024 * 1024, sf_context->
+                net_buffer_cfg.max_buff_size);
+        max_m = 64;
+    } else {
+        buffer_size = sf_context->net_buffer_cfg.min_buff_size;
+        max_m = 16;
+    }
+    m = buffer_size / (64 * 1024);
     if (m == 0) {
         m = 1;
-    } else if (m > 16) {
-        m = 16;
-    }
-    alloc_conn_once = ALLOC_CONNECTIONS_ONCE / m;
-    init_connections = g_sf_global_vars.max_connections < alloc_conn_once ?
-        g_sf_global_vars.max_connections : alloc_conn_once;
-    if ((result=free_queue_init_ex2(g_sf_global_vars.max_connections,
-                    init_connections, alloc_conn_once, g_sf_global_vars.
-                    min_buff_size, g_sf_global_vars.max_buff_size,
-                    task_arg_size, init_callback != NULL ?
-                    init_callback : sf_init_task)) != 0)
-    {
-        return result;
+    } else if (m > max_m) {
+        m = max_m;
     }
+    alloc_conn_once = 256 / m;
 
-    return 0;
+    return free_queue_init_ex2(&sf_context->free_queue, name, double_buffers,
+            need_shrink_task_buffer, sf_context->net_buffer_cfg.max_connections,
+            alloc_conn_once, sf_context->net_buffer_cfg.min_buff_size,
+            sf_context->net_buffer_cfg.max_buff_size, task_padding_size,
+            task_arg_size, init_callback, init_arg);
 }
 
 int sf_service_init_ex2(SFContext *sf_context, const char *name,
@@ -123,15 +107,19 @@ int sf_service_init_ex2(SFContext *sf_context, const char *name,
         sf_set_body_length_callback set_body_length_func,
         sf_alloc_recv_buffer_callback alloc_recv_buffer_func,
         sf_send_done_callback send_done_callback,
-        sf_deal_task_func deal_func, TaskCleanUpCallback task_cleanup_func,
+        sf_deal_task_callback deal_func, TaskCleanUpCallback task_cleanup_func,
         sf_recv_timeout_callback timeout_callback, const int net_timeout_ms,
-        const int proto_header_size, const int task_arg_size,
-        TaskInitCallback init_callback, sf_release_buffer_callback
-        release_buffer_callback)
+        const int proto_header_size, const int task_padding_size,
+        const int task_arg_size, const bool double_buffers,
+        const bool need_shrink_task_buffer, const bool explicit_post_recv,
+        TaskInitCallback init_callback, void *init_arg,
+        sf_release_buffer_callback release_buffer_callback)
 {
     int result;
     int bytes;
     int extra_events;
+    int max_entries;
+    int i;
     struct worker_thread_context *thread_contexts;
     struct worker_thread_context *thread_ctx;
     struct nio_thread_data *thread_data;
@@ -139,16 +127,26 @@ int sf_service_init_ex2(SFContext *sf_context, const char *name,
     pthread_t tid;
     pthread_attr_t thread_attr;
 
-    snprintf(sf_context->name, sizeof(sf_context->name), "%s", name);
-    sf_context->realloc_task_buffer = g_sf_global_vars.
-                    min_buff_size < g_sf_global_vars.max_buff_size;
-    sf_context->accept_done_func = accept_done_callback;
+    fc_safe_strcpy(sf_context->name, name);
+    sf_context->connect_need_log = true;
+    sf_context->realloc_task_buffer = sf_context->net_buffer_cfg.
+        min_buff_size < sf_context->net_buffer_cfg.max_buff_size;
+    sf_context->callbacks.accept_done = accept_done_callback;
     sf_set_parameters_ex(sf_context, proto_header_size,
             set_body_length_func, alloc_recv_buffer_func,
             send_done_callback, deal_func, task_cleanup_func,
             timeout_callback, release_buffer_callback);
+    if (explicit_post_recv) {
+        for (i=0; i<SF_ADDRESS_FAMILY_COUNT; i++) {
+            sf_context->handlers[i].handlers[SF_RDMACM_NETWORK_HANDLER_INDEX].
+                explicit_post_recv = true;
+        }
+    }
 
-    if ((result=sf_init_free_queues(task_arg_size, init_callback)) != 0) {
+    if ((result=sf_init_free_queue(sf_context, name, double_buffers,
+                    need_shrink_task_buffer, task_padding_size,
+                    task_arg_size, init_callback, init_arg)) != 0)
+    {
         return result;
     }
 
@@ -175,7 +173,11 @@ int sf_service_init_ex2(SFContext *sf_context, const char *name,
 
     if (SF_G_EPOLL_EDGE_TRIGGER) {
 #ifdef OS_LINUX
+#if IOEVENT_USE_EPOLL
         extra_events = EPOLLET;
+#else
+        extra_events = 0;
+#endif
 #elif defined(OS_FREEBSD)
         extra_events = EV_CLEAR;
 #else
@@ -185,12 +187,55 @@ int sf_service_init_ex2(SFContext *sf_context, const char *name,
         extra_events = 0;
     }
 
+    max_entries = (sf_context->net_buffer_cfg.max_connections +
+            sf_context->work_threads - 1) / sf_context->work_threads;
+    if (strcmp(sf_context->name, "cluster") == 0 ||
+            strcmp(sf_context->name, "replica") == 0)
+    {
+        if (max_entries < 1024) {
+            max_entries += 8;
+        } else {
+            max_entries = 1024;
+        }
+    } else {
+        if (max_entries < 4 * 1024) {
+            max_entries = max_entries * 2;
+        } else if (max_entries < 8 * 1024) {
+            max_entries = (max_entries * 3) / 2;
+        } else if (max_entries < 16 * 1024) {
+            max_entries = (max_entries * 5) / 4;
+        } else if (max_entries < 32 * 1024) {
+            max_entries = (max_entries * 6) / 5;
+        } else if (max_entries < 64 * 1024) {
+            max_entries = (max_entries * 11) / 10;
+        } else if (max_entries < 128 * 1024) {
+            max_entries = (max_entries * 21) / 20;
+        }
+
+#if IOEVENT_USE_URING
+        if (sf_context->use_io_uring) {
+            if (max_entries > 32 * 1024) {
+                max_entries = 32 * 1024;
+            }
+        }
+#endif
+    }
+
     g_current_time = time(NULL);
     sf_context->thread_count = 0;
     data_end = sf_context->thread_data + sf_context->work_threads;
     for (thread_data=sf_context->thread_data,thread_ctx=thread_contexts;
             thread_data<data_end; thread_data++,thread_ctx++)
     {
+        thread_data->timeout_ms = net_timeout_ms;
+        FC_INIT_LIST_HEAD(&thread_data->polling_queue);
+        if (sf_context->smart_polling.enabled) {
+            thread_data->busy_polling_callback =
+                sf_rdma_busy_polling_callback;
+        } else {
+            thread_data->busy_polling_callback = NULL;
+        }
+
         thread_data->thread_loop_callback = thread_loop_callback;
         if (alloc_thread_extra_data_callback != NULL) {
             thread_data->arg = alloc_thread_extra_data_callback(
@@ -200,19 +245,45 @@ int sf_service_init_ex2(SFContext *sf_context, const char *name,
             thread_data->arg = NULL;
         }
 
-        if (ioevent_init(&thread_data->ev_puller, 2 + g_sf_global_vars.
-                    max_connections, net_timeout_ms, extra_events) != 0)
+        if ((result=ioevent_init(&thread_data->ev_puller, sf_context->
+                        name, sf_context->use_io_uring, max_entries,
+                        net_timeout_ms, extra_events)) != 0)
         {
-            result  = errno != 0 ? errno : ENOMEM;
+            char prompt[256];
+#if IOEVENT_USE_URING
+            if (sf_context->use_io_uring) {
+                if (result == EPERM) {
+                    strcpy(prompt, " make sure kernel."
+                            "io_uring_disabled set to 0");
+                } else if (result == EINVAL) {
+                    sprintf(prompt, " maybe max_connections: %d is too large"
+                            " or [%s]'s work_threads: %d is too small",
+                            sf_context->net_buffer_cfg.max_connections,
+                            sf_context->name, sf_context->work_threads);
+                } else {
+                    *prompt = '\0';
+                }
+            } else {
+#endif
+                *prompt = '\0';
+#if IOEVENT_USE_URING
+            }
+#endif
+
             logError("file: "__FILE__", line: %d, "
-                "ioevent_init fail, "
-                "errno: %d, error info: %s",
-                __LINE__, result, strerror(result));
+                "ioevent_init fail, errno: %d, error info: %s.%s"
+                , __LINE__, result, strerror(result), prompt);
             return result;
         }
 
-        result = fast_timer_init(&thread_data->timer,
-                2 * g_sf_global_vars.network_timeout, g_current_time);
+#if IOEVENT_USE_URING
+        if (sf_context->use_io_uring && send_done_callback != NULL) {
+            ioevent_set_send_zc_done_notify(&thread_data->ev_puller, true);
+        }
+#endif
+
+        result = fast_timer_init(&thread_data->timer, 2 * sf_context->
+                net_buffer_cfg.network_timeout, g_current_time);
         if (result != 0) {
             logError("file: "__FILE__", line: %d, "
                     "fast_timer_init fail, errno: %d, error info: %s",
@@ -277,7 +348,7 @@ int sf_service_destroy_ex(SFContext *sf_context)
 {
     struct nio_thread_data *data_end, *thread_data;
 
-    free_queue_destroy();
+    free_queue_destroy(&sf_context->free_queue);
     data_end = sf_context->thread_data + sf_context->work_threads;
     for (thread_data=sf_context->thread_data; thread_data<data_end;
             thread_data++)
@@ -330,7 +401,7 @@ static void *worker_thread_entrance(void *arg)
 
     ioevent_loop(thread_ctx->thread_data,
             sf_recv_notify_read,
-            thread_ctx->sf_context->task_cleanup_func,
+            thread_ctx->sf_context->callbacks.task_cleanup,
             &g_sf_global_vars.continue_flag);
     ioevent_destroy(&thread_ctx->thread_data->ev_puller);
 
@@ -345,15 +416,20 @@ static void *worker_thread_entrance(void *arg)
     return NULL;
 }
 
-static int _socket_server(const char *bind_addr, int port, int *sock)
+int sf_socket_create_server(SFListener *listener,
+        int af, const char *bind_addr)
 {
     int result;
-    *sock = socketServer(bind_addr, port, &result);
-    if (*sock < 0) {
+
+    listener->sock = socketServer2(af, bind_addr,
+            listener->port, &result);
+    if (listener->sock < 0) {
         return result;
     }
 
-    if ((result=tcpsetserveropt(*sock, SF_G_NETWORK_TIMEOUT)) != 0) {
+    if ((result=tcpsetserveropt(listener->sock, listener->handler->
+                    fh->ctx->net_buffer_cfg.network_timeout)) != 0)
+    {
         return result;
     }
 
@@ -363,133 +439,215 @@ static int _socket_server(const char *bind_addr, int port, int *sock)
 int sf_socket_server_ex(SFContext *sf_context)
 {
     int result;
+    int i;
+    bool dual_ports;
     const char *bind_addr;
+    SFAddressFamilyHandler *fh;
+    SFNetworkHandler *handler;
+    SFNetworkHandler *end;
 
-    sf_context->inner_sock = sf_context->outer_sock = -1;
-    if (sf_context->outer_port == sf_context->inner_port) {
-        if (*sf_context->outer_bind_addr == '\0' ||
-                *sf_context->inner_bind_addr == '\0') {
-            bind_addr = "";
-            return _socket_server(bind_addr, sf_context->outer_port,
-                    &sf_context->outer_sock);
-        } else if (strcmp(sf_context->outer_bind_addr,
-                    sf_context->inner_bind_addr) == 0) {
-            bind_addr = sf_context->outer_bind_addr;
-            if (is_private_ip(bind_addr)) {
-                return _socket_server(bind_addr, sf_context->
-                        inner_port, &sf_context->inner_sock);
-            } else {
-                return _socket_server(bind_addr, sf_context->
-                        outer_port, &sf_context->outer_sock);
-            }
+    for (i=0; i<SF_ADDRESS_FAMILY_COUNT; i++) {
+        fh = sf_context->handlers + i;
+        if (fh->af == AF_UNSPEC) {
+            continue;
         }
-    }
 
-    if ((result=_socket_server(sf_context->outer_bind_addr,
-                    sf_context->outer_port, &sf_context->outer_sock)) != 0)
-    {
-        return result;
-    }
+        end = fh->handlers + SF_NETWORK_HANDLER_COUNT;
+        for (handler=fh->handlers; handler<end; handler++) {
+            if (!handler->enabled) {
+                continue;
+            }
 
-    if ((result=_socket_server(sf_context->inner_bind_addr,
-                    sf_context->inner_port, &sf_context->inner_sock)) != 0)
-    {
-        return result;
+            handler->inner.enabled = false;
+            handler->outer.enabled = false;
+            if (handler->outer.port == handler->inner.port) {
+                if (*fh->outer_bind_addr == '\0' ||
+                        *fh->inner_bind_addr == '\0')
+                {
+                    bind_addr = "";
+                    if ((result=handler->create_server(&handler->
+                                    outer, fh->af, bind_addr)) != 0)
+                    {
+                        return result;
+                    }
+                    handler->outer.enabled = true;
+                    dual_ports = false;
+                } else if (strcmp(fh->outer_bind_addr,
+                            fh->inner_bind_addr) == 0)
+                {
+                    bind_addr = fh->outer_bind_addr;
+                    if (is_private_ip(bind_addr)) {
+                        if ((result=handler->create_server(&handler->
+                                        inner, fh->af, bind_addr)) != 0)
+                        {
+                            return result;
+                        }
+                        handler->inner.enabled = true;
+                    } else {
+                        if ((result=handler->create_server(&handler->
+                                        outer, fh->af, bind_addr)) != 0)
+                        {
+                            return result;
+                        }
+                        handler->outer.enabled = true;
+                    }
+                    dual_ports = false;
+                } else {
+                    dual_ports = true;
+                }
+            } else {
+                dual_ports = true;
+            }
+
+            if (dual_ports) {
+                if ((result=handler->create_server(&handler->outer,
+                                fh->af, fh->outer_bind_addr)) != 0)
+                {
+                    return result;
+                }
+
+                if ((result=handler->create_server(&handler->inner,
+                                fh->af, fh->inner_bind_addr)) != 0)
+                {
+                    return result;
+                }
+                handler->inner.enabled = true;
+                handler->outer.enabled = true;
+            }
+
+            /*
+               logInfo("%p [%d] inner {port: %d, enabled: %d}, "
+               "outer {port: %d, enabled: %d}", sf_context,
+               (int)(handler-sf_context->handlers),
+               handler->inner.port, handler->inner.enabled,
+               handler->outer.port, handler->outer.enabled);
+             */
+        }
     }
 
     return 0;
 }
 
-void sf_socket_close_ex(SFContext *sf_context)
+void sf_socket_close_server(SFListener *listener)
 {
-    if (sf_context->inner_sock >= 0) {
-        close(sf_context->inner_sock);
-        sf_context->inner_sock = -1;
-    }
-
-    if (sf_context->outer_sock >= 0) {
-        close(sf_context->outer_sock);
-        sf_context->outer_sock = -1;
+    if (listener->sock >= 0) {
+        close(listener->sock);
+        listener->sock = -1;
     }
 }
 
-static void accept_run(struct accept_thread_context *accept_context)
+struct fast_task_info *sf_socket_accept_connection(SFListener *listener)
 {
     int incomesock;
     int port;
-    struct sockaddr_in inaddr;
     socklen_t sockaddr_len;
     struct fast_task_info *task;
 
-    while (g_sf_global_vars.continue_flag) {
-        sockaddr_len = sizeof(inaddr);
-        incomesock = accept(accept_context->server_sock,
-                (struct sockaddr*)&inaddr, &sockaddr_len);
-        if (incomesock < 0) { //error
-            if (!(errno == EINTR || errno == EAGAIN)) {
-                logError("file: "__FILE__", line: %d, "
-                        "accept fail, errno: %d, error info: %s",
-                        __LINE__, errno, strerror(errno));
+    sockaddr_len = sizeof(listener->inaddr);
+    incomesock = accept(listener->sock, (struct sockaddr *)
+            &listener->inaddr, &sockaddr_len);
+    if (incomesock < 0) { //error
+        if (!(errno == EINTR || errno == EAGAIN)) {
+            logError("file: "__FILE__", line: %d, "
+                    "accept fail, errno: %d, error info: %s",
+                    __LINE__, errno, strerror(errno));
+        }
+
+        return NULL;
+    }
+
+    if (tcpsetnonblockopt(incomesock) != 0) {
+        close(incomesock);
+        return NULL;
+    }
+    FC_SET_CLOEXEC(incomesock);
+
+    if ((task=sf_alloc_init_server_task(listener->handler,
+                    incomesock)) == NULL)
+    {
+        close(incomesock);
+        return NULL;
+    }
+
+    getPeerIpAddPort(incomesock, task->client_ip,
+            sizeof(task->client_ip), &port);
+    task->port = port;
+    return task;
+}
+
+void sf_socket_close_ex(SFContext *sf_context)
+{
+    int i;
+    SFNetworkHandler *handler;
+    SFNetworkHandler *end;
+
+    for (i=0; i<SF_ADDRESS_FAMILY_COUNT; i++) {
+        if (sf_context->handlers[i].af == AF_UNSPEC) {
+            continue;
+        }
+
+        end = sf_context->handlers[i].handlers + SF_NETWORK_HANDLER_COUNT;
+        for (handler=sf_context->handlers[i].handlers; handler<end; handler++) {
+            if (!handler->enabled) {
+                continue;
             }
 
+            if (handler->outer.enabled) {
+                handler->close_server(&handler->outer);
+            }
+            if (handler->inner.enabled) {
+                handler->close_server(&handler->inner);
+            }
+        }
+    }
+}
+
+static void accept_run(SFListener *listener)
+{
+    struct fast_task_info *task;
+
+    while (g_sf_global_vars.continue_flag) {
+        if ((task=listener->handler->accept_connection(listener)) == NULL) {
             continue;
         }
 
-        if (tcpsetnonblockopt(incomesock) != 0) {
-            close(incomesock);
-            continue;
-        }
-        FC_SET_CLOEXEC(incomesock);
-
-        if ((task=sf_alloc_init_task(accept_context->
-                        sf_context, incomesock)) == NULL)
-        {
-            close(incomesock);
-            continue;
-        }
-
-        getPeerIpAddPort(incomesock, task->client_ip,
-                sizeof(task->client_ip), &port);
-        task->port = port;
-        task->thread_data = accept_context->sf_context->thread_data +
-            incomesock % accept_context->sf_context->work_threads;
-        if (accept_context->sf_context->accept_done_func != NULL) {
-            if (accept_context->sf_context->accept_done_func(task,
-                        inaddr.sin_addr.s_addr,
-                        accept_context->server_sock ==
-                        accept_context->sf_context->inner_sock) != 0)
+        task->thread_data = listener->handler->fh->ctx->thread_data +
+            task->event.fd % listener->handler->fh->ctx->work_threads;
+        if (listener->handler->fh->ctx->callbacks.accept_done != NULL) {
+            if (listener->handler->fh->ctx->callbacks.accept_done(task,
+                        listener->inaddr.sin_addr.s_addr,
+                        listener->is_inner) != 0)
             {
-                close(incomesock);
+                listener->handler->close_connection(task);
                 sf_release_task(task);
                 continue;
             }
         }
 
         if (sf_nio_notify(task, SF_NIO_STAGE_INIT) != 0) {
-            close(incomesock);
+            listener->handler->close_connection(task);
             sf_release_task(task);
         }
     }
 }
 
-static void *accept_thread_entrance(struct accept_thread_context
-        *accept_context)
+static void *accept_thread_entrance(SFListener *listener)
 {
 #ifdef OS_LINUX
     {
         char thread_name[32];
-        snprintf(thread_name, sizeof(thread_name), "%s-listen",
-                accept_context->sf_context->name);
+        snprintf(thread_name, sizeof(thread_name), "%s-%s-listen",
+                listener->handler->comm_type == fc_comm_type_sock ?
+                "sock" : "rdma", listener->handler->fh->ctx->name);
         prctl(PR_SET_NAME, thread_name);
     }
 #endif
 
-    accept_run(accept_context);
+    accept_run(listener);
     return NULL;
 }
 
-void _accept_loop(struct accept_thread_context *accept_context,
-        const int accept_threads)
+int _accept_loop(SFListener *listener, const int accept_threads)
 {
     pthread_t tid;
     pthread_attr_t thread_attr;
@@ -497,7 +655,7 @@ void _accept_loop(struct accept_thread_context *accept_context,
     int i;
 
     if (accept_threads <= 0) {
-       return;
+        return 0;
     }
 
     if ((result=init_pthread_attr(&thread_attr, g_sf_global_vars.
@@ -505,68 +663,83 @@ void _accept_loop(struct accept_thread_context *accept_context,
     {
         logWarning("file: "__FILE__", line: %d, "
                 "init_pthread_attr fail!", __LINE__);
+        return result;
     }
-    else {
-        for (i=0; i<accept_threads; i++) {
-            if ((result=pthread_create(&tid, &thread_attr,
-                            (void * (*)(void *))accept_thread_entrance,
-                            accept_context)) != 0)
-            {
-                logError("file: "__FILE__", line: %d, "
-                        "create thread failed, startup threads: %d, "
-                        "errno: %d, error info: %s",
-                        __LINE__, i, result, strerror(result));
-                break;
-            }
-        }
 
-        pthread_attr_destroy(&thread_attr);
+    for (i=0; i<accept_threads; i++) {
+        if ((result=pthread_create(&tid, &thread_attr,
+                        (void * (*)(void *))accept_thread_entrance,
+                        listener)) != 0)
+        {
+            logError("file: "__FILE__", line: %d, "
+                    "create thread failed, startup threads: %d, "
+                    "errno: %d, error info: %s",
+                    __LINE__, i, result, strerror(result));
+            return result;
+        }
     }
+
+    pthread_attr_destroy(&thread_attr);
+    return 0;
 }
 
-void sf_accept_loop_ex(SFContext *sf_context, const bool block)
+int sf_accept_loop_ex(SFContext *sf_context, const bool blocked)
 {
-    struct accept_thread_context *accept_contexts;
-    int count;
-    int bytes;
+    int i;
+    SFNetworkHandler *handler;
+    SFNetworkHandler *hend;
+    SFListener *listeners[SF_ADDRESS_FAMILY_COUNT *
+        SF_NETWORK_HANDLER_COUNT * 2];
+    SFListener **listener;
+    SFListener **last;
+    SFListener **lend;
 
-    if (sf_context->outer_sock >= 0) {
-        count = 2;
+    listener = listeners;
+    for (i=0; i<SF_ADDRESS_FAMILY_COUNT; i++) {
+        if (sf_context->handlers[i].af == AF_UNSPEC) {
+            continue;
+        }
+
+        hend = sf_context->handlers[i].handlers + SF_NETWORK_HANDLER_COUNT;
+        for (handler=sf_context->handlers[i].handlers;
+                handler<hend; handler++)
+        {
+            if (!handler->enabled) {
+                continue;
+            }
+
+            if (handler->inner.enabled) {
+                *listener++ = &handler->inner;
+            }
+            if (handler->outer.enabled) {
+                *listener++ = &handler->outer;
+            }
+        }
+    }
+
+    if (listener == listeners) {
+        logError("file: "__FILE__", line: %d, "
+                "no listener!", __LINE__);
+        return ENOENT;
+    }
+
+    last = listener - 1;
+    if (blocked) {
+        lend = listener - 1;
     } else {
-        count = 1;
+        lend = listener;
     }
 
-    bytes = sizeof(struct accept_thread_context) * count;
-    accept_contexts = (struct accept_thread_context *)fc_malloc(bytes);
-    if (accept_contexts == NULL) {
-        return;
+    for (listener=listeners; listener<lend; listener++) {
+        _accept_loop(*listener, sf_context->accept_threads);
     }
 
-    accept_contexts[0].sf_context = sf_context;
-    accept_contexts[0].server_sock = sf_context->inner_sock;
-
-    if (sf_context->outer_sock >= 0) {
-        accept_contexts[1].sf_context = sf_context;
-        accept_contexts[1].server_sock = sf_context->outer_sock;
-
-        if (sf_context->inner_sock >= 0) {
-            _accept_loop(accept_contexts, sf_context->accept_threads);
-        }
-
-        if (block) {
-            _accept_loop(accept_contexts + 1, sf_context->accept_threads - 1);
-            accept_run(accept_contexts + 1);
-        } else {
-            _accept_loop(accept_contexts + 1, sf_context->accept_threads);
-        }
-    } else {
-        if (block) {
-            _accept_loop(accept_contexts, sf_context->accept_threads - 1);
-            accept_run(accept_contexts);
-        } else {
-            _accept_loop(accept_contexts, sf_context->accept_threads);
-        }
+    if (blocked) {
+        _accept_loop(*last, sf_context->accept_threads - 1);
+        accept_run(*last);
     }
+
+    return 0;
 }
 
 #if defined(DEBUG_FLAG)
@@ -680,15 +853,13 @@ int sf_setup_signal_handler()
     return 0;
 }
 
-#define LOG_SCHEDULE_ENTRIES_COUNT 3
-
 int sf_startup_schedule(pthread_t *schedule_tid)
 {
     ScheduleArray scheduleArray;
-    ScheduleEntry scheduleEntries[LOG_SCHEDULE_ENTRIES_COUNT];
+    ScheduleEntry scheduleEntries[SF_LOG_SCHEDULE_ENTRIES_COUNT];
 
     scheduleArray.entries = scheduleEntries;
-    sf_setup_schedule(&g_log_context, &g_sf_global_vars.error_log,
+    sf_logger_setup_schedule(&g_log_context, &g_sf_global_vars.error_log,
             &scheduleArray);
     return sched_start(&scheduleArray, schedule_tid,
             g_sf_global_vars.thread_stack_size, (bool * volatile)
@@ -699,7 +870,7 @@ int sf_add_slow_log_schedule(SFSlowLogContext *slowlog_ctx)
 {
     int result;
     ScheduleArray scheduleArray;
-    ScheduleEntry scheduleEntries[LOG_SCHEDULE_ENTRIES_COUNT];
+    ScheduleEntry scheduleEntries[SF_LOG_SCHEDULE_ENTRIES_COUNT];
 
     if (!slowlog_ctx->cfg.enabled) {
         return 0;
@@ -712,8 +883,8 @@ int sf_add_slow_log_schedule(SFSlowLogContext *slowlog_ctx)
     }
 
     scheduleArray.entries = scheduleEntries;
-    sf_setup_schedule(&slowlog_ctx->ctx, &slowlog_ctx->cfg.log_cfg,
-            &scheduleArray);
+    sf_logger_setup_schedule(&slowlog_ctx->ctx, &slowlog_ctx->
+            cfg.log_cfg, &scheduleArray);
     return sched_add_entries(&scheduleArray);
 }
 
@@ -724,6 +895,12 @@ void sf_set_current_time()
     srand(g_sf_global_vars.up_time);
 }
 
+int sf_global_init(const char *log_filename_prefix)
+{
+    sf_set_current_time();
+    return log_set_prefix(SF_G_BASE_PATH_STR, log_filename_prefix);
+}
+
 void sf_enable_thread_notify_ex(SFContext *sf_context, const bool enabled)
 {
     struct nio_thread_data *thread_data;

src/sf_service.h

@@ -25,6 +25,9 @@
 #include "fastcommon/ioevent.h"
 #include "fastcommon/fast_task_queue.h"
 #include "sf_types.h"
+#include "sf_proto.h"
+#include "sf_global.h"
+#include "sf_nio.h"
 
 typedef void* (*sf_alloc_thread_extra_data_callback)(const int thread_index);
 typedef void (*sf_sig_quit_handler)(int sig);
@@ -41,11 +44,13 @@ int sf_service_init_ex2(SFContext *sf_context, const char *name,
         sf_set_body_length_callback set_body_length_func,
         sf_alloc_recv_buffer_callback alloc_recv_buffer_func,
         sf_send_done_callback send_done_callback,
-        sf_deal_task_func deal_func, TaskCleanUpCallback task_cleanup_func,
+        sf_deal_task_callback deal_func, TaskCleanUpCallback task_cleanup_func,
         sf_recv_timeout_callback timeout_callback, const int net_timeout_ms,
-        const int proto_header_size, const int task_arg_size,
-        TaskInitCallback init_callback, sf_release_buffer_callback
-        release_buffer_callback);
+        const int proto_header_size, const int task_padding_size,
+        const int task_arg_size, const bool double_buffers,
+        const bool need_shrink_task_buffer, const bool explicit_post_recv,
+        TaskInitCallback init_callback, void *init_arg,
+        sf_release_buffer_callback release_buffer_callback);
 
 #define sf_service_init_ex(sf_context, name, alloc_thread_extra_data_callback,\
         thread_loop_callback, accept_done_callback, set_body_length_func,   \
@@ -55,16 +60,17 @@ int sf_service_init_ex2(SFContext *sf_context, const char *name,
         thread_loop_callback, accept_done_callback, set_body_length_func,     \
         NULL, send_done_callback, deal_func, task_cleanup_func, \
         timeout_callback, net_timeout_ms, proto_header_size, \
-        task_arg_size, NULL, NULL)
+        0, task_arg_size, false, true, false, NULL, NULL, NULL)
 
 #define sf_service_init(name, alloc_thread_extra_data_callback, \
         thread_loop_callback, accept_done_callback, set_body_length_func,   \
         send_done_callback, deal_func, task_cleanup_func, timeout_callback, \
         net_timeout_ms, proto_header_size, task_arg_size) \
-    sf_service_init_ex2(&g_sf_context, name, alloc_thread_extra_data_callback,  \
-        thread_loop_callback, accept_done_callback, set_body_length_func, NULL, \
+    sf_service_init_ex2(&g_sf_context, name, alloc_thread_extra_data_callback, \
+        thread_loop_callback, accept_done_callback, set_body_length_func, NULL,\
         send_done_callback, deal_func, task_cleanup_func, timeout_callback, \
-        net_timeout_ms, proto_header_size, task_arg_size, NULL, NULL)
+        net_timeout_ms, proto_header_size, 0, task_arg_size, false, true,   \
+        false, NULL, NULL, NULL)
 
 int sf_service_destroy_ex(SFContext *sf_context);
 
@@ -76,12 +82,35 @@ void sf_service_set_thread_loop_callback_ex(SFContext *sf_context,
 #define sf_service_set_thread_loop_callback(thread_loop_callback) \
     sf_service_set_thread_loop_callback_ex(&g_sf_context, thread_loop_callback)
 
+static inline void sf_service_set_smart_polling_ex(SFContext *sf_context,
+        const FCSmartPollingConfig *smart_polling)
+{
+    sf_context->smart_polling = *smart_polling;
+}
+#define sf_service_set_smart_polling(smart_polling) \
+    sf_service_set_smart_polling_ex(&g_sf_context, smart_polling)
+
+static inline void sf_service_set_connect_need_log_ex(
+        SFContext *sf_context, const bool need_log)
+{
+    sf_context->connect_need_log = need_log;
+}
+#define sf_service_set_connect_need_log(need_log) \
+    sf_service_set_connect_need_log_ex(&g_sf_context, need_log)
+
+
 int sf_setup_signal_handler();
 
 int sf_startup_schedule(pthread_t *schedule_tid);
 int sf_add_slow_log_schedule(SFSlowLogContext *slowlog_ctx);
 
 void sf_set_current_time();
+int sf_global_init(const char *log_filename_prefix);
+
+int sf_socket_create_server(SFListener *listener,
+        int af, const char *bind_addr);
+void sf_socket_close_server(SFListener *listener);
+struct fast_task_info *sf_socket_accept_connection(SFListener *listener);
 
 int sf_socket_server_ex(SFContext *sf_context);
 #define sf_socket_server() sf_socket_server_ex(&g_sf_context)
@@ -89,7 +118,7 @@ int sf_socket_server_ex(SFContext *sf_context);
 void sf_socket_close_ex(SFContext *sf_context);
 #define sf_socket_close() sf_socket_close_ex(&g_sf_context)
 
-void sf_accept_loop_ex(SFContext *sf_context, const bool block);
+int sf_accept_loop_ex(SFContext *sf_context, const bool blocked);
 
 #define sf_accept_loop()  sf_accept_loop_ex(&g_sf_context, true)
 
@@ -121,14 +150,13 @@ void sf_notify_all_threads_ex(SFContext *sf_context);
 
 void sf_set_sig_quit_handler(sf_sig_quit_handler quit_handler);
 
-int sf_init_task(struct fast_task_info *task);
-
-static inline struct fast_task_info *sf_alloc_init_task(
-        SFContext *sf_context, const int sock)
+static inline struct fast_task_info *sf_alloc_init_task_ex(
+        SFNetworkHandler *handler, const int fd,
+        const int reffer_count)
 {
     struct fast_task_info *task;
 
-    task = free_queue_pop();
+    task = free_queue_pop(&handler->fh->ctx->free_queue);
     if (task == NULL) {
         logError("file: "__FILE__", line: %d, "
                 "malloc task buff failed, you should "
@@ -136,15 +164,54 @@ static inline struct fast_task_info *sf_alloc_init_task(
                 __LINE__);
         return NULL;
     }
-    __sync_add_and_fetch(&task->reffer_count, 1);
+
+    if (task->shrinked) {
+        task->shrinked = false;
+        sf_proto_init_task_magic(task);
+    }
+
+    __sync_add_and_fetch(&task->reffer_count, reffer_count);
     __sync_bool_compare_and_swap(&task->canceled, 1, 0);
-    task->ctx = sf_context;
-    task->event.fd = sock;
+    task->handler = handler;
+    task->event.fd = fd;
+    return task;
+}
+
+#define sf_hold_task_ex(task, inc_count)  fc_hold_task_ex(task, inc_count)
+#define sf_hold_task(task)  fc_hold_task(task)
+
+#define sf_alloc_init_task(handler, fd) sf_alloc_init_task_ex(handler, fd, 1)
+
+static inline struct fast_task_info *sf_alloc_init_server_task(
+        SFNetworkHandler *handler, const int fd)
+{
+    const int reffer_count = 1;
+    struct fast_task_info *task;
+
+    if ((task=sf_alloc_init_task_ex(handler, fd, reffer_count)) != NULL) {
+#if IOEVENT_USE_URING
+        FC_URING_IS_CLIENT(task) = false;
+#endif
+    }
 
     return task;
 }
 
-#define sf_hold_task(task) __sync_add_and_fetch(&task->reffer_count, 1)
+static inline struct fast_task_info *sf_alloc_init_client_task(
+        SFNetworkHandler *handler)
+{
+    const int fd = -1;
+    const int reffer_count = 1;
+    struct fast_task_info *task;
+
+    if ((task=sf_alloc_init_task_ex(handler, fd, reffer_count)) != NULL) {
+#if IOEVENT_USE_URING
+        FC_URING_IS_CLIENT(task) = true;
+#endif
+    }
+
+    return task;
+}
 
 static inline void sf_release_task(struct fast_task_info *task)
 {
@@ -157,10 +224,103 @@ static inline void sf_release_task(struct fast_task_info *task)
                 "used: %d, freed: %d", __LINE__, task,
                 alloc_count, alloc_count - free_count, free_count);
                 */
+
+#if IOEVENT_USE_URING
+        if (SF_CTX->use_io_uring) {
+            task->handler->close_connection(task);
+            __sync_fetch_and_sub(&g_sf_global_vars.
+                    connection_stat.current_count, 1);
+        }
+#endif
+
         free_queue_push(task);
     }
 }
 
+static inline SFNetworkHandler *sf_get_first_network_handler_ex(
+        SFContext *sf_context)
+{
+    int i;
+    SFNetworkHandler *handler;
+    SFNetworkHandler *end;
+
+    for (i=0; i<SF_ADDRESS_FAMILY_COUNT; i++) {
+        if (sf_context->handlers[i].af == AF_UNSPEC) {
+            continue;
+        }
+
+        end = sf_context->handlers[i].handlers + SF_NETWORK_HANDLER_COUNT;
+        for (handler=sf_context->handlers[i].handlers; handler<end; handler++) {
+            if (handler->enabled) {
+                return handler;
+            }
+        }
+    }
+
+    return NULL;
+}
+#define sf_get_first_network_handler() \
+    sf_get_first_network_handler_ex(&g_sf_context)
+
+
+static inline SFNetworkHandler *sf_get_rdma_network_handler(
+        SFContext *sf_context)
+{
+    int i;
+    SFNetworkHandler *handler;
+
+    for (i=0; i<SF_ADDRESS_FAMILY_COUNT; i++) {
+        if (sf_context->handlers[i].af != AF_UNSPEC) {
+            handler = sf_context->handlers[i].handlers +
+                SF_RDMACM_NETWORK_HANDLER_INDEX;
+            if (handler->enabled) {
+                return handler;
+            }
+        }
+    }
+
+    return NULL;
+}
+
+static inline SFNetworkHandler *sf_get_rdma_network_handler2(
+        SFContext *sf_context1, SFContext *sf_context2)
+{
+    SFNetworkHandler *handler;
+
+    if ((handler=sf_get_rdma_network_handler(sf_context1)) != NULL) {
+        return handler;
+    }
+    return sf_get_rdma_network_handler(sf_context2);
+}
+
+static inline SFNetworkHandler *sf_get_rdma_network_handler3(
+        SFContext *sf_context1, SFContext *sf_context2,
+        SFContext *sf_context3)
+{
+    SFNetworkHandler *handler;
+
+    if ((handler=sf_get_rdma_network_handler(sf_context1)) != NULL) {
+        return handler;
+    }
+    if ((handler=sf_get_rdma_network_handler(sf_context2)) != NULL) {
+        return handler;
+    }
+    return sf_get_rdma_network_handler(sf_context3);
+}
+
+static inline bool sf_get_double_buffers_flag(FCServerGroupInfo *server_group)
+{
+    if (server_group->comm_type == fc_comm_type_sock) {
+#if IOEVENT_USE_URING
+        return true;
+#else
+        return false;
+#endif
+    } else {  //RDMA
+        return true;
+    }
+}
+
 #ifdef __cplusplus
 }
 #endif

src/sf_types.h

@@ -34,47 +34,170 @@
 #define SF_SERVER_TASK_TYPE_CHANNEL_HOLDER     101   //for request idempotency
 #define SF_SERVER_TASK_TYPE_CHANNEL_USER       102   //for request idempotency
 
+#define SF_ADDRESS_FAMILY_COUNT           2
+#define SF_IPV4_ADDRESS_FAMILY_INDEX      0
+#define SF_IPV6_ADDRESS_FAMILY_INDEX      1
+
+#define SF_NETWORK_HANDLER_COUNT          2
+#define SF_SOCKET_NETWORK_HANDLER_INDEX   0
+#define SF_RDMACM_NETWORK_HANDLER_INDEX   1
+
+#define SF_BINLOG_BUFFER_PRODUCER_DATA_LENGTH(bf) ((bf).data_end - (bf).buff)
+#define SF_BINLOG_BUFFER_PRODUCER_BUFF_REMAIN(bf) ((bf).buff_end - (bf).data_end)
+#define SF_BINLOG_BUFFER_CONSUMER_DATA_LENGTH(bf) ((bf).current  - (bf).buff)
+#define SF_BINLOG_BUFFER_CONSUMER_DATA_REMAIN(bf) ((bf).data_end - (bf).current)
+
 typedef int (*sf_accept_done_callback)(struct fast_task_info *task,
-        const in_addr_t client_addr, const bool bInnerPort);
+        const in_addr_64_t client_addr, const bool bInnerPort);
 typedef int (*sf_set_body_length_callback)(struct fast_task_info *task);
 typedef char *(*sf_alloc_recv_buffer_callback)(struct fast_task_info *task,
         const int buff_size, bool *new_alloc);
-typedef int (*sf_deal_task_func)(struct fast_task_info *task, const int stage);
+typedef int (*sf_deal_task_callback)(struct fast_task_info *task, const int stage);
 typedef int (*sf_recv_timeout_callback)(struct fast_task_info *task);
 typedef int (*sf_send_done_callback)(struct fast_task_info *task,
-        const int length);
+        const int length, int *next_stage);
+typedef void (*sf_connect_done_callback)(struct fast_task_info *task,
+        const int err_no);
 
 /* calback for release iovec buffer */
 typedef void (*sf_release_buffer_callback)(struct fast_task_info *task);
 
 typedef int (*sf_error_handler_callback)(const int errnum);
 
+typedef enum {
+    sf_comm_action_continue = 'c',
+    sf_comm_action_break = 'b',
+    sf_comm_action_finish = 'f'
+} SFCommAction;
+
+typedef enum {
+    sf_address_family_auto = 0,
+    sf_address_family_ipv4 = 1,
+    sf_address_family_ipv6 = 2,
+    sf_address_family_both = 3
+} SFAddressFamily;
+
+struct ibv_pd;
+struct sf_listener;
+
+typedef int (*sf_get_connection_size_callback)();
+typedef int (*sf_init_connection_callback)(
+        struct fast_task_info *task, void *arg);
+#define sf_alloc_pd_callback fc_alloc_pd_callback
+
+typedef int (*sf_create_server_callback)(struct sf_listener
+        *listener, int af, const char *bind_addr);
+typedef void (*sf_close_server_callback)(struct sf_listener *listener);
+typedef struct fast_task_info * (*sf_accept_connection_callback)(
+        struct sf_listener *listener);
+typedef int (*sf_async_connect_server_callback)(struct fast_task_info *task);
+typedef int (*sf_async_connect_check_callback)(struct fast_task_info *task);
+typedef void (*sf_close_connection_callback)(struct fast_task_info *task);
+
+typedef ssize_t (*sf_send_data_callback)(struct fast_task_info *task,
+        SFCommAction *action, bool *send_done);
+typedef ssize_t (*sf_recv_data_callback)(struct fast_task_info *task,
+        const bool call_post_recv, SFCommAction *action);
+typedef int (*sf_post_recv_callback)(struct fast_task_info *task);
+
+struct sf_network_handler;
+typedef struct sf_listener {
+    struct sf_network_handler *handler;
+    int port;
+    bool enabled;
+    bool is_inner;
+    union {
+        int sock;  //for socket
+        void *id;  //for rdma_cm
+    };
+    struct sockaddr_in inaddr;  //for accept
+} SFListener;
+
+struct sf_context;
+struct sf_address_family_handler;
+
+typedef struct sf_network_handler {
+    bool enabled;
+    bool explicit_post_recv;
+    FCCommunicationType comm_type;
+    struct sf_address_family_handler *fh;
+    struct ibv_pd *pd;
+
+    SFListener inner;
+    SFListener outer;
+
+    /* for server side */
+    sf_get_connection_size_callback get_connection_size;
+    sf_init_connection_callback init_connection;
+    sf_alloc_pd_callback alloc_pd;
+    sf_create_server_callback create_server;
+    sf_close_server_callback close_server;
+    sf_accept_connection_callback accept_connection;
+
+    /* for client side */
+    sf_async_connect_server_callback async_connect_server;
+    sf_async_connect_check_callback  async_connect_check;
+
+    /* server and client both */
+    sf_close_connection_callback close_connection;
+
+    sf_send_data_callback send_data;
+    sf_recv_data_callback recv_data;
+    sf_post_recv_callback post_recv;  //for rdma
+} SFNetworkHandler;
+
+typedef struct sf_nio_callbacks {
+    TaskCleanUpCallback task_cleanup;
+    sf_deal_task_callback deal_task;
+    sf_set_body_length_callback set_body_length;
+    sf_alloc_recv_buffer_callback alloc_recv_buffer;
+    sf_accept_done_callback accept_done;
+    sf_connect_done_callback connect_done;
+    sf_send_done_callback send_done;
+    sf_recv_timeout_callback task_timeout;
+    sf_release_buffer_callback release_buffer;
+} SFNIOCallbacks;
+
+typedef struct sf_address_family_handler {
+    int af;   //AF_UNSPEC for disabled
+    SFNetworkHandler handlers[SF_NETWORK_HANDLER_COUNT];
+    char inner_bind_addr[IP_ADDRESS_SIZE];
+    char outer_bind_addr[IP_ADDRESS_SIZE];
+    struct sf_context *ctx;
+} SFAddressFamilyHandler;
+
+typedef struct sf_net_buffer_config {
+    int connect_timeout;
+    int network_timeout;
+    int max_connections;
+    int max_pkg_size;
+    int min_buff_size;
+    int max_buff_size;
+} SFNetBufferConfig;
+
 typedef struct sf_context {
     char name[64];
     struct nio_thread_data *thread_data;
     volatile int thread_count;
-    int outer_sock;
-    int inner_sock;
 
-    int outer_port;
-    int inner_port;
+    bool is_client;    //since v1.2.5
+    bool use_io_uring; //since v1.2.9
+    bool use_send_zc;  //since v1.2.9
+    SFAddressFamily address_family;
+    SFAddressFamilyHandler handlers[SF_ADDRESS_FAMILY_COUNT];
+
+    SFNetBufferConfig net_buffer_cfg;
+
     int accept_threads;
     int work_threads;
 
-    char inner_bind_addr[IP_ADDRESS_SIZE];
-    char outer_bind_addr[IP_ADDRESS_SIZE];
-
     int header_size;
-    bool remove_from_ready_list;
     bool realloc_task_buffer;
-    sf_deal_task_func deal_task;
-    sf_set_body_length_callback set_body_length;
-    sf_alloc_recv_buffer_callback alloc_recv_buffer;
-    sf_accept_done_callback accept_done_func;
-    sf_send_done_callback send_done_callback;
-    TaskCleanUpCallback task_cleanup_func;
-    sf_recv_timeout_callback timeout_callback;
-    sf_release_buffer_callback release_buffer_callback;
+    bool connect_need_log;  //for client connect
+    FCSmartPollingConfig smart_polling;
+
+    SFNIOCallbacks callbacks;
+    struct fast_task_queue free_queue;
 } SFContext;
 
 typedef struct {
@@ -114,10 +237,11 @@ typedef struct sf_binlog_file_position {
 } SFBinlogFilePosition;
 
 typedef struct server_binlog_buffer {
-    char *buff;    //the buffer pointer
-    char *current; //for the consumer
-    char *end;     //data end ptr
-    int size;      //the buffer size (capacity)
+    char *buff;       //the buffer pointer
+    char *current;    //for the consumer
+    char *data_end;   //data end ptr
+    char *buff_end;   //buffer end ptr
+    int size;         //the buffer size (capacity)
 } SFBinlogBuffer;
 
 typedef struct sf_space_stat {
@@ -246,6 +370,7 @@ typedef struct sf_synchronize_context {
     int result;
     union {
         bool finished;
+        bool ready;
         int waiting_count;
     };
 } SFSynchronizeContext;

src/sf_util.c

@@ -281,7 +281,7 @@ int sf_logger_init(LogContext *pContext, const char *filename_prefix)
     return 0;
 }
 
-ScheduleEntry *sf_logger_set_schedule_entry(struct log_context *pContext,
+ScheduleEntry *sf_logger_set_schedule_entries(struct log_context *pContext,
         SFLogConfig *log_cfg, ScheduleEntry *pScheduleEntry)
 {
     INIT_SCHEDULE_ENTRY(*pScheduleEntry, sched_generate_next_id(),

src/sf_util.h

@@ -96,14 +96,14 @@ void sf_parse_cmd_option_bool(int argc, char *argv[],
 
 int sf_logger_init(LogContext *pContext, const char *filename_prefix);
 
-ScheduleEntry *sf_logger_set_schedule_entry(struct log_context *pContext,
+ScheduleEntry *sf_logger_set_schedule_entries(struct log_context *pContext,
         SFLogConfig *log_cfg, ScheduleEntry *pScheduleEntry);
 
-static inline void sf_setup_schedule(struct log_context *pContext,
+static inline void sf_logger_setup_schedule(struct log_context *pContext,
         SFLogConfig *log_cfg, ScheduleArray *scheduleArray)
 {
     ScheduleEntry *scheduleEntry;
-    scheduleEntry = sf_logger_set_schedule_entry(pContext,
+    scheduleEntry = sf_logger_set_schedule_entries(pContext,
             log_cfg, scheduleArray->entries);
     scheduleArray->count = scheduleEntry - scheduleArray->entries;
 }