You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by so...@apache.org on 2017/03/06 04:00:14 UTC
[trafficserver] branch 6.2.x updated (9031cd1 -> 38fa0be)
This is an automated email from the ASF dual-hosted git repository.
sorber pushed a change to branch 6.2.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git.
from 9031cd1 TS-5106: Create ParentRoundRobin object as ParentRecord->selection_strategy for default parent proxy server
new 82df1d5 Fix for ignored return value in Ubuntu builds.
new 3b8cf2d Ubuntu build problem fix. See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66425 For the record, I think (void) not suppressing "warning unused" is a poor choice.
new 38fa0be Revert "fix TS-4195: double free when stop trafficserver"
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
iocore/eventsystem/I_EThread.h | 2 +-
iocore/eventsystem/UnixEThread.cc | 2 +-
lib/ts/signals.cc | 10 +++++++++-
proxy/Main.cc | 2 +-
4 files changed, 12 insertions(+), 4 deletions(-)
--
To stop receiving notification emails like this one, please contact
['"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>'].
[trafficserver] 01/03: Fix for ignored return value in Ubuntu
builds.
Posted by so...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sorber pushed a commit to branch 6.2.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit 82df1d571629fe4230637247bfbb486bdd88d7d6
Author: Alan M. Carroll <am...@apache.org>
AuthorDate: Sat Feb 25 00:48:45 2017 -0600
Fix for ignored return value in Ubuntu builds.
(cherry picked from commit bae599dba5e92d9e503b4c908576a540c38a3614)
---
lib/ts/signals.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/ts/signals.cc b/lib/ts/signals.cc
index 6bb6c9b..114350b 100644
--- a/lib/ts/signals.cc
+++ b/lib/ts/signals.cc
@@ -170,7 +170,7 @@ signal_format_siginfo(int signo, siginfo_t *info, const char *msg)
snprintf(buf, sizeof(buf), "%s: received signal %d\n", msg, signo);
#endif
- write(STDERR_FILENO, buf, strlen(buf));
+ (void)write(STDERR_FILENO, buf, strlen(buf));
}
void
--
To stop receiving notification emails like this one, please contact
"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>.
[trafficserver] 03/03: Revert "fix TS-4195: double free when stop
trafficserver"
Posted by so...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sorber pushed a commit to branch 6.2.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit 38fa0be3503f65b993f3d014e9fdf2e7e51d492c
Author: Leif Hedstrom <zw...@apache.org>
AuthorDate: Tue Feb 28 13:14:01 2017 -0700
Revert "fix TS-4195: double free when stop trafficserver"
This reverts commit e0e39fc5026f0f5bcd6c0884adde91bcccab6bf8.
(cherry picked from commit 23e8dd026a4064b0bff7f8e5a813ca898550e8a2)
---
iocore/eventsystem/I_EThread.h | 2 +-
iocore/eventsystem/UnixEThread.cc | 2 +-
lib/ts/signals.cc | 7 +++++++
proxy/Main.cc | 2 +-
4 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/iocore/eventsystem/I_EThread.h b/iocore/eventsystem/I_EThread.h
index 4191dd0..cf0999d 100644
--- a/iocore/eventsystem/I_EThread.h
+++ b/iocore/eventsystem/I_EThread.h
@@ -56,7 +56,7 @@ enum ThreadType {
DEDICATED,
};
-extern volatile bool shutdown_event_system;
+extern bool shutdown_event_system;
/**
Event System specific type of thread.
diff --git a/iocore/eventsystem/UnixEThread.cc b/iocore/eventsystem/UnixEThread.cc
index 7849167..7f08361 100644
--- a/iocore/eventsystem/UnixEThread.cc
+++ b/iocore/eventsystem/UnixEThread.cc
@@ -39,7 +39,7 @@ struct AIOCallback;
#define THREAD_MAX_HEARTBEAT_MSECONDS 60
#define NO_ETHREAD_ID -1
-volatile bool shutdown_event_system = false;
+bool shutdown_event_system = false;
EThread::EThread()
: generator((uint64_t)Thread::get_hrtime_updated() ^ (uint64_t)(uintptr_t)this),
diff --git a/lib/ts/signals.cc b/lib/ts/signals.cc
index 09551fd..5f67e3e 100644
--- a/lib/ts/signals.cc
+++ b/lib/ts/signals.cc
@@ -162,7 +162,13 @@ signal_format_siginfo(int signo, siginfo_t *info, const char *msg)
(void)info;
(void)signo;
+#if HAVE_PSIGINFO
+ psiginfo(info, const_cast<char *>(msg));
+#elif HAVE_PSIGNAL
+ psignal(signo, msg);
+#else
char buf[64];
+ size_t len;
#if HAVE_STRSIGNAL
snprintf(buf, sizeof(buf), "%s: received signal %d (%s)\n", msg, signo, strsignal(signo));
@@ -172,6 +178,7 @@ signal_format_siginfo(int signo, siginfo_t *info, const char *msg)
ssize_t ignored = write(STDERR_FILENO, buf, strlen(buf));
(void)ignored; // because gcc and glibc are stupid, "(void)write(...)" doesn't suffice.
+#endif
}
void
diff --git a/proxy/Main.cc b/proxy/Main.cc
index 4da6f19..de2ab6b 100644
--- a/proxy/Main.cc
+++ b/proxy/Main.cc
@@ -405,7 +405,7 @@ proxy_signal_handler(int signo, siginfo_t *info, void *)
shutdown_event_system = true;
sleep(1);
- ::_exit(signo);
+ ::exit(signo);
}
//
--
To stop receiving notification emails like this one, please contact
"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>.
[trafficserver] 02/03: Ubuntu build problem fix. See
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66425 For the record,
I think (void) not suppressing "warning unused" is a poor choice.
Posted by so...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sorber pushed a commit to branch 6.2.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit 3b8cf2d484c2268ea9750ac635f30a4cc6b7bb14
Author: Alan M. Carroll <am...@apache.org>
AuthorDate: Sat Feb 25 18:15:47 2017 -0600
Ubuntu build problem fix.
See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66425
For the record, I think (void) not suppressing "warning unused" is a poor choice.
(cherry picked from commit 222ea02ed938733abec4079c2a3d050c9df6d938)
---
lib/ts/signals.cc | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lib/ts/signals.cc b/lib/ts/signals.cc
index 114350b..09551fd 100644
--- a/lib/ts/signals.cc
+++ b/lib/ts/signals.cc
@@ -170,7 +170,8 @@ signal_format_siginfo(int signo, siginfo_t *info, const char *msg)
snprintf(buf, sizeof(buf), "%s: received signal %d\n", msg, signo);
#endif
- (void)write(STDERR_FILENO, buf, strlen(buf));
+ ssize_t ignored = write(STDERR_FILENO, buf, strlen(buf));
+ (void)ignored; // because gcc and glibc are stupid, "(void)write(...)" doesn't suffice.
}
void
--
To stop receiving notification emails like this one, please contact
"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>.