lorenz.stechauner/BSc-Thesis
1
0
Fork 0
Code Activity

proj: Small fixes

Browse Source
This commit is contained in:
Lorenz Stechauner
2025-02-23 12:27:06 +01:00
parent 3db8439a9b
commit 10a16fbf42
5 changed files with 91 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
proj/test1/Makefile
View File

@@ -25,7 +25,7 @@ main: bin/main.o
$(CC) -o $@ $^ $(CFLAGS) -lc -lpthread
main_intercept: bin/main.o src/intercept.c
$(CC) -o $@ $^ $(CFLAGS) -lc -Wl,--wrap=malloc,--wrap=free,--wrap=calloc,--wrap=realloc,--wrap=reallocarray,--wrap=getopt,--wrap=close,\
$(CC) -o $@ $^ $(CFLAGS) -lc -Wl,--wrap=malloc,--wrap=free,--wrap=calloc,--wrap=realloc,--wrap=reallocarray,--wrap=getopt,--wrap=exit,--wrap=close,\
--wrap=sem_init,--wrap=sem_open,--wrap=sem_post,--wrap=sem_wait,--wrap=sem_trywait,--wrap=sem_timedwait,--wrap=sem_getvalue,--wrap=sem_close,--wrap=sem_unlink,--wrap=sem_destroy
clean:

91
proj/test1/src/intercept.c
View File

