schedule task add the second field

HISTORY

@@ -1,4 +1,8 @@
 
+Version 5.07  2015-07-22
+ * schedule task add the "second" field
+ * make.sh changed, you must upgrade libfastcommon to V1.18 or later
+
 Version 5.06  2015-05-12
  * compile passed in mac OS Darwin
  * correct scripts in subdir init.d

fastdfs.spec

@@ -2,7 +2,7 @@
 %define FDFSServer fastdfs-server
 %define FDFSClient libfdfsclient
 %define FDFSTool   fastdfs-tool
-%define FDFSVersion 5.0.6
+%define FDFSVersion 5.0.7
 
 Name: %{FastDFS}
 Version: %{FDFSVersion}

make.sh

@@ -46,16 +46,6 @@ else
  OFF_BITS=32
 fi
 
-cat <<EOF > common/_os_bits.h
-#ifndef _OS_BITS_H
-#define _OS_BITS_H
-
-#define OS_BITS  $OS_BITS
-#define OFF_BITS $OFF_BITS
-
-#endif
-EOF
-
 ENABLE_STATIC_LIB=0
 ENABLE_SHARED_LIB=1
 TARGET_PREFIX=$DESTDIR/usr
@@ -82,21 +72,21 @@ fi
 
 uname=$(uname)
 if [ "$uname" = "Linux" ]; then
-  CFLAGS="$CFLAGS -DOS_LINUX -DIOEVENT_USE_EPOLL"
+  CFLAGS="$CFLAGS"
 elif [ "$uname" = "FreeBSD" ] || [ "$uname" = "Darwin" ]; then
-  CFLAGS="$CFLAGS -DOS_FREEBSD -DIOEVENT_USE_KQUEUE"
+  CFLAGS="$CFLAGS"
   if [ "$uname" = "Darwin" ]; then
     CFLAGS="$CFLAGS -DDARWIN"
   fi
 elif [ "$uname" = "SunOS" ]; then
-  CFLAGS="$CFLAGS -DOS_SUNOS -D_THREAD_SAFE -DIOEVENT_USE_PORT"
+  CFLAGS="$CFLAGS -D_THREAD_SAFE"
   LIBS="$LIBS -lsocket -lnsl -lresolv"
   export CC=gcc
 elif [ "$uname" = "AIX" ]; then
-  CFLAGS="$CFLAGS -DOS_AIX -D_THREAD_SAFE"
+  CFLAGS="$CFLAGS -D_THREAD_SAFE"
   export CC=gcc
 elif [ "$uname" = "HP-UX" ]; then
-  CFLAGS="$CFLAGS -DOS_HPUX"
+  CFLAGS="$CFLAGS"
 fi
 
 have_pthread=0

storage/fdfs_storaged.c

@@ -317,6 +317,7 @@ int main(int argc, char *argv[])
 	scheduleEntries[0].id = 1;
 	scheduleEntries[0].time_base.hour = TIME_NONE;
 	scheduleEntries[0].time_base.minute = TIME_NONE;
+	scheduleEntries[0].time_base.second = TIME_NONE;
 	scheduleEntries[0].interval = g_sync_log_buff_interval;
 	scheduleEntries[0].task_func = log_sync_func;
 	scheduleEntries[0].func_args = &g_log_context;
@@ -324,6 +325,7 @@ int main(int argc, char *argv[])
 	scheduleEntries[1].id = 2;
 	scheduleEntries[1].time_base.hour = TIME_NONE;
 	scheduleEntries[1].time_base.minute = TIME_NONE;
+	scheduleEntries[1].time_base.second = TIME_NONE;
 	scheduleEntries[1].interval = g_sync_binlog_buff_interval;
 	scheduleEntries[1].task_func = fdfs_binlog_sync_func;
 	scheduleEntries[1].func_args = NULL;
@@ -331,6 +333,7 @@ int main(int argc, char *argv[])
 	scheduleEntries[2].id = 3;
 	scheduleEntries[2].time_base.hour = TIME_NONE;
 	scheduleEntries[2].time_base.minute = TIME_NONE;
+	scheduleEntries[2].time_base.second = TIME_NONE;
 	scheduleEntries[2].interval = g_sync_stat_file_interval;
 	scheduleEntries[2].task_func = fdfs_stat_file_sync_func;
 	scheduleEntries[2].func_args = NULL;
@@ -341,6 +344,7 @@ int main(int argc, char *argv[])
 		scheduleEntries[scheduleArray.count].id = 4;
 		scheduleEntries[scheduleArray.count].time_base.hour = TIME_NONE;
 		scheduleEntries[scheduleArray.count].time_base.minute=TIME_NONE;
