Merge a16fde8070 into 4b9ef52da2

HISTORY

@@ -1,7 +1,4 @@
 
-Version 1.83  2025-11-15
-  * fast_task_queue.h: remove field finish_callback
-
 Version 1.82  2025-11-04
   * set use_io_uring explicitly
 

INSTALL

@@ -21,5 +21,5 @@ Debian, Ubuntu etc.:
 # the command lines as:
 
    git clone https://github.com/happyfish100/libfastcommon.git
-   cd libfastcommon; git checkout V1.0.83
+   cd libfastcommon; git checkout V1.0.81
    ./make.sh clean && ./make.sh && sudo ./make.sh install

debian/changelog

@@ -1,21 +1,3 @@
-libfastcommon (1.0.83-1) unstable; urgency=medium
-
-  * upgrade to 1.0.83-1
-
- -- YuQing <384681@qq.com>  Sun, 23 Nov 2025 10:47:37 +0000
-
-libfastcommon (1.0.83-1) unstable; urgency=medium
-
-  * upgrade to 1.0.83-1
-
- -- YuQing <384681@qq.com>  Sun, 23 Nov 2025 10:00:00 +0000
-
-libfastcommon (1.0.83-1) unstable; urgency=medium
-
-  * upgrade to 1.0.83-1
-
- -- YuQing <384681@qq.com>  Sun, 23 Nov 2025 09:05:57 +0000
-
 libfastcommon (1.0.78-1) unstable; urgency=medium
 
   * upgrade to 1.0.78-1

libfastcommon.spec

@@ -3,7 +3,7 @@
 %define CommitVersion %(echo $COMMIT_VERSION)
 
 Name: libfastcommon
-Version: 1.0.83
+Version: 1.0.81
 Release: 1%{?dist}
 Summary: c common functions library extracted from my open source projects FastDFS
 License: LGPL
@@ -19,10 +19,10 @@ Requires: %__cp %__mv %__chmod %__grep %__mkdir %__install %__id
 
 %define kernel_major %(uname -r | cut -d'.' -f1)
 %define kernel_minor %(uname -r | cut -d'.' -f2)
-%define kernel_ver_int %(expr %{kernel_major} \\* 100 + %{kernel_minor})
+%define kernel_ver_int %(expr %{kernel_major} \* 100 + %{kernel_minor})
 %if %{kernel_ver_int} >= 514
-BuildRequires: liburing-devel >= 2.4
-Requires: liburing >= 2.4
+BuildRequires: liburing-devel >= 2.5
+Requires: liburing >= 2.5
 %endif
 
 %description

src/fast_task_queue.h

@@ -37,6 +37,7 @@ struct nio_thread_data;
 struct fast_task_info;
 
 typedef int (*ThreadLoopCallback) (struct nio_thread_data *pThreadData);
+typedef int (*TaskFinishCallback) (struct fast_task_info *task);
 typedef void (*TaskCleanUpCallback) (struct fast_task_info *task);
 typedef int (*TaskInitCallback)(struct fast_task_info *task, void *arg);
 typedef void (*TaskReleaseCallback)(struct fast_task_info *task);
@@ -148,6 +149,7 @@ struct fast_task_info
         struct fc_list_head dlink;  //for polling queue
     } polling;  //for RDMA busy polling
     TaskContinueCallback continue_callback; //for continue stage
+    TaskFinishCallback finish_callback;
     struct nio_thread_data *thread_data;
     struct sf_network_handler *handler; //network handler for libserverframe nio
     struct fast_task_info *next;        //for free queue and deleted list

src/ioevent_loop.c

@@ -145,7 +145,10 @@ static void deal_timeouts(FastTimerEntry *head)
         /* must set NULL because NOT in time wheel */
         current->prev = current->next = NULL;
 		pEventEntry = (IOEventEntry *)current;
-        pEventEntry->callback(pEventEntry->fd, IOEVENT_TIMEOUT, current);
+		if (pEventEntry != NULL)
+		{
+			pEventEntry->callback(pEventEntry->fd, IOEVENT_TIMEOUT, current);
+		}
 	}
 }
 
@@ -240,7 +243,7 @@ int ioevent_loop(struct nio_thread_data *thread_data,
         }
 
 		if (thread_data->deleted_list != NULL) {
-			//count = 0;
+			count = 0;
 			while (thread_data->deleted_list != NULL) {
 				task = thread_data->deleted_list;
 				thread_data->deleted_list = task->next;
@@ -254,7 +257,7 @@ int ioevent_loop(struct nio_thread_data *thread_data,
                     }
                 }
 				clean_up_callback(task);
-				//count++;
+				count++;
 			}
 			//logInfo("cleanup task count: %d", count);
 		}

src/shared_func.h

@@ -1636,29 +1636,16 @@ static inline int fc_ltostr_ex(int64_t n, char *buff, const int padding_len)
         return len;
     }
 
-#if defined(OS_LINUX) && defined(__GNUC__) && __GNUC__ >= 8
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wstringop-overflow"
-#endif
-
     fill_len = padding_len - len;
     memmove(buff + fill_len, buff, len + 1);
     memset(buff, '0', fill_len);
-
-#if defined(OS_LINUX) && defined(__GNUC__) && __GNUC__ >= 8
-#pragma GCC diagnostic pop
-#endif
-
     return padding_len;
 }
 
 static inline int fc_ltostr(int64_t n, char *buff)
 {
-    int len;
-
-    len = fc_itoa(n, buff);
-    *(buff + len) = '\0';
-    return len;
+    const int padding_len = 0;
+    return fc_ltostr_ex(n, buff, padding_len);
 }
 
 static inline size_t fc_strlcpy(char *dest, const char *src, const size_t size)