Changeset: 2554f8b24800 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2554f8b24800
Modified Files:
clients/mapilib/mapi.c
gdk/gdk_utils.c
rpm.mk.in
Branch: default
Log Message:
Merge with Apr2019 branch.
diffs (103 lines):
diff --git a/clients/mapilib/mapi.c b/clients/mapilib/mapi.c
--- a/clients/mapilib/mapi.c
+++ b/clients/mapilib/mapi.c
@@ -2392,24 +2392,23 @@ mapi_reconnect(Mapi mid)
| SOCK_CLOEXEC
#endif
, rp->ai_protocol);
- if (s == INVALID_SOCKET) {
- snprintf(errbuf, sizeof(errbuf),
- "could not connect to %s:%s: %s",
- mid->hostname, port,
+ if (s != INVALID_SOCKET) {
+#if !defined(SOCK_CLOEXEC) && defined(HAVE_FCNTL)
+ (void) fcntl(s, F_SETFD, FD_CLOEXEC);
+#endif
+ if (connect(s, rp->ai_addr, (socklen_t)
rp->ai_addrlen) != SOCKET_ERROR)
+ break; /* success */
+ closesocket(s);
+ }
+ snprintf(errbuf, sizeof(errbuf),
+ "could not connect to %s:%s: %s",
+ mid->hostname, port,
#ifdef _MSC_VER
wsaerror(WSAGetLastError())
#else
- strerror(errno)
+ strerror(errno)
#endif
- );
- continue;
- }
-#if !defined(SOCK_CLOEXEC) && defined(HAVE_FCNTL)
- (void) fcntl(s, F_SETFD, FD_CLOEXEC);
-#endif
- if (connect(s, rp->ai_addr, (socklen_t) rp->ai_addrlen)
!= SOCKET_ERROR)
- break; /* success */
- closesocket(s);
+ );
}
freeaddrinfo(res);
if (rp == NULL) {
diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c
--- a/gdk/gdk_utils.c
+++ b/gdk/gdk_utils.c
@@ -758,7 +758,7 @@ GDKreset(int status, int exit)
/* we can't clean up after killing threads */
BBPexit();
}
- GDKlog(GET_GDKLOCK(0), GDKLOGOFF);
+ GDKlog(GET_GDKLOCK(PERSISTENT), GDKLOGOFF);
for (farmid = 0; farmid < MAXFARMS; farmid++) {
if (BBPfarms[farmid].dirname != NULL) {
@@ -842,7 +842,7 @@ GDKreset(int status, int exit)
void
GDKexit(int status)
{
- if (GET_GDKLOCK(0) == NULL) {
+ if (GET_GDKLOCK(PERSISTENT) == NULL) {
#ifdef HAVE_EMBEDDED
return;
#else
@@ -1195,7 +1195,7 @@ GDKfatal(const char *format, ...)
MT_exit_thread(1);
/* exit(1); */
} else {
- GDKlog(GET_GDKLOCK(0), "%s", message);
+ GDKlog(GET_GDKLOCK(PERSISTENT), "%s", message);
#ifdef COREDUMP
abort();
#else
diff --git a/rpm.mk.in b/rpm.mk.in
--- a/rpm.mk.in
+++ b/rpm.mk.in
@@ -34,5 +34,27 @@ srpm: MonetDB.spec $(top_builddir)/$(dis
all: monetdb_hgversion.h
monetdb_hgversion.h: always
- if [ -d "$(srcdir)"/.hg ] && hgid=`(cd "$(srcdir)"; hg id -i)
2>/dev/null`; then echo "#define MERCURIAL_ID \"$$hgid\"" >
monetdb_hgversion.h.new; if [ -f monetdb_hgversion.h ] && cmp -s
monetdb_hgversion.h monetdb_hgversion.h.new; then rm -f
monetdb_hgversion.h.new; else mv -f monetdb_hgversion.h.new
monetdb_hgversion.h; fi; elif [ -d "$(srcdir)"/.git ]; then hgid=`(cd
"$(srcdir)"; git log -1 | sed -n '/Notes (hg):/,$$p' | grep -v Notes | sed 's/^
\+\(............\).*/\1/') 2>/dev/null`; dirty=`(cd "$(srcdir)"; [[ -z $$(git
status -s) ]] || echo "+")`; if [ -z "$${hgid}" ]; then hgid="`(cd "$(srcdir)";
git rev-parse --short HEAD)` (git)"; fi; echo "#define MERCURIAL_ID
\"$$hgid$$dirty\"" > monetdb_hgversion.h.new; if [ -f monetdb_hgversion.h ] &&
cmp -s monetdb_hgversion.h monetdb_hgversion.h.new; then rm -f
monetdb_hgversion.h.new; else mv -f monetdb_hgversion.h.new
monetdb_hgversion.h; fi; elif [ ! -f monetdb_hgversion.h ]; then touch
monetdb_hgversion.h;fi
+ if [ -d "$(srcdir)"/.hg ] && hgid=`(cd "$(srcdir)"; hg id -i)
2>/dev/null`; then \
+ echo "#define MERCURIAL_ID \"$$hgid\"" >
monetdb_hgversion.h.new; \
+ if [ -f monetdb_hgversion.h ] && cmp -s monetdb_hgversion.h
monetdb_hgversion.h.new; then \
+ rm -f monetdb_hgversion.h.new; \
+ else \
+ mv -f monetdb_hgversion.h.new monetdb_hgversion.h; \
+ fi; \
+ elif [ -d "$(srcdir)"/.git ]; then \
+ hgid=`(cd "$(srcdir)"; git log -1 | sed -n '/Notes (hg):/,$$p'
| grep -v Notes | sed 's/^ \+\(............\).*/\1/') 2>/dev/null`; \
+ dirty=`(cd "$(srcdir)"; [[ -z $$(git status -s) ]] || echo
"+")`; \
+ if [ -z "$${hgid}" ]; then \
+ hgid="`(cd "$(srcdir)"; git rev-parse --short HEAD)`
(git)"; \
+ fi; \
+ echo "#define MERCURIAL_ID \"$$hgid$$dirty\"" >
monetdb_hgversion.h.new; \
+ if [ -f monetdb_hgversion.h ] && cmp -s monetdb_hgversion.h
monetdb_hgversion.h.new; then \
+ rm -f monetdb_hgversion.h.new; \
+ else \
+ mv -f monetdb_hgversion.h.new monetdb_hgversion.h; \
+ fi; \
+ elif [ ! -f monetdb_hgversion.h ]; then \
+ touch monetdb_hgversion.h; \
+ fi
+
always:
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
