diff --git a/HISTORY b/HISTORY index 5ec006f..152488a 100644 --- a/HISTORY +++ b/HISTORY @@ -1,6 +1,7 @@ -Version 5.05 2014-11-21 +Version 5.05 2014-11-22 * tracker_mem.c log more info + * remove useless global variable: g_network_tv Version 5.04 2014-09-16 * add fastdfs.spec for build RPM on Linux diff --git a/storage/storage_func.c b/storage/storage_func.c index b4d4e08..b03e522 100644 --- a/storage/storage_func.c +++ b/storage/storage_func.c @@ -1047,7 +1047,6 @@ int storage_func_init(const char *filename, \ { g_fdfs_network_timeout = DEFAULT_NETWORK_TIMEOUT; } - g_network_tv.tv_sec = g_fdfs_network_timeout; g_server_port = iniGetIntValue(NULL, "port", &iniContext, \ FDFS_STORAGE_SERVER_DEF_PORT); diff --git a/storage/storage_global.c b/storage/storage_global.c index 53a660c..602bdac 100644 --- a/storage/storage_global.c +++ b/storage/storage_global.c @@ -38,8 +38,6 @@ int g_file_distribute_path_mode = FDFS_FILE_DIST_PATH_ROUND_ROBIN; int g_file_distribute_rotate_count = FDFS_FILE_DIST_DEFAULT_ROTATE_COUNT; int g_fsync_after_written_bytes = -1; -struct timeval g_network_tv = {DEFAULT_NETWORK_TIMEOUT, 0}; - int g_dist_path_index_high = 0; //current write to high path int g_dist_path_index_low = 0; //current write to low path int g_dist_write_file_count = 0; //current write file count diff --git a/storage/storage_global.h b/storage/storage_global.h index de8d771..d7f4b8d 100644 --- a/storage/storage_global.h +++ b/storage/storage_global.h @@ -84,8 +84,6 @@ extern int g_file_distribute_path_mode; extern int g_file_distribute_rotate_count; extern int g_fsync_after_written_bytes; -extern struct timeval g_network_tv; - extern int g_dist_path_index_high; //current write to high path extern int g_dist_path_index_low; //current write to low path extern int g_dist_write_file_count; //current write file count diff --git a/tracker/tracker_func.c b/tracker/tracker_func.c index 79f0ce7..3dd814a 100644 --- a/tracker/tracker_func.c +++ b/tracker/tracker_func.c @@ -221,7 +221,6 @@ int tracker_load_from_conf_file(const char *filename, \ { g_fdfs_network_timeout = DEFAULT_NETWORK_TIMEOUT; } - g_network_tv.tv_sec = g_fdfs_network_timeout; g_server_port = iniGetIntValue(NULL, "port", &iniContext, \ FDFS_TRACKER_SERVER_DEF_PORT); diff --git a/tracker/tracker_global.c b/tracker/tracker_global.c index 2061f46..ab12f08 100644 --- a/tracker/tracker_global.c +++ b/tracker/tracker_global.c @@ -16,8 +16,6 @@ int g_work_threads = DEFAULT_WORK_THREADS; int g_sync_log_buff_interval = SYNC_LOG_BUFF_DEF_INTERVAL; int g_check_active_interval = CHECK_ACTIVE_DEF_INTERVAL; -struct timeval g_network_tv = {DEFAULT_NETWORK_TIMEOUT, 0}; - FDFSGroups g_groups; int g_storage_stat_chg_count = 0; int g_storage_sync_time_chg_count = 0; //sync timestamp diff --git a/tracker/tracker_global.h b/tracker/tracker_global.h index 16e37ad..5d165a8 100644 --- a/tracker/tracker_global.h +++ b/tracker/tracker_global.h @@ -47,8 +47,6 @@ extern FDFSStorageReservedSpace g_storage_reserved_space; extern int g_sync_log_buff_interval; //sync log buff to disk every interval seconds extern int g_check_active_interval; //check storage server alive every interval seconds -extern struct timeval g_network_tv; - extern int g_allow_ip_count; /* -1 means match any ip address */ extern in_addr_t *g_allow_ip_addrs; /* sorted array, asc order */ extern struct base64_context g_base64_context; diff --git a/tracker/tracker_proto.h b/tracker/tracker_proto.h index 3384f8c..353bc74 100644 --- a/tracker/tracker_proto.h +++ b/tracker/tracker_proto.h @@ -35,6 +35,7 @@ #define TRACKER_PROTO_CMD_STORAGE_GET_STATUS 71 //get storage status from tracker #define TRACKER_PROTO_CMD_STORAGE_GET_SERVER_ID 70 //get storage server id from tracker #define TRACKER_PROTO_CMD_STORAGE_FETCH_STORAGE_IDS 69 //get all storage ids from tracker +#define TRACKER_PROTO_CMD_STORAGE_GET_GROUP_NAME 109 //get storage group name from tracker #define TRACKER_PROTO_CMD_TRACKER_GET_SYS_FILES_START 61 //start of tracker get system data files #define TRACKER_PROTO_CMD_TRACKER_GET_SYS_FILES_END 62 //end of tracker get system data files