pdxx
/
fastdfs
mirror of https://github.com/happyfish100/fastdfs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove useless global variable: g_network_tv

pull/48/head
yuqing 2014-11-22 08:29:02 +08:00
parent 30c7949bf8
commit 119ff3ca5a
8 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
HISTORY
View File

@ -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

1
storage/storage_func.c
View File

@ -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);

2
storage/storage_global.c
View File

@ -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

2
storage/storage_global.h
View File

@ -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

1
tracker/tracker_func.c
View File

@ -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);

2
tracker/tracker_global.c
View File

@ -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

2
tracker/tracker_global.h
View File

@ -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;

1
tracker/tracker_proto.h
View File

@ -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