diff --git a/HISTORY b/HISTORY index c18d2db..7147b84 100644 --- a/HISTORY +++ b/HISTORY @@ -1,8 +1,9 @@ -Version 1.14 2015-05-11 +Version 1.14 2015-05-12 * fast_task_info support set_buffer_size and realloc_buffer * use file lock when write logger header * bugfixed: sockopt.c correct fsbytes to sbytes in FreeBSD + * macro FDFS_WRITE_BUFF_SIZE change to FAST_WRITE_BUFF_SIZE Version 1.13 2015-02-27 * support php extension diff --git a/src/sockopt.c b/src/sockopt.c index 5397c0b..91636a7 100644 --- a/src/sockopt.c +++ b/src/sockopt.c @@ -826,7 +826,7 @@ int tcprecvfile(int sock, const char *filename, const int64_t file_bytes, \ int64_t *true_file_bytes) { int write_fd; - char buff[FDFS_WRITE_BUFF_SIZE]; + char buff[FAST_WRITE_BUFF_SIZE]; int64_t remain_bytes; int recv_bytes; int written_bytes; @@ -979,7 +979,7 @@ int tcprecvfile_ex(int sock, const char *filename, const int64_t file_bytes, \ unsigned int *hash_codes, const int timeout) { int fd; - char buff[FDFS_WRITE_BUFF_SIZE]; + char buff[FAST_WRITE_BUFF_SIZE]; int64_t remain_bytes; int recv_bytes; int written_bytes; @@ -1070,7 +1070,7 @@ int tcprecvfile_ex(int sock, const char *filename, const int64_t file_bytes, \ int tcpdiscard(int sock, const int bytes, const int timeout, \ int64_t *total_recv_bytes) { - char buff[FDFS_WRITE_BUFF_SIZE]; + char buff[FAST_WRITE_BUFF_SIZE]; int remain_bytes; int recv_bytes; int result; @@ -1267,7 +1267,7 @@ int tcpsendfile_ex(int sock, const char *filename, const int64_t file_offset, \ #endif { - char buff[FDFS_WRITE_BUFF_SIZE]; + char buff[FAST_WRITE_BUFF_SIZE]; int64_t remain_bytes; tcpsenddatafunc send_func; diff --git a/src/sockopt.h b/src/sockopt.h index 6019a66..9f22e4a 100644 --- a/src/sockopt.h +++ b/src/sockopt.h @@ -13,7 +13,7 @@ #include "common_define.h" -#define FDFS_WRITE_BUFF_SIZE 256 * 1024 +#define FAST_WRITE_BUFF_SIZE 256 * 1024 #ifdef __cplusplus extern "C" {