+		scheduleEntries[scheduleArray.count].time_base.second=TIME_NONE;
 		scheduleEntries[scheduleArray.count].interval = 1;
 		scheduleEntries[scheduleArray.count].task_func = \
 					trunk_binlog_sync_func;
@@ -353,6 +357,7 @@ int main(int argc, char *argv[])
 		scheduleEntries[scheduleArray.count].id = 5;
 		scheduleEntries[scheduleArray.count].time_base.hour = TIME_NONE;
 		scheduleEntries[scheduleArray.count].time_base.minute=TIME_NONE;
+		scheduleEntries[scheduleArray.count].time_base.second=TIME_NONE;
 		scheduleEntries[scheduleArray.count].interval = \
 					g_sync_log_buff_interval;
 		scheduleEntries[scheduleArray.count].task_func = log_sync_func;
@@ -380,6 +385,7 @@ int main(int argc, char *argv[])
                 scheduleEntries[scheduleArray.count].id = 7;
                 scheduleEntries[scheduleArray.count].time_base.hour = 1;
                 scheduleEntries[scheduleArray.count].time_base.minute = 0;
+                scheduleEntries[scheduleArray.count].time_base.second = 0;
                 scheduleEntries[scheduleArray.count].interval = 24 * 3600;
                 scheduleEntries[scheduleArray.count].task_func =
                     log_delete_old_files;
@@ -409,6 +415,7 @@ int main(int argc, char *argv[])
             scheduleEntries[scheduleArray.count].id = 9;
             scheduleEntries[scheduleArray.count].time_base.hour = 1;
             scheduleEntries[scheduleArray.count].time_base.minute = 0;
+            scheduleEntries[scheduleArray.count].time_base.second = 0;
             scheduleEntries[scheduleArray.count].interval = 24 * 3600;
             scheduleEntries[scheduleArray.count].task_func =
                 log_delete_old_files;

tracker/fdfs_trackerd.c

@@ -317,6 +317,7 @@ int main(int argc, char *argv[])
 	scheduleEntries[0].id = 1;
 	scheduleEntries[0].time_base.hour = TIME_NONE;
 	scheduleEntries[0].time_base.minute = TIME_NONE;
+	scheduleEntries[0].time_base.second = TIME_NONE;
 	scheduleEntries[0].interval = g_sync_log_buff_interval;
 	scheduleEntries[0].task_func = log_sync_func;
 	scheduleEntries[0].func_args = &g_log_context;
@@ -324,6 +325,7 @@ int main(int argc, char *argv[])
 	scheduleEntries[1].id = 2;
 	scheduleEntries[1].time_base.hour = TIME_NONE;
 	scheduleEntries[1].time_base.minute = TIME_NONE;
+	scheduleEntries[1].time_base.second = TIME_NONE;
 	scheduleEntries[1].interval = g_check_active_interval;
 	scheduleEntries[1].task_func = tracker_mem_check_alive;
 	scheduleEntries[1].func_args = NULL;
@@ -331,6 +333,7 @@ int main(int argc, char *argv[])
 	scheduleEntries[2].id = 3;
 	scheduleEntries[2].time_base.hour = 0;
 	scheduleEntries[2].time_base.minute = 0;
+	scheduleEntries[2].time_base.second = 0;
 	scheduleEntries[2].interval = TRACKER_SYNC_STATUS_FILE_INTERVAL;
 	scheduleEntries[2].task_func = tracker_write_status_to_file;
 	scheduleEntries[2].func_args = NULL;
@@ -356,6 +359,7 @@ int main(int argc, char *argv[])
             scheduleEntries[scheduleArray.count].id = 5;
             scheduleEntries[scheduleArray.count].time_base.hour = 1;
             scheduleEntries[scheduleArray.count].time_base.minute = 0;
+            scheduleEntries[scheduleArray.count].time_base.second = 0;
             scheduleEntries[scheduleArray.count].interval = 24 * 3600;
             scheduleEntries[scheduleArray.count].task_func =
                 log_delete_old_files;

tracker/tracker_global.c

@@ -37,7 +37,7 @@ bool g_storage_ip_changed_auto_adjust = true;
 bool g_use_storage_id = false;  //if use storage ID instead of IP address
 byte g_id_type_in_filename = FDFS_ID_TYPE_IP_ADDRESS; //id type of the storage server in the filename
 bool g_rotate_error_log = false;  //if rotate the error log every day
-TimeInfo g_error_log_rotate_time  = {0, 0}; //rotate error log time base
+TimeInfo g_error_log_rotate_time  = {0, 0, 0}; //rotate error log time base
 
 int g_thread_stack_size = 64 * 1024;
 int g_storage_sync_file_max_delay = DEFAULT_STORAGE_SYNC_FILE_MAX_DELAY;