global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-13 10:23:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'js/async-thread' into next

Browse Source 
* js/async-thread:
  Enable threaded async procedures whenever pthreads is available
This commit is contained in:
Junio C Hamano
2010-04-22 00:06:19 -07:00
parent 92b04b5d88 f6b6098316
commit ee8874ea4b
4 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
run-command.c
View File

@@ -447,7 +447,7 @@ int run_command_v_opt_cd_env(const char **argv, int opt, const char *dir, const
return run_command(&cmd);
}
#ifdef ASYNC_AS_THREAD
#ifndef NO_PTHREADS
static pthread_t main_thread;
static int main_thread_set;
static pthread_key_t async_key;
@@ -455,10 +455,10 @@ static pthread_key_t async_key;
static void *run_thread(void *data)
{
struct async *async = data;
intptr_t ret;
pthread_setspecific(async_key, async);
intptr_t ret = async->proc(async->proc_in, async->proc_out, async->data);
ret = async->proc(async->proc_in, async->proc_out, async->data);
return (void *)ret;
}
@@ -521,7 +521,7 @@ int start_async(struct async *async)
else
proc_out = -1;
#ifndef ASYNC_AS_THREAD
#ifdef NO_PTHREADS
/* Flush stdio before fork() to avoid cloning buffers */
fflush(NULL);
@@ -590,7 +590,7 @@ error:
int finish_async(struct async *async)
{
#ifndef ASYNC_AS_THREAD
#ifdef NO_PTHREADS
return wait_or_whine(async->pid, "child process", 0);
#else
void *ret = (void *)(intptr_t)(-1);