File Conn.c changed (mode: 100644) (index c978684..7de3180) |
... |
... |
static int Conn_recv_fd(int comm_fd) |
403 |
403 |
#endif |
#endif |
404 |
404 |
|
|
405 |
405 |
#if 1 |
#if 1 |
|
406 |
|
__cold void Log_simple(const unsigned short level, char *msg) |
|
407 |
|
{ |
|
408 |
|
char line[4096]; |
|
409 |
|
|
|
410 |
|
if (likely(level > Conn_debug_level)) |
|
411 |
|
return; |
|
412 |
|
|
|
413 |
|
snprintf(line, sizeof(line), "%ld.%03ld %s %s", |
|
414 |
|
Conn_now.tv_sec, Conn_now.tv_usec / 1000, log_info, msg); |
|
415 |
|
|
|
416 |
|
write(Conn_log_fd, line, strlen(line)); |
|
417 |
|
} |
|
418 |
|
|
406 |
419 |
__cold void Log(const unsigned short level, char *format, ...) |
__cold void Log(const unsigned short level, char *format, ...) |
407 |
420 |
{ |
{ |
408 |
421 |
va_list ap; |
va_list ap; |
409 |
|
size_t len; |
|
410 |
422 |
char line[4096]; |
char line[4096]; |
411 |
423 |
|
|
412 |
424 |
if (likely(level > Conn_debug_level)) |
if (likely(level > Conn_debug_level)) |
413 |
425 |
return; |
return; |
414 |
426 |
|
|
415 |
|
snprintf(line, sizeof(line), "%ld.%06ld %s ", |
|
416 |
|
Conn_now.tv_sec, Conn_now.tv_usec, log_info); |
|
417 |
|
len = strlen(line); |
|
418 |
|
|
|
419 |
427 |
va_start(ap, format); |
va_start(ap, format); |
420 |
|
vsnprintf(line + len, sizeof(line) - len, format, ap); |
|
|
428 |
|
vsnprintf(line, sizeof(line), format, ap); |
421 |
429 |
va_end(ap); |
va_end(ap); |
422 |
430 |
|
|
423 |
|
write(Conn_log_fd, line, strlen(line)); |
|
|
431 |
|
Log_simple(level, line); |
424 |
432 |
} |
} |
|
433 |
|
|
425 |
434 |
#else |
#else |
426 |
|
inline void Log(const unsigned short level, char *format, ...) |
|
|
435 |
|
void Log_simple(const unsigned short level, char *msg) |
|
436 |
|
{ |
|
437 |
|
} |
|
438 |
|
|
|
439 |
|
void Log(const unsigned short level, char *format, ...) |
|
440 |
|
{ |
|
441 |
|
} |
|
442 |
|
|
|
443 |
|
void vLog(const unsigned short level, va_list ap) |
427 |
444 |
{ |
{ |
428 |
|
return; |
|
429 |
445 |
} |
} |
430 |
446 |
#endif |
#endif |
431 |
447 |
|
|
|
... |
... |
__hot static void Conn_free_intern(struct Conn *C) |
741 |
757 |
C->id, __func__, C->fd, Conn_state(C), Conn_errno(C)); |
C->id, __func__, C->fd, Conn_state(C), Conn_errno(C)); |
742 |
758 |
} |
} |
743 |
759 |
|
|
744 |
|
if (C->error_state != CONN_ERROR_USERREQ) |
|
|
760 |
|
if (C->error_state != CONN_ERROR_USERREQ) { |
745 |
761 |
Conn_error_raise(C, 0); |
Conn_error_raise(C, 0); |
|
762 |
|
Log(10, "\tAfter error_raise fd=%d\n", C->fd); |
|
763 |
|
} |
746 |
764 |
|
|
747 |
765 |
if ((C->state == CONN_STATE_OPEN) |
if ((C->state == CONN_STATE_OPEN) |
748 |
766 |
|| (C->state == CONN_STATE_LISTEN) |
|| (C->state == CONN_STATE_LISTEN) |
|
... |
... |
void Conn_stop(void) |
891 |
909 |
/* |
/* |
892 |
910 |
* Returns the fd associated with C |
* Returns the fd associated with C |
893 |
911 |
*/ |
*/ |
894 |
|
static int Conn_get_fd(const struct Conn *C) |
|
|
912 |
|
int Conn_get_fd(const struct Conn *C) |
895 |
913 |
{ |
{ |
896 |
914 |
return C->fd; |
return C->fd; |
897 |
915 |
} |
} |
|
... |
... |
static inline int Conn_dispatch_events(struct Conn_wpool_worker *w, |
2502 |
2520 |
if (unlikely(Conn_debug_level > 8)) { |
if (unlikely(Conn_debug_level > 8)) { |
2503 |
2521 |
char sevents[16]; |
char sevents[16]; |
2504 |
2522 |
|
|
2505 |
|
Log(0, "\tProcessing %d event(s):\n", events); |
|
|
2523 |
|
Log(10, "\tProcessing %d event(s):\n", events); |
2506 |
2524 |
for (i = 0; i < events; i++) { |
for (i = 0; i < events; i++) { |
2507 |
2525 |
C = e[i].data.ptr; |
C = e[i].data.ptr; |
2508 |
2526 |
Conn_poll_status(e[i].events, sevents); |
Conn_poll_status(e[i].events, sevents); |
2509 |
|
Log(0, "\tptr=%p ### ev i=%d %s\n", C, i, sevents); |
|
|
2527 |
|
Log(11, "\tptr=%p ### ev i=%d %s\n", C, i, sevents); |
2510 |
2528 |
} |
} |
2511 |
2529 |
} |
} |
2512 |
2530 |
for (i = 0; i < events; i++) { |
for (i = 0; i < events; i++) { |
File Conn.h changed (mode: 100644) (index f3e90d8..480f842) |
... |
... |
enum CONN_CB { |
41 |
41 |
}; |
}; |
42 |
42 |
|
|
43 |
43 |
/* misc */ |
/* misc */ |
|
44 |
|
void Log_simple(const unsigned short level, char *msg); |
44 |
45 |
void Log(const unsigned short level, char *format, ...); |
void Log(const unsigned short level, char *format, ...); |
45 |
46 |
char *Conn_dump(const void *buf_src0, const size_t len_src); |
char *Conn_dump(const void *buf_src0, const size_t len_src); |
46 |
47 |
char *Conn_dumphex(const void *buf_src0, const size_t len_src); |
char *Conn_dumphex(const void *buf_src0, const size_t len_src); |
|
... |
... |
void Conn_eatall(struct Conn *C); |
102 |
103 |
void Conn_send_done(struct Conn *C); |
void Conn_send_done(struct Conn *C); |
103 |
104 |
void Conn_close(struct Conn *C); |
void Conn_close(struct Conn *C); |
104 |
105 |
void Conn_stop(void); |
void Conn_stop(void); |
|
106 |
|
int Conn_get_fd(const struct Conn *C); |
105 |
107 |
void Conn_set(struct Conn *C, const unsigned int var, |
void Conn_set(struct Conn *C, const unsigned int var, |
106 |
108 |
const int val); |
const int val); |
107 |
109 |
char *Conn_addr_local(struct Conn *C); |
char *Conn_addr_local(struct Conn *C); |