mirror of
https://github.com/Zenithsiz/ftmemsim-valgrind.git
synced 2026-02-09 21:28:19 +00:00
83780627b5
handlers when a thread is cancelled which has the side effect that programs linked with librt fail on Fedora Core 2 due to librt having been built against the NPTL header instead of the old pthread headers. This change extends valgrind's libpthread.so to handle both the old and new style cleanup handlers in a similar way to NPTL and seems to be sufficient to get programs linked with librt working again. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@2405
67 lines
1.1 KiB
C
67 lines
1.1 KiB
C
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <pthread.h>
|
|
#include <unistd.h>
|
|
|
|
static void thread_cleanup(void *arg)
|
|
{
|
|
printf("cleaning up %p\n", arg);
|
|
|
|
return;
|
|
}
|
|
|
|
static void *thread_main(void *arg)
|
|
{
|
|
pthread_cleanup_push(thread_cleanup, (void *)0x1234);
|
|
pthread_cleanup_push(thread_cleanup, (void *)0x5678);
|
|
|
|
if (pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL) != 0)
|
|
{
|
|
perror("pthread_setcanceltype");
|
|
return NULL;
|
|
}
|
|
|
|
if (pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL) != 0)
|
|
{
|
|
perror("pthread_setcancelstate");
|
|
return NULL;
|
|
}
|
|
|
|
pause();
|
|
|
|
pthread_cleanup_pop(0);
|
|
pthread_cleanup_pop(0);
|
|
|
|
return NULL;
|
|
}
|
|
|
|
int main(int argc, char **argv)
|
|
{
|
|
pthread_t tid;
|
|
void *result;
|
|
|
|
if (pthread_create(&tid, NULL, thread_main, NULL) != 0)
|
|
{
|
|
perror("pthread_create");
|
|
exit(1);
|
|
}
|
|
|
|
sleep(1);
|
|
|
|
if (pthread_cancel(tid) != 0)
|
|
{
|
|
perror("pthread_cancel");
|
|
exit(1);
|
|
}
|
|
|
|
if (pthread_join(tid, &result) != 0)
|
|
{
|
|
perror("pthread_join");
|
|
exit(1);
|
|
}
|
|
|
|
printf("result = %p\n", result);
|
|
|
|
exit(0);
|
|
}
|