diff options
Diffstat (limited to 'src/base')
| -rw-r--r-- | src/base/system.c | 28 | ||||
| -rw-r--r-- | src/base/system.h | 36 |
2 files changed, 34 insertions, 30 deletions
diff --git a/src/base/system.c b/src/base/system.c index 2026199b..a11caf4c 100644 --- a/src/base/system.c +++ b/src/base/system.c @@ -125,7 +125,7 @@ static IOHANDLE logfile = 0; static void logger_file(const char *line) { io_write(logfile, line, strlen(line)); - io_write(logfile, "\n", 1); + io_write_newline(logfile); io_flush(logfile); } @@ -142,8 +142,6 @@ void dbg_logger_file(const char *filename) } /* */ -int memory_alloced = 0; - typedef struct MEMHEADER { const char *filename; @@ -165,8 +163,10 @@ void *mem_alloc_debug(const char *filename, int line, unsigned size, unsigned al { /* TODO: fix alignment */ /* TODO: add debugging */ + MEMTAIL *tail; MEMHEADER *header = (struct MEMHEADER *)malloc(size+sizeof(MEMHEADER)+sizeof(MEMTAIL)); - MEMTAIL *tail = (struct MEMTAIL *)(((char*)(header+1))+size); + dbg_assert(header != 0, "mem_alloc failure"); + tail = (struct MEMTAIL *)(((char*)(header+1))+size); header->size = size; header->filename = filename; header->line = line; @@ -222,8 +222,9 @@ void mem_debug_dump(IOHANDLE file) { while(header) { - str_format(buf, sizeof(buf), "%s(%d): %d\n", header->filename, header->line, header->size); + str_format(buf, sizeof(buf), "%s(%d): %d", header->filename, header->line, header->size); io_write(file, buf, strlen(buf)); + io_write_newline(file); header = header->next; } @@ -346,6 +347,15 @@ unsigned io_write(IOHANDLE io, const void *buffer, unsigned size) return fwrite(buffer, 1, size, (FILE*)io); } +unsigned io_write_newline(IOHANDLE io) +{ +#if defined(CONF_FAMILY_WINDOWS) + return fwrite("\r\n", 1, 2, (FILE*)io); +#else + return fwrite("\n", 1, 1, (FILE*)io); +#endif +} + int io_close(IOHANDLE io) { fclose((FILE*)io); @@ -600,18 +610,18 @@ int net_addr_comp(const NETADDR *a, const NETADDR *b) return mem_comp(a, b, sizeof(NETADDR)); } -void net_addr_str(const NETADDR *addr, char *string, int max_length) +void net_addr_str(const NETADDR *addr, char *string, int max_length, int add_port) { if(addr->type == NETTYPE_IPV4) { - if(addr->port != 0) + if(add_port != 0) str_format(string, max_length, "%d.%d.%d.%d:%d", addr->ip[0], addr->ip[1], addr->ip[2], addr->ip[3], addr->port); else str_format(string, max_length, "%d.%d.%d.%d", addr->ip[0], addr->ip[1], addr->ip[2], addr->ip[3]); } else if(addr->type == NETTYPE_IPV6) { - if(addr->port != 0) + if(add_port != 0) str_format(string, max_length, "[%x:%x:%x:%x:%x:%x:%x:%x]:%d", (addr->ip[0]<<8)|addr->ip[1], (addr->ip[2]<<8)|addr->ip[3], (addr->ip[4]<<8)|addr->ip[5], (addr->ip[6]<<8)|addr->ip[7], (addr->ip[8]<<8)|addr->ip[9], (addr->ip[10]<<8)|addr->ip[11], (addr->ip[12]<<8)|addr->ip[13], (addr->ip[14]<<8)|addr->ip[15], @@ -1515,7 +1525,7 @@ int net_socket_read_wait(NETSOCKET sock, int time) return 0; } -unsigned time_timestamp() +int time_timestamp() { return time(0); } diff --git a/src/base/system.h b/src/base/system.h index ca93279f..b3588dbf 100644 --- a/src/base/system.h +++ b/src/base/system.h @@ -240,6 +240,18 @@ unsigned io_skip(IOHANDLE io, int size); unsigned io_write(IOHANDLE io, const void *buffer, unsigned size); /* + Function: io_write_newline + Writes newline to file. + + Parameters: + io - Handle to the file. + + Returns: + Number of bytes written. +*/ +unsigned io_write_newline(IOHANDLE io); + +/* Function: io_seek Seeks to a specified offset in the file. @@ -442,7 +454,7 @@ int64 time_freq(); Returns: The time as a UNIX timestamp */ -unsigned time_timestamp(); +int time_timestamp(); /* Group: Network General */ typedef struct @@ -516,12 +528,13 @@ int net_addr_comp(const NETADDR *a, const NETADDR *b); addr - Address to turn into a string. string - Buffer to fill with the string. max_length - Maximum size of the string. + add_port - add port to string or not Remarks: - The string will always be zero terminated */ -void net_addr_str(const NETADDR *addr, char *string, int max_length); +void net_addr_str(const NETADDR *addr, char *string, int max_length, int add_port); /* Function: net_addr_from_str @@ -1147,25 +1160,6 @@ void mem_debug_dump(IOHANDLE file); void swap_endian(void *data, unsigned elem_size, unsigned num); -/* Group: Debug levels */ -//by format -enum { - DBG_FMT_RAW = 1, //raw output - DBG_FMT_TIME = 2, //show time - DBG_FMT_SYS = 3, //show sys - DBG_FMT_FULL = 4 //show both -}; - -enum { - DBG_LEVEL_IMPORTANT = 0, //important always showed messages - DBG_LEVEL_ERROR = 1, //error messages - DBG_LEVEL_WARNING = 2, //warning messages - DBG_LEVEL_MSG = 3, //extra debug messages - DBG_LEVEL_INFO = 4 //info messages -}; - -#define DBG_LEVEL_LOW DBG_LEVEL_IMPORTANT -#define DBG_LEVEL_HIGH DBG_LEVEL_INFO typedef void (*DBG_LOGGER)(const char *line); void dbg_logger(DBG_LOGGER logger); |