rovema.kpaste.net RSS
Difference between
modified post a1ab9a3 by Anonymous on Wed 6th Jul 2022 12:17
original post 0ae238f15 by Anonymous on Wed 6th Jul 2022 11:58
Download diff
Show
old version |
new version |
both versions
| 1 | 1 | --- /dev/null 2022-04-19 22:28:32.062891741 +0200 | |
| 2 | - | +++ pthread_mutex_init_log.c 2022-07-06 12:57:16.111555681 +0200 | |
| 2 | + | +++ pthread_mutex_init_log.c 2022-07-06 13:16:29.462859109 +0200 | |
| 3 | - | @@ -0,0 +1,64 @@ | |
| 3 | + | @@ -0,0 +1,82 @@ | |
| 4 | + | +/* | |
| 5 | 11 | + | |
| 12 | + | +#define _GNU_SOURCE 1 /* needed for |RTLD_NEXT| */ | |
| 6 | 14 | +#include <pthread.h> | |
| 7 | 15 | +#include <unistd.h> | |
| 8 | 16 | +#include <errno.h> | |
| 9 | 17 | +#include <stdio.h> | |
| 10 | 18 | +#include <string.h> | |
| 11 | 19 | +#include <stdbool.h> | |
| 12 | 20 | +#include <dlfcn.h> | |
| 13 | 21 | + | |
| 14 | - | +static int once = 0; | |
| 22 | + | +/* config */ | |
| 23 | + | +#define PMICFG_PRINT_ONCE_MSG 1 | |
| 15 | 25 | + | |
| 26 | + | + | |
| 16 | 27 | +#define STDERR_MSG(msg) \ | |
| 17 | - | + (void)write(2, (msg), strlen(msg)) | |
| 28 | + | + (void)write(STDERR_FILENO, (msg), strlen(msg)) | |
| 18 | 29 | + | |
| 19 | 30 | +int pthread_mutex_init(pthread_mutex_t *restrict mutex, | |
| 20 | 31 | + const pthread_mutexattr_t *restrict attr) { | |
| 21 | 32 | + pthread_mutexattr_t *xattr = (pthread_mutexattr_t *)attr; | |
| 22 | 33 | + int pmi_res; | |
| 23 | 34 | + int pmi_errno; | |
| 24 | 35 | + | |
| 25 | - | + const char *mymessage = "pthread_mutex_init_log.so: In our own pthread_mutex_init()\n"; | |
| 36 | + | +#if PMICFG_PRINT_ONCE_MSG | |
| 37 | + | + static int once = 0; | |
| 26 | 40 | + /* just print message ONCE */ | |
| 27 | 41 | + if (once++ == 0) | |
| 28 | 42 | + STDERR_MSG(mymessage); | |
| 43 | + | +#endif /* PMICFG_PRINT_ONCE_MSG */ | |
| 29 | 44 | + | |
| 30 | 45 | + int (*original_pthread_mutex_init)(pthread_mutex_t *restrict mutex, | |
| 31 | 46 | + const pthread_mutexattr_t *restrict attr); | |
| 32 | 47 | + original_pthread_mutex_init = dlsym(RTLD_NEXT, "pthread_mutex_init"); | |
| 33 | 48 | + | |
| 34 | 49 | + pthread_mutexattr_t myattr; | |
| 35 | 50 | + bool myattr_used = false; | |
| 36 | 51 | + | |
| 37 | 52 | + if (!xattr) { | |
| 38 | - | + pthread_mutexattr_init(&myattr); | |
| 53 | + | + (void)pthread_mutexattr_init(&myattr); | |
| 39 | 54 | + myattr_used = true; | |
| 40 | 55 | + xattr = &myattr; | |
| 41 | 56 | + } | |
| 42 | 57 | + | |
| 58 | + | +#if PMICFG_ENFORCE_PRIO_INHERIT | |
| 43 | 59 | + int mutex_protocol = -666; | |
| 44 | 60 | + (void)pthread_mutexattr_getprotocol(xattr, &mutex_protocol); | |
| 45 | 61 | + if (mutex_protocol != PTHREAD_PRIO_INHERIT) { | |
| 46 | - | + char msgbuff[1024]; | |
| 62 | + | + char msgbuff[256]; /* fixed size, but no |malloc()| allowed here */ | |
| 47 | 63 | + | |
| 48 | - | + pthread_mutexattr_setprotocol(xattr, PTHREAD_PRIO_INHERIT); | |
| 64 | + | + (void)pthread_mutexattr_setprotocol(xattr, PTHREAD_PRIO_INHERIT); | |
| 49 | - | + snprintf(msgbuff, | |
| 65 | + | + (void)snprintf(msgbuff, | |
| 50 | 66 | + sizeof(msgbuff), | |
| 51 | 67 | + "pthread_mutex_init_log.so: " | |
| 52 | - | + "PTHREAD_PRIO_INHERIT enforced for %lx, was %d\n", | |
| 68 | + | + "PTHREAD_PRIO_INHERIT enforced " | |
| 69 | + | + "for mutex=%lx, was protocol=%d\n", | |
| 53 | 70 | + (void *)mutex, | |
| 54 | 71 | + mutex_protocol); | |
| 55 | 72 | + STDERR_MSG(msgbuff); | |
| 56 | 73 | + } | |
| 74 | + | +#endif /* PMICFG_ENFORCE_PRIO_INHERIT */ | |
| 57 | 75 | + | |
| 58 | 76 | + pmi_res = (*original_pthread_mutex_init)(mutex, xattr); | |
| 59 | 77 | + pmi_errno = errno; | |
| 60 | 78 | + | |
| 61 | 79 | + if (myattr_used) { | |
| 62 | - | + pthread_mutexattr_destroy(&myattr); | |
| 80 | + | + (void)pthread_mutexattr_destroy(&myattr); | |
| 63 | 81 | + } | |
| 64 | 82 | + | |
| 65 | 83 | + errno = pmi_errno; | |
| 66 | 84 | + return pmi_res; | |
| 67 | 85 | +} | |
| 68 | 86 | --- /dev/null 2022-04-19 22:28:32.062891741 +0200 | |
| 69 | - | +++ test1.c 2022-07-06 11:16:22.874096153 +0200 | |
| 87 | + | +++ test1.c 2022-07-06 13:15:43.266402121 +0200 | |
| 70 | - | @@ -0,0 +1,16 @@ | |
| 88 | + | @@ -0,0 +1,20 @@ | |
| 71 | 89 | +#include <pthread.h> | |
| 72 | 90 | +#include <errno.h> | |
| 73 | 91 | +#include <stdio.h> | |
| 74 | 92 | + | |
| 75 | 93 | +int main(void) { | |
| 76 | 94 | + (void)puts("# start."); | |
| 77 | 95 | + | |
| 78 | - | + pthread_mutex_t mutex; | |
| 96 | + | + pthread_mutex_t mutex1; | |
| 97 | + | + pthread_mutex_t mutex2; | |
| 79 | 98 | + | |
| 80 | - | + pthread_mutex_init(&mutex, NULL); | |
| 99 | + | + pthread_mutex_init(&mutex1, NULL); | |
| 81 | - | + perror("pthread_mutex_init() result"); | |
| 100 | + | + perror("pthread_mutex_init(1) result"); | |
| 82 | 101 | + | |
| 102 | + | + pthread_mutex_init(&mutex2, NULL); | |
| 84 | 104 | + | |
| 105 | + | + (void)puts("# end."); | |
| 85 | 107 | + return 0; | |
| 86 | 108 | +} | |
| 87 | 109 | --- /dev/null 2022-04-19 22:28:32.062891741 +0200 | |
| 88 | - | +++ Makefile 2022-07-06 12:55:59.122798683 +0200 | |
| 110 | + | +++ Makefile 2022-07-06 13:07:04.461318913 +0200 | |
| 89 | - | @@ -0,0 +1,14 @@ | |
| 111 | + | @@ -0,0 +1,22 @@ | |
| 90 | 112 | + | |
| 113 | + | +# | |
| 91 | 118 | +pthread_mutex_init_log.o: pthread_mutex_init_log.c | |
| 92 | 119 | + gcc -std=gnu11 -g pthread_mutex_init_log.c -fPIC -c -o pthread_mutex_init_log.o | |
| 93 | 120 | +pthread_mutex_init_log.so: pthread_mutex_init_log.o | |
| 94 | 121 | + gcc -std=gnu11 -g pthread_mutex_init_log.o -fPIC -shared -ldl -lpthread -o pthread_mutex_init_log.so | |
| 95 | 122 | + | |
| 96 | 123 | +test1: test1.c | |
| 97 | 124 | + gcc -std=gnu11 -g test1.c -o test1 | |
| 98 | 125 | + | |
| 99 | 126 | +run_test: test1 pthread_mutex_init_log.so | |
| 100 | 127 | + ksh93 -c 'LD_PRELOAD=$$PWD/pthread_mutex_init_log.so ./test1' | |
| 101 | 128 | + | |
| 129 | + | +all: run_test | |
| 102 | 131 | +clean: | |
| 103 | 132 | + rm -f *.o *.so test1 | |
| 133 | + | + | |
| 104 | 134 |
Submit a correction or amendment below (click here to make a fresh posting)
After submitting an amendment, you'll be able to view the differences between the old and new posts easily.