mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2025-02-11 19:20:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

pg_upgrade: clarify C comment about Windows thread struct pointers

Browse Source 
Backpatch to 9.3 to keep source trees consistent.
This commit is contained in:
Bruce Momjian 2013-07-30 09:23:31 -04:00
parent 8cbf8dfcaf
commit e243e3a428
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
contrib/pg_upgrade/parallel.c
View File

@ -130,7 +130,7 @@ parallel_exec_prog(const char *log_file, const char *opt_log_file,
/* fork failed */ /* fork failed */
pg_log(PG_FATAL, "could not create worker process: %s\n", strerror(errno)); pg_log(PG_FATAL, "could not create worker process: %s\n", strerror(errno));
#else #else
/* use first empty array element */ /* empty array element are always at the end */
new_arg = exec_thread_args[parallel_jobs - 1]; new_arg = exec_thread_args[parallel_jobs - 1];
/* Can only pass one pointer into the function, so use a struct */ /* Can only pass one pointer into the function, so use a struct */
@ -244,7 +244,7 @@ parallel_transfer_all_new_dbs(DbInfoArr *old_db_arr, DbInfoArr *new_db_arr,
/* fork failed */ /* fork failed */
pg_log(PG_FATAL, "could not create worker process: %s\n", strerror(errno)); pg_log(PG_FATAL, "could not create worker process: %s\n", strerror(errno));
#else #else
/* use first empty array element */ /* empty array element are always at the end */
new_arg = transfer_thread_args[parallel_jobs - 1]; new_arg = transfer_thread_args[parallel_jobs - 1];
/* Can only pass one pointer into the function, so use a struct */ /* Can only pass one pointer into the function, so use a struct */
@ -339,10 +339,10 @@ reap_child(bool wait_for_child)
thread_handles[thread_num] = thread_handles[parallel_jobs - 1]; thread_handles[thread_num] = thread_handles[parallel_jobs - 1];
/* /*
* We must swap the arg struct pointers because the thread we just * Move last active thead arg struct into the now-dead slot,
* moved is active, and we must make sure it is not reused by the next * and the now-dead slot to the end for reuse by the next thread.
* created thread. Instead, the new thread will use the arg struct of * Though the thread struct is in use by another thread, we can
* the thread that just died. * safely swap the struct pointers within the array.
*/ */
tmp_args = cur_thread_args[thread_num]; tmp_args = cur_thread_args[thread_num];
cur_thread_args[thread_num] = cur_thread_args[parallel_jobs - 1]; cur_thread_args[thread_num] = cur_thread_args[parallel_jobs - 1];