@@ -26,6 +26,7 @@ static void *(*__real_realloc)(void *, size_t);
static void *(*__real_reallocarray)(void *, size_t, size_t);
static void (*__real_free)(void *);
static int (*__real_getopt)(int, char *const [], const char *);
static void (*__real_exit)(int);
static int (*__real_close)(int);
static int (*__real_sem_init)(sem_t *, int, unsigned int);
static sem_t *(*__real_sem_open)(const char *, int, ...);
@@ -37,12 +38,12 @@ static int (*__real_sem_getvalue)(sem_t *restrict, int *restrict);
static int (*__real_sem_close)(sem_t *);
static int (*__real_sem_unlink)(const char *);
static int (*__real_sem_destroy)(sem_t *);
#define __load(var, name) \
#define load(var, name) \
if (((var) = dlsym(RTLD_NEXT, name)) == NULL) { \
fprintf(stderr, "intercept: unable to load symbol '%s': %s", name, strerror(errno)); \
return; \
}
#define __sym(name) name
#define sym(name) name
#else
extern void *__real_malloc(size_t);
extern void *__real_calloc(size_t, size_t);
@@ -50,6 +51,7 @@ extern void *__real_realloc(void *, size_t);
extern void *__real_reallocarray(void *, size_t, size_t);
extern void __real_free(void *);
extern int __real_getopt(int, char *const [], const char *);
extern void __real_exit(int);
extern int __real_close(int);
extern int __real_sem_init(sem_t *, int, unsigned int);
extern sem_t *__real_sem_open(const char *, int, ...);
@@ -61,7 +63,7 @@ extern int __real_sem_getvalue(sem_t *restrict, int *restrict);
extern int __real_sem_close(sem_t *);
extern int __real_sem_unlink(const char *);
extern int __real_sem_destroy(sem_t *);
#define __sym(name) __wrap_ ## name
#define sym(name) __wrap_ ## name
#endif
#define if_invalid(name) if (strcmp(buf, "ok") != 0) { fprintf(stderr, "intercept: " #name ": invalid command: '%s'\n", buf); }
@@ -423,7 +425,7 @@ static void rcv(char *buf, const int size) {
static void fin(void) {
if (intercept && mode > 2)
close(intercept);
__real_close(intercept);
if (mode > 0)
fprintf(stderr, "intercept: stopped\n");
mode = 0, intercept = 0;
@@ -432,23 +434,24 @@ static void fin(void) {
static void init(void) {
if (mode) return;
#ifdef INTERCEPT_PRELOAD
__load(__real_malloc, "malloc");
__load(__real_calloc, "calloc");
__load(__real_realloc, "realloc");
__load(__real_reallocarray, "reallocarray");
__load(__real_free, "free");
__load(__real_getopt, "getopt");
__load(__real_close, "close");
__load(__real_sem_init, "sem_init");
__load(__real_sem_open, "sem_open");
__load(__real_sem_post, "sem_post");
__load(__real_sem_wait, "sem_wait");
__load(__real_sem_wait, "sem_trywait");
__load(__real_sem_wait, "sem_timedwait");
__load(__real_sem_getvalue, "sem_getvalue");
__load(__real_sem_close, "sem_close");
__load(__real_sem_unlink, "sem_unlink");
__load(__real_sem_destroy, "sem_destroy");
load(__real_malloc, "malloc");
load(__real_calloc, "calloc");
load(__real_realloc, "realloc");
load(__real_reallocarray, "reallocarray");
load(__real_free, "free");
load(__real_getopt, "getopt");
load(__real_exit, "exit");
load(__real_close, "close");
load(__real_sem_init, "sem_init");
load(__real_sem_open, "sem_open");
load(__real_sem_post, "sem_post");
load(__real_sem_wait, "sem_wait");
load(__real_sem_wait, "sem_trywait");
load(__real_sem_wait, "sem_timedwait");
load(__real_sem_getvalue, "sem_getvalue");
load(__real_sem_close, "sem_close");
load(__real_sem_unlink, "sem_unlink");
load(__real_sem_destroy, "sem_destroy");
#endif
atexit(fin);
const char *val = getenv("INTERCEPT");
@@ -497,7 +500,7 @@ static void init(void) {
}
}
void *__sym(malloc)(size_t size) {
void *sym(malloc)(size_t size) {
init();
msg("malloc(%li): %p", size, __builtin_return_address(0));
if (mode >= 4) {
@@ -513,7 +516,7 @@ void *__sym(malloc)(size_t size) {
return ret;
}
void *__sym(calloc)(size_t nmemb, size_t size) {
void *sym(calloc)(size_t nmemb, size_t size) {
init();
msg("calloc(%li, %li): %p", nmemb, size, __builtin_return_address(0));
if (mode >= 4) {
@@ -529,7 +532,7 @@ void *__sym(calloc)(size_t nmemb, size_t size) {
return ret;
}
void *__sym(realloc)(void *ptr, size_t size) {
void *sym(realloc)(void *ptr, size_t size) {
init();
msg("realloc(%p, %li): %p", ptr, size, __builtin_return_address(0));
if (mode >= 4) {
@@ -545,7 +548,7 @@ void *__sym(realloc)(void *ptr, size_t size) {
return ret;
}
void *__sym(reallocarray)(void *ptr, size_t nmemb, size_t size) {
void *sym(reallocarray)(void *ptr, size_t nmemb, size_t size) {
init();
msg("reallocarray(%p, %li): %p", ptr, size, __builtin_return_address(0));
if (mode >= 4) {
@@ -561,7 +564,7 @@ void *__sym(reallocarray)(void *ptr, size_t nmemb, size_t size) {
return ret;
}
void __sym(free)(void *ptr) {
void sym(free)(void *ptr) {
init();
msg("free(%p): %p", ptr, __builtin_return_address(0));
if (mode >= 4) {
@@ -575,7 +578,7 @@ void __sym(free)(void *ptr) {
msg("return");
}
int __sym(getopt)(const int argc, char *const argv[], const char *shortopts) {
int sym(getopt)(const int argc, char *const argv[], const char *shortopts) {
init();
msg("getopt(%i, %as, %es): %p", argc, argv, argc, shortopts, __builtin_return_address(0));
if (mode >= 4) {
@@ -593,7 +596,19 @@ int __sym(getopt)(const int argc, char *const argv[], const char *shortopts) {
return ret;
}
int __sym(close)(int fildes) {
void sym(exit)(int status) {
init();
msg("exit(%i): %p", status, __builtin_return_address(0));
if (mode >= 4) {
char buf[BUFFER_SIZE];
rcv(buf, sizeof(buf));
if_modify_int("exit", int, status)
else if_invalid(getopt)
}
__real_exit(status);
}
int sym(close)(int fildes) {
init();
msg("close(%i): %p", fildes, __builtin_return_address(0));
if (mode >= 4) {
@@ -609,7 +624,7 @@ int __sym(close)(int fildes) {
return ret;
}
int __sym(sem_init)(sem_t *sem, int pshared, unsigned int value) {
int sym(sem_init)(sem_t *sem, int pshared, unsigned int value) {
init();
msg("sem_init(%p, %i, %u): %p", sem, pshared, value, __builtin_return_address(0));
if (mode >= 4) {
@@ -625,7 +640,7 @@ int __sym(sem_init)(sem_t *sem, int pshared, unsigned int value) {
return ret;
}
sem_t *__sym(sem_open)(const char *name, int oflag, ...) {
sem_t *sym(sem_open)(const char *name, int oflag, ...) {
init();
char ostr[32] = "|";
if (oflag & O_CREAT) strcat(ostr, "O_CREAT|");
@@ -712,7 +727,7 @@ sem_t *__sym(sem_open)(const char *name, int oflag, ...) {
return ret;
}
int __sym(sem_post)(sem_t *sem) {
int sym(sem_post)(sem_t *sem) {
init();
msg("sem_post(%p): %p", sem, __builtin_return_address(0));
if (mode >= 4) {
@@ -728,7 +743,7 @@ int __sym(sem_post)(sem_t *sem) {
return ret;
}
int __sym(sem_wait)(sem_t *sem) {
int sym(sem_wait)(sem_t *sem) {
init();
msg("sem_wait(%p): %p", sem, __builtin_return_address(0));
if (mode >= 4) {
@@ -744,7 +759,7 @@ int __sym(sem_wait)(sem_t *sem) {
return ret;
}
int __sym(sem_trywait)(sem_t *sem) {
int sym(sem_trywait)(sem_t *sem) {
init();
msg("sem_trywait(%p): %p", sem, __builtin_return_address(0));
if (mode >= 4) {
@@ -760,7 +775,7 @@ int __sym(sem_trywait)(sem_t *sem) {
return ret;
}
int __sym(sem_timedwait)(sem_t *restrict sem, const struct timespec *restrict abs_timeout) {
int sym(sem_timedwait)(sem_t *restrict sem, const struct timespec *restrict abs_timeout) {
init();
msg("sem_timedwait(%p, %p:{tv_sec: %li, tv_nsec: %li}): %p", sem, abs_timeout, abs_timeout->tv_sec, abs_timeout->tv_nsec, __builtin_return_address(0));
struct timespec overwrite;
@@ -805,7 +820,7 @@ int __sym(sem_timedwait)(sem_t *restrict sem, const struct timespec *restrict ab
return ret;
}
int __sym(sem_getvalue)(sem_t *restrict sem, int *restrict value) {
int sym(sem_getvalue)(sem_t *restrict sem, int *restrict value) {
init();
msg("sem_getvalue(%p, %p): %p", sem, value, __builtin_return_address(0));
if (mode >= 4) {
@@ -821,7 +836,7 @@ int __sym(sem_getvalue)(sem_t *restrict sem, int *restrict value) {
return ret;
}
int __sym(sem_close)(sem_t *sem) {
int sym(sem_close)(sem_t *sem) {
init();
msg("sem_close(%p): %p", sem, __builtin_return_address(0));
if (mode >= 4) {
@@ -837,7 +852,7 @@ int __sym(sem_close)(sem_t *sem) {
return ret;
}
int __sym(sem_unlink)(const char *name) {
int sym(sem_unlink)(const char *name) {
init();
msg("sem_unlink(%es): %p", name, __builtin_return_address(0));
char overwrite[BUFFER_SIZE];
@@ -868,7 +883,7 @@ int __sym(sem_unlink)(const char *name) {
return ret;
}
int __sym(sem_destroy)(sem_t *sem) {
int sym(sem_destroy)(sem_t *sem) {
init();
msg("sem_destroy(%p): %p", sem, __builtin_return_address(0));
if (mode >= 4) {

3
proj/test1/src/main.c
View File

@@ -32,7 +32,8 @@ void do_sem(void) {
while (sem_wait(&sem) == -1) {
if (errno != EINTR) {
// TODO fail
fprintf(stderr, "Unable to sem_wait: %s\n", strerror(errno));
exit(1);
}
}