Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 587b9bf

Browse files
committed
Merge with master
2 parents a9fdb57 + 96ae658 commit 587b9bf

File tree

2,771 files changed

+152100
-71348
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,771 files changed

+152100
-71348
lines changed

COPYRIGHT

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PostgreSQL Database Management System
22
(formerly known as Postgres, then as Postgres95)
33

4-
Portions Copyright (c) 1996-2020, PostgreSQL Global Development Group
4+
Portions Copyright (c) 1996-2021, PostgreSQL Global Development Group
55

66
Portions Copyright (c) 1994, The Regents of the University of California
77

aclocal.m4

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ m4_include([config/ax_pthread.m4])
55
m4_include([config/c-compiler.m4])
66
m4_include([config/c-library.m4])
77
m4_include([config/check_decls.m4])
8-
m4_include([config/docbook.m4])
98
m4_include([config/general.m4])
109
m4_include([config/libtool.m4])
1110
m4_include([config/llvm.m4])

config/docbook.m4

Lines changed: 0 additions & 40 deletions
This file was deleted.

config/llvm.m4

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ AC_DEFUN([PGAC_LLVM_SUPPORT],
7676
debuginfodwarf) pgac_components="$pgac_components $pgac_component";;
7777
orcjit) pgac_components="$pgac_components $pgac_component";;
7878
passes) pgac_components="$pgac_components $pgac_component";;
79+
native) pgac_components="$pgac_components $pgac_component";;
7980
perfjitevents) pgac_components="$pgac_components $pgac_component";;
8081
esac
8182
done;

src/test/thread/thread_test.c renamed to config/thread_test.c

Lines changed: 6 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
/*-------------------------------------------------------------------------
22
*
33
* thread_test.c
4-
* libc thread test program
4+
* libc threading test program
55
*
6-
* Portions Copyright (c) 1996-2020, PostgreSQL Global Development Group
6+
* Portions Copyright (c) 1996-2021, PostgreSQL Global Development Group
77
* Portions Copyright (c) 1994, Regents of the University of California
88
*
9-
* src/test/thread/thread_test.c
9+
* config/thread_test.c
1010
*
1111
* This program tests to see if your standard libc functions use
1212
* pthread_setspecific()/pthread_getspecific() to be thread-safe.
@@ -20,12 +20,7 @@
2020
*-------------------------------------------------------------------------
2121
*/
2222

23-
#if !defined(IN_CONFIGURE) && !defined(WIN32)
24-
#include "postgres.h"
25-
26-
/* we want to know what the native strerror does, not pg_strerror */
27-
#undef strerror
28-
#endif
23+
/* We cannot use c.h, as port.h will not exist yet */
2924

3025
#include <stdio.h>
3126
#include <stdlib.h>
@@ -36,6 +31,7 @@
3631
#include <string.h>
3732
#include <fcntl.h>
3833
#include <errno.h>
34+
#include <pthread.h>
3935

4036
/* CYGWIN requires this for MAXHOSTNAMELEN */
4137
#ifdef __CYGWIN__
@@ -47,25 +43,11 @@
4743
#include <winsock2.h>
4844
#endif
4945

50-
5146
/* Test for POSIX.1c 2-arg sigwait() and fail on single-arg version */
5247
#include <signal.h>
5348
int sigwait(const sigset_t *set, int *sig);
5449

5550

56-
#if !defined(ENABLE_THREAD_SAFETY) && !defined(IN_CONFIGURE) && !defined(WIN32)
57-
int
58-
main(int argc, char *argv[])
59-
{
60-
fprintf(stderr, "This PostgreSQL build does not support threads.\n");
61-
fprintf(stderr, "Perhaps rerun 'configure' using '--enable-thread-safety'.\n");
62-
return 1;
63-
}
64-
#else
65-
66-
/* This must be down here because this is the code that uses threads. */
67-
#include <pthread.h>
68-
6951
#define TEMP_FILENAME_1 "thread_test.1"
7052
#define TEMP_FILENAME_2 "thread_test.2"
7153

@@ -119,14 +101,12 @@ main(int argc, char *argv[])
119101
return 1;
120102
}
121103

122-
#ifdef IN_CONFIGURE
123104
/* Send stdout to 'config.log' */
124105
close(1);
125106
dup(5);
126-
#endif
127107

128108
#ifdef WIN32
129-
err = WSAStartup(MAKEWORD(1, 1), &wsaData);
109+
err = WSAStartup(MAKEWORD(2, 2), &wsaData);
130110
if (err != 0)
131111
{
132112
fprintf(stderr, "Cannot start the network subsystem - %d**\nexiting\n", err);
@@ -455,5 +435,3 @@ func_call_2(void)
455435
pthread_mutex_lock(&init_mutex); /* wait for parent to test */
456436
pthread_mutex_unlock(&init_mutex);
457437
}
458-
459-
#endif /* !ENABLE_THREAD_SAFETY && !IN_CONFIGURE */

0 commit comments

Comments
 (0)