lihao/skynet
1
0
Fork 0
mirror of https://github.com/cloudwu/skynet.git synced 2026-07-24 20:23:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove skynet_error length limit

Browse Source
This commit is contained in:
云风
2013-09-25 11:05:58 +08:00
parent 1676713b09
commit e402d114bf
1 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
skynet-src/skynet_error.c
View File

@@ -6,8 +6,9 @@
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <stdlib.h>
#define LOG_MESSAGE_SIZE 1024 #define LOG_MESSAGE_SIZE 256
void void
skynet_error(struct skynet_context * context, const char *msg, ...) { skynet_error(struct skynet_context * context, const char *msg, ...) {
@@ -20,17 +21,31 @@ skynet_error(struct skynet_context * context, const char *msg, ...) {
} }
char tmp[LOG_MESSAGE_SIZE]; char tmp[LOG_MESSAGE_SIZE];
char *data = NULL;
va_list ap; va_list ap;
va_start(ap,msg); va_start(ap,msg);
int len = vsnprintf(tmp, LOG_MESSAGE_SIZE, msg, ap); int len = vsnprintf(tmp, LOG_MESSAGE_SIZE, msg, ap);
va_end(ap); va_end(ap);
if (len < LOG_MESSAGE_SIZE) {
if (len >= LOG_MESSAGE_SIZE) { data = strdup(tmp);
len = LOG_MESSAGE_SIZE - 1; } else {
tmp[len] = '\0'; int max_size = LOG_MESSAGE_SIZE;
for (;;) {
max_size *= 2;
data = malloc(max_size);
va_start(ap,msg);
len = vsnprintf(data, max_size, msg, ap);
va_end(ap);
if (len < max_size) {
break;
}
free(data);
}
} }
struct skynet_message smsg; struct skynet_message smsg;
if (context == NULL) { if (context == NULL) {
smsg.source = 0; smsg.source = 0;
@@ -38,7 +53,7 @@ skynet_error(struct skynet_context * context, const char *msg, ...) {
smsg.source = skynet_context_handle(context); smsg.source = skynet_context_handle(context);
} }
smsg.session = 0; smsg.session = 0;
smsg.data = strdup(tmp); smsg.data = data;
smsg.sz = len | (PTYPE_TEXT << HANDLE_REMOTE_SHIFT); smsg.sz = len | (PTYPE_TEXT << HANDLE_REMOTE_SHIFT);
skynet_context_push(logger, &smsg); skynet_context_push(logger, &smsg);
} }