Skip to content

Commit 6210780

Browse files
author
zhengshuxin
committed
optimize codes.
1 parent 639e1af commit 6210780

File tree

4 files changed

+9
-4
lines changed

4 files changed

+9
-4
lines changed

lib_acl/src/stdlib/iostuff/acl_read_wait.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -339,9 +339,11 @@ int acl_read_poll_wait(ACL_SOCKET fd, int delay)
339339
if (acl_last_error() == ACL_EINTR) {
340340
break;
341341
}
342+
/*
342343
acl_msg_error("%s(%d), %s: poll error(%s), fd: %d",
343344
__FILE__, __LINE__, myname,
344345
acl_last_serror(), (int) fd);
346+
*/
345347
return -1;
346348
case 0:
347349
/*

lib_acl_cpp/src/http/websocket.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -409,8 +409,8 @@ bool websocket::read_frame_head(void)
409409

410410
if (client_.read(buf, 2) == -1) {
411411
if (last_error() != ACL_ETIMEDOUT) {
412-
logger_error("read first two char error: %d, %s",
413-
last_error(), last_serror());
412+
//logger_error("read first two char error: %d, %s",
413+
// last_error(), last_serror());
414414
}
415415
return false;
416416
}

lib_acl_cpp/src/redis/redis_command.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,9 @@ void redis_command::init(void)
3939
result_ = NULL;
4040
pipe_msg_ = NULL;
4141
addr_[0] = 0;
42-
dbuf_ = new dbuf_pool();
42+
43+
#define REDIS_DBUF_NBLOCK 1
44+
dbuf_ = new (REDIS_DBUF_NBLOCK) dbuf_pool();
4345
}
4446

4547
redis_command::redis_command(void)

lib_acl_cpp/src/stdlib/json.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,8 @@ json::json(const char* data /* NULL */, dbuf_guard* dbuf /* NULL */)
448448
if (dbuf) {
449449
dbuf_ = dbuf;
450450
} else {
451-
dbuf_ = dbuf_internal_ = NEW dbuf_guard;
451+
#define JSON_DBUF_NBLOCK 1
452+
dbuf_ = dbuf_internal_ = NEW dbuf_guard(JSON_DBUF_NBLOCK);
452453
}
453454

454455
json_ = acl_json_dbuf_alloc(dbuf_->get_dbuf().get_dbuf());

0 commit comments

Comments
 (0)