[PBCKP-248] Use native mingw pthread

Mingw pthread "implementation" works reasonably well. There's no need
to use emulation.
Mingw's gcc links with winpthread.dll automatically, no need to force
flags.

Author: funny-falcon

src/archive.c

@@ -279,7 +279,7 @@ push_files(void *arg)
 	int		rc;
 	archive_push_arg *args = (archive_push_arg *) arg;
 
-	my_thread_num = args->thread_num;
+	set_my_thread_num(args->thread_num);
 
 	for (i = 0; i < parray_num(args->files); i++)
 	{
@@ -1011,7 +1011,7 @@ get_files(void *arg)
 	char    from_fullpath[MAXPGPATH];
 	archive_get_arg *args = (archive_get_arg *) arg;
 
-	my_thread_num = args->thread_num;
+	set_my_thread_num(args->thread_num);
 
 	for (i = 0; i < parray_num(args->files); i++)
 	{

src/checkdb.c

@@ -293,7 +293,8 @@ check_indexes(void *arg)
 	int			i;
 	check_indexes_arg *arguments = (check_indexes_arg *) arg;
 	int			n_indexes = 0;
-	my_thread_num = arguments->thread_num;
+
+	set_my_thread_num(arguments->thread_num);
 
 	if (arguments->index_list)
 		n_indexes = parray_num(arguments->index_list);

src/pg_probackup.c

@@ -75,7 +75,6 @@ bool		no_color = false;
 bool 		show_color = true;
 bool        is_archive_cmd = false;
 pid_t       my_pid = 0;
-__thread int  my_thread_num = 1;
 bool		progress = false;
 bool		no_sync = false;
 time_t		start_time = 0;

src/pg_probackup.h

@@ -43,13 +43,6 @@
 
 #include "pg_probackup_state.h"
 
-
-#ifdef WIN32
-#define __thread __declspec(thread)
-#else
-#include <pthread.h>
-#endif
-
 /* Wrap the code that we're going to delete after refactoring in this define*/
 #define REFACTORE_ME
 
@@ -759,7 +752,6 @@ typedef struct StopBackupCallbackParams
 
 /* common options */
 extern pid_t    my_pid;
-extern __thread int my_thread_num;
 extern int		num_threads;
 extern bool		stream_wal;
 extern bool		show_color;

src/utils/logger.c

@@ -344,7 +344,7 @@ elog_internal(int elevel, bool file_only, const char *message)
 	if (format_file == JSON || format_console == JSON)
 	{
 		snprintf(str_pid_json, sizeof(str_pid_json), "%d", my_pid);
-		snprintf(str_thread_json, sizeof(str_thread_json), "[%d-1]", my_thread_num);
+		snprintf(str_thread_json, sizeof(str_thread_json), "[%d-1]", my_thread_num());
 
 		initPQExpBuffer(&show_buf);
 		json_add_min(buf_json, JT_BEGIN_OBJECT);
@@ -424,7 +424,7 @@ elog_internal(int elevel, bool file_only, const char *message)
 			{
 				char		str_thread[64];
 				/* [Issue #213] fix pgbadger parsing */
-				snprintf(str_thread, sizeof(str_thread), "[%d-1]:", my_thread_num);
+				snprintf(str_thread, sizeof(str_thread), "[%d-1]:", my_thread_num());
 
 				fprintf(stderr, "%s ", strfbuf);
 				fprintf(stderr, "%s ", str_pid);
@@ -498,7 +498,7 @@ elog_stderr(int elevel, const char *fmt, ...)
 		strftime(strfbuf, sizeof(strfbuf), "%Y-%m-%d %H:%M:%S %Z",
 				 localtime(&log_time));
 		snprintf(str_pid, sizeof(str_pid), "%d", my_pid);
-		snprintf(str_thread_json, sizeof(str_thread_json), "[%d-1]", my_thread_num);
+		snprintf(str_thread_json, sizeof(str_thread_json), "[%d-1]", my_thread_num());
 
 		initPQExpBuffer(&show_buf);
 		json_add_min(buf_json, JT_BEGIN_OBJECT);

src/utils/thread.c

@@ -17,97 +17,17 @@
  */
 bool thread_interrupted = false;
 
-#ifdef WIN32
-DWORD main_tid = 0;
-#else
 pthread_t main_tid = 0;
-#endif
-#ifdef WIN32
-#include <errno.h>
-
-typedef struct win32_pthread
-{
-	HANDLE		handle;
-	void	   *(*routine) (void *);
-	void	   *arg;
-	void	   *result;
-} win32_pthread;
-
-static long mutex_initlock = 0;
-
-static unsigned __stdcall
-win32_pthread_run(void *arg)
-{
-	win32_pthread *th = (win32_pthread *)arg;
-
-	th->result = th->routine(th->arg);
-
-	return 0;
-}
-
-int
-pthread_create(pthread_t *thread,
-			   pthread_attr_t *attr,
-			   void *(*start_routine) (void *),
-			   void *arg)
-{
-	int			save_errno;
-	win32_pthread *th;
-
-	th = (win32_pthread *)pg_malloc(sizeof(win32_pthread));
-	th->routine = start_routine;
-	th->arg = arg;
-	th->result = NULL;
-
-	th->handle = (HANDLE)_beginthreadex(NULL, 0, win32_pthread_run, th, 0, NULL);
-	if (th->handle == NULL)
-	{
-		save_errno = errno;
-		free(th);
-		return save_errno;
-	}
-
-	*thread = th;
-	return 0;
-}
+static __thread int  my_thread_num_var = 1;
 
 int
-pthread_join(pthread_t th, void **thread_return)
+my_thread_num(void)
 {
-	if (th == NULL || th->handle == NULL)
-	return errno = EINVAL;
-
-	if (WaitForSingleObject(th->handle, INFINITE) != WAIT_OBJECT_0)
-	{
-		_dosmaperr(GetLastError());
-		return errno;
-	}
-
-	if (thread_return)
-		*thread_return = th->result;
-
-	CloseHandle(th->handle);
-	free(th);
-	return 0;
+	return my_thread_num_var;
 }
 
-#endif   /* WIN32 */
-
-int
-pthread_lock(pthread_mutex_t *mp)
+void
+set_my_thread_num(int th)
 {
-#ifdef WIN32
-	if (*mp == NULL)
-	{
-		while (InterlockedExchange(&mutex_initlock, 1) == 1)
-			/* loop, another thread own the lock */ ;
-		if (*mp == NULL)
-		{
-			if (pthread_mutex_init(mp, NULL))
-				return -1;
-		}
-		InterlockedExchange(&mutex_initlock, 0);
-	}
-#endif
-	return pthread_mutex_lock(mp);
+	my_thread_num_var = th;
 }

src/utils/thread.h

@@ -10,32 +10,18 @@
 #ifndef PROBACKUP_THREAD_H
 #define PROBACKUP_THREAD_H
 
-#ifdef WIN32
-#include "postgres_fe.h"
-#include "port/pthread-win32.h"
-
-/* Use native win32 threads on Windows */
-typedef struct win32_pthread *pthread_t;
-typedef int pthread_attr_t;
-
-#define PTHREAD_MUTEX_INITIALIZER NULL //{ NULL, 0 }
-#define PTHREAD_ONCE_INIT false
+#if defined(WIN32) && !(defined(__MINGW64__) || defined(__MINGW32__) || defined(HAVE_PTHREAD))
+#error "Windows build supports only 'pthread' threading"
+#endif
 
-extern int pthread_create(pthread_t *thread, pthread_attr_t *attr, void *(*start_routine) (void *), void *arg);
-extern int pthread_join(pthread_t th, void **thread_return);
-#else
 /* Use platform-dependent pthread capability */
 #include <pthread.h>
-#endif
-
-#ifdef WIN32
-extern DWORD main_tid;
-#else
 extern pthread_t main_tid;
-#endif
+#define pthread_lock(mp)  pthread_mutex_lock(mp)
 
 extern bool			thread_interrupted;
 
-extern int pthread_lock(pthread_mutex_t *mp);
+int my_thread_num(void);
+void set_my_thread_num(int);
 
 #endif   /* PROBACKUP_THREAD_H */