Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Win32: Fix object::cache::threadmania test on x64 #2409

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 8, 2014
Merged

Win32: Fix object::cache::threadmania test on x64 #2409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb59176
Win32: Fix object::cache::threadmania test on x64
phkelley Jun 7, 2014
1b4e29b
React to review feedback
phkelley Jun 7, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/global.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ static void git__shutdown(void)
static DWORD _tls_index;
static volatile LONG _mutex = 0;

static int synchronized_threads_init()
static int synchronized_threads_init(void)
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The GCC in MinGW was complaining about this.

{
int error;

Expand Down Expand Up @@ -112,7 +112,7 @@ int git_threads_init(void)
return error;
}

static void synchronized_threads_shutdown()
static void synchronized_threads_shutdown(void)
{
/* Shut down any subsystems that have global state */
git__shutdown();
Expand Down
2 changes: 1 addition & 1 deletion src/pack-objects.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1209,7 +1209,7 @@ static int ll_find_deltas(git_packbuilder *pb, git_pobject **list,
git_mutex_unlock(&target->mutex);

if (!sub_size) {
git_thread_join(target->thread, NULL);
git_thread_join(&target->thread, NULL);
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

An example of the effects of the programming model change. Unfortunately, the signature of git_thread_join no longer matches that of pthread_join(3).

git_cond_free(&target->cond);
git_mutex_free(&target->mutex);
active_threads--;
Expand Down
20 changes: 12 additions & 8 deletions src/thread-utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,18 @@ typedef git_atomic git_atomic_ssize;

#ifdef GIT_THREADS

#define git_thread pthread_t
#define git_thread_create(thread, attr, start_routine, arg) \
pthread_create(thread, attr, start_routine, arg)
#define git_thread_kill(thread) pthread_cancel(thread)
#define git_thread_exit(status) pthread_exit(status)
#define git_thread_join(id, status) pthread_join(id, status)
#if !defined(GIT_WIN32)

typedef struct {
pthread_t thread;
} git_thread;

#define git_thread_create(git_thread_ptr, attr, start_routine, arg) \
pthread_create(&(git_thread_ptr)->thread, attr, start_routine, arg)
#define git_thread_join(git_thread_ptr, status) \
pthread_join((git_thread_ptr)->thread, status)

#endif

#if defined(GIT_WIN32)
#define git_thread_yield() Sleep(0)
Expand Down Expand Up @@ -179,8 +185,6 @@ GIT_INLINE(int64_t) git_atomic64_add(git_atomic64 *a, int64_t addend)

#define git_thread unsigned int
#define git_thread_create(thread, attr, start_routine, arg) 0
#define git_thread_kill(thread) (void)0
#define git_thread_exit(status) (void)0
#define git_thread_join(id, status) (void)0
#define git_thread_yield() (void)0

Expand Down
109 changes: 61 additions & 48 deletions src/win32/pthread.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,32 +8,64 @@
#include "pthread.h"
#include "../global.h"

int pthread_create(
pthread_t *GIT_RESTRICT thread,
#define CLEAN_THREAD_EXIT 0x6F012842
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a random number.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image
From https://xkcd.com/221/


/* The thread procedure stub used to invoke the caller's procedure
* and capture the return value for later collection. Windows will
* only hold a DWORD, but we need to be able to store an entire
* void pointer. This requires the indirection. */
static DWORD WINAPI git_win32__threadproc(LPVOID lpParameter)
{
git_win32_thread *thread = lpParameter;

thread->result = thread->proc(thread->param);

return CLEAN_THREAD_EXIT;
}

int git_win32__thread_create(
git_win32_thread *GIT_RESTRICT thread,
const pthread_attr_t *GIT_RESTRICT attr,
void *(*start_routine)(void*),
void *GIT_RESTRICT arg)
{
GIT_UNUSED(attr);
*thread = CreateThread(
NULL, 0, (LPTHREAD_START_ROUTINE)start_routine, arg, 0, NULL);
return *thread ? 0 : -1;

thread->result = NULL;
thread->param = arg;
thread->proc = start_routine;
thread->thread = CreateThread(
NULL, 0, git_win32__threadproc, thread, 0, NULL);

return thread->thread ? 0 : -1;
}

int pthread_join(pthread_t thread, void **value_ptr)
int git_win32__thread_join(
git_win32_thread *thread,
void **value_ptr)
{
DWORD ret = WaitForSingleObject(thread, INFINITE);
DWORD exit;

if (WaitForSingleObject(thread->thread, INFINITE) != WAIT_OBJECT_0)
return -1;

if (!GetExitCodeThread(thread->thread, &exit)) {
CloseHandle(thread->thread);
return -1;
}

if (ret == WAIT_OBJECT_0) {
if (value_ptr != NULL) {
*value_ptr = NULL;
GetExitCodeThread(thread, (void *)value_ptr);
}
CloseHandle(thread);
return 0;
/* Check for the thread having exited uncleanly. If exit was unclean,
* then we don't have a return value to give back to the caller. */
if (exit != CLEAN_THREAD_EXIT) {
assert(false);
thread->result = NULL;
}

return -1;
if (value_ptr)
*value_ptr = thread->result;

CloseHandle(thread->thread);
return 0;
}

int pthread_mutex_init(
Expand Down Expand Up @@ -144,9 +176,6 @@ int pthread_num_processors_np(void)
return n ? n : 1;
}


static HINSTANCE win32_kernel32_dll;

typedef void (WINAPI *win32_srwlock_fn)(GIT_SRWLOCK *);

static win32_srwlock_fn win32_srwlock_initialize;
Expand All @@ -159,7 +188,7 @@ int pthread_rwlock_init(
pthread_rwlock_t *GIT_RESTRICT lock,
const pthread_rwlockattr_t *GIT_RESTRICT attr)
{
(void)attr;
GIT_UNUSED(attr);

if (win32_srwlock_initialize)
win32_srwlock_initialize(&lock->native.srwl);
Expand Down Expand Up @@ -217,38 +246,22 @@ int pthread_rwlock_destroy(pthread_rwlock_t *lock)
return 0;
}


static void win32_pthread_shutdown(void)
{
if (win32_kernel32_dll) {
FreeLibrary(win32_kernel32_dll);
win32_kernel32_dll = NULL;
}
}

int win32_pthread_initialize(void)
{
if (win32_kernel32_dll)
return 0;

win32_kernel32_dll = LoadLibrary("Kernel32.dll");
if (!win32_kernel32_dll) {
giterr_set(GITERR_OS, "Could not load Kernel32.dll!");
return -1;
HMODULE hModule = GetModuleHandleW(L"kernel32");
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We've talked about this in other PRs, but there is never a need to LoadLibrary kernel32. It is always already loaded and we can just ask for its HMODULE. This saves us from having to write spin-down logic (I have deleted the previous logic which did this.)


if (hModule) {
win32_srwlock_initialize = (win32_srwlock_fn)
GetProcAddress(hModule, "InitializeSRWLock");
win32_srwlock_acquire_shared = (win32_srwlock_fn)
GetProcAddress(hModule, "AcquireSRWLockShared");
win32_srwlock_release_shared = (win32_srwlock_fn)
GetProcAddress(hModule, "ReleaseSRWLockShared");
win32_srwlock_acquire_exclusive = (win32_srwlock_fn)
GetProcAddress(hModule, "AcquireSRWLockExclusive");
win32_srwlock_release_exclusive = (win32_srwlock_fn)
GetProcAddress(hModule, "ReleaseSRWLockExclusive");
}

win32_srwlock_initialize = (win32_srwlock_fn)
GetProcAddress(win32_kernel32_dll, "InitializeSRWLock");
win32_srwlock_acquire_shared = (win32_srwlock_fn)
GetProcAddress(win32_kernel32_dll, "AcquireSRWLockShared");
win32_srwlock_release_shared = (win32_srwlock_fn)
GetProcAddress(win32_kernel32_dll, "ReleaseSRWLockShared");
win32_srwlock_acquire_exclusive = (win32_srwlock_fn)
GetProcAddress(win32_kernel32_dll, "AcquireSRWLockExclusive");
win32_srwlock_release_exclusive = (win32_srwlock_fn)
GetProcAddress(win32_kernel32_dll, "ReleaseSRWLockExclusive");

git__on_shutdown(win32_pthread_shutdown);

return 0;
}
33 changes: 26 additions & 7 deletions src/win32/pthread.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,19 @@
# define GIT_RESTRICT __restrict__
#endif

typedef struct {
HANDLE thread;
void *(*proc)(void *);
void *param;
void *result;
} git_win32_thread;

typedef int pthread_mutexattr_t;
typedef int pthread_condattr_t;
typedef int pthread_attr_t;
typedef int pthread_rwlockattr_t;

typedef CRITICAL_SECTION pthread_mutex_t;
typedef HANDLE pthread_t;
typedef HANDLE pthread_cond_t;

typedef struct { void *Ptr; } GIT_SRWLOCK;
Expand All @@ -36,13 +42,26 @@ typedef struct {

#define PTHREAD_MUTEX_INITIALIZER {(void*)-1}

int pthread_create(
pthread_t *GIT_RESTRICT thread,
const pthread_attr_t *GIT_RESTRICT attr,
void *(*start_routine)(void*),
void *GIT_RESTRICT arg);
int git_win32__thread_create(
git_win32_thread *GIT_RESTRICT,
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's not clear to me why these parameters are annotated with GIT_RESTRICT. If anyone knows why, I would love to learn.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

At least on Linux, the "real" pthread_create() marks these parameters as __restrict. I'd guess it's trying to have the same signature.

const pthread_attr_t *GIT_RESTRICT,
void *(*) (void *),
void *GIT_RESTRICT);

int git_win32__thread_join(
git_win32_thread *,
void **);

#ifdef GIT_THREADS

int pthread_join(pthread_t, void **);
typedef git_win32_thread git_thread;

#define git_thread_create(git_thread_ptr, attr, start_routine, arg) \
git_win32__thread_create(git_thread_ptr, attr, start_routine, arg)
#define git_thread_join(git_thread_ptr, status) \
git_win32__thread_join(git_thread_ptr, status)

#endif

int pthread_mutex_init(
pthread_mutex_t *GIT_RESTRICT mutex,
Expand Down
4 changes: 2 additions & 2 deletions tests/object/cache.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ void test_object_cache__threadmania(void)

#ifdef GIT_THREADS
for (th = 0; th < THREADCOUNT; ++th) {
cl_git_pass(git_thread_join(t[th], &data));
cl_git_pass(git_thread_join(&t[th], &data));
cl_assert_equal_i(th, ((int *)data)[0]);
git__free(data);
}
Expand Down Expand Up @@ -276,7 +276,7 @@ void test_object_cache__fast_thread_rush(void)
#ifdef GIT_THREADS
for (th = 0; th < THREADCOUNT*2; ++th) {
void *rval;
cl_git_pass(git_thread_join(t[th], &rval));
cl_git_pass(git_thread_join(&t[th], &rval));
cl_assert_equal_i(th, *((int *)rval));
}
#endif
Expand Down
4 changes: 2 additions & 2 deletions tests/threads/refdb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ void test_threads_refdb__iterator(void)

#ifdef GIT_THREADS
for (t = 0; t < THREADS; ++t) {
cl_git_pass(git_thread_join(th[t], NULL));
cl_git_pass(git_thread_join(&th[t], NULL));
}
#endif

Expand Down Expand Up @@ -215,7 +215,7 @@ void test_threads_refdb__edit_while_iterate(void)
}

for (t = 0; t < THREADS; ++t) {
cl_git_pass(git_thread_join(th[t], NULL));
cl_git_pass(git_thread_join(&th[t], NULL));
}
#endif
}
2 changes: 1 addition & 1 deletion tests/threads/thread_helpers.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ void run_in_parallel(

#ifdef GIT_THREADS
for (t = 0; t < threads; ++t)
cl_git_pass(git_thread_join(th[t], NULL));
cl_git_pass(git_thread_join(&th[t], NULL));
memset(th, 0, threads * sizeof(git_thread));
#endif

Expand Down