sigmasternchen/CFloor
1
0
Fork 0
mirror of https://github.com/sigmasternchen/CFloor synced 2025-03-15 20:28:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

moved getTimestamp to util module

Browse source
This commit is contained in:
overflowerror 2021-04-29 23:53:25 +02:00
parent 241b3975e1
commit 8ea65f4539
4 changed files with 50 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
src/logging.c
View file

@ -4,12 +4,11 @@
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#include <stdarg.h> #include <stdarg.h>
#include <sys/time.h>
#include <time.h>
#include <assert.h> #include <assert.h>
#include <semaphore.h> #include <semaphore.h>
#include "logging.h" #include "logging.h"
#include "util.h"
#ifdef BACKTRACE #ifdef BACKTRACE
#include <execinfo.h> #include <execinfo.h>
@ -89,50 +88,6 @@ void printBacktrace() {
#endif #endif
} }
char* getTimestamp() {
#define MSEC_LENGTH (3)
#define TIME_LENGTH (4 + 1 + 2 + 1 + 2 + 1 + 2 + 1 + 2 + 1 + 2 + 1 + MSEC_LENGTH)
char* result = malloc(TIME_LENGTH + 1);
if (result == NULL) {
fprintf(stderr, "\nDEVASTATING: Couldn't malloc for log time.\n");
callCritical();
exit(EXIT_DEVASTATING);
}
int millisec;
struct tm* tm_info;
struct timeval tv;
gettimeofday(&tv, NULL);
millisec = (int) (tv.tv_usec / 1000.0);
if (millisec >= 1000) {
millisec -=1000;
tv.tv_sec++;
}
tm_info = localtime(&tv.tv_sec);
strftime(result, 26, "%Y-%m-%dT%H:%M:%S", tm_info);
char* msecBuffer = malloc(1 + MSEC_LENGTH + 1);
if (msecBuffer == NULL) {
fprintf(stderr, "\nDEVASTATING: Couldn't malloc for log time.\n");
callCritical();
exit(EXIT_DEVASTATING);
}
snprintf(msecBuffer, 1 + MSEC_LENGTH + 1, ".%03d", millisec);
strncat(result, msecBuffer, TIME_LENGTH + 1);
free(msecBuffer);
return result;
}
char* getLoglevelString(loglevel_t loglevel, bool color) { char* getLoglevelString(loglevel_t loglevel, bool color) {
#define DEBUG_STRING "[DEBUG]" #define DEBUG_STRING "[DEBUG]"
#define VERBOSE_STRING "[VERBOSE]" #define VERBOSE_STRING "[VERBOSE]"

1
src/logging.h
View file

@ -25,6 +25,7 @@ typedef int loglevel_t;
void setLogging(FILE* file, loglevel_t loglevel, bool color); void setLogging(FILE* file, loglevel_t loglevel, bool color);
void setCriticalHandler(void (*handler)()); void setCriticalHandler(void (*handler)());
void callCritical();
void printBacktrace(); void printBacktrace();

46
src/util.c
View file

@ -5,6 +5,8 @@
#include <errno.h> #include <errno.h>
#include <stdio.h> #include <stdio.h>
#include <fcntl.h> #include <fcntl.h>
#include <sys/time.h>
#include <time.h>
#include <pthread.h> #include <pthread.h>
@ -196,3 +198,47 @@ int strlenOfNumber(long long number) {
return result; return result;
} }
char* getTimestamp() {
#define MSEC_LENGTH (3)
#define TIME_LENGTH (4 + 1 + 2 + 1 + 2 + 1 + 2 + 1 + 2 + 1 + 2 + 1 + MSEC_LENGTH)
char* result = malloc(TIME_LENGTH + 1);
if (result == NULL) {
fprintf(stderr, "\nDEVASTATING: Couldn't malloc for log time.\n");
callCritical();
exit(EXIT_DEVASTATING);
}
int millisec;
struct tm* tm_info;
struct timeval tv;
gettimeofday(&tv, NULL);
millisec = (int) (tv.tv_usec / 1000.0);
if (millisec >= 1000) {
millisec -=1000;
tv.tv_sec++;
}
tm_info = localtime(&tv.tv_sec);
strftime(result, 26, "%Y-%m-%dT%H:%M:%S", tm_info);
char* msecBuffer = malloc(1 + MSEC_LENGTH + 1);
if (msecBuffer == NULL) {
fprintf(stderr, "\nDEVASTATING: Couldn't malloc for log time.\n");
callCritical();
exit(EXIT_DEVASTATING);
}
snprintf(msecBuffer, 1 + MSEC_LENGTH + 1, ".%03d", millisec);
strncat(result, msecBuffer, TIME_LENGTH + 1);
free(msecBuffer);
return result;
}

2
src/util.h
View file

@ -22,4 +22,6 @@ char* strclone(const char* string);
int strlenOfNumber(long long number); int strlenOfNumber(long long number);
char* getTimestamp();
#endif #endif