|
[-]
[+]
|
Changed |
crossroads.spec
|
|
|
|
[-]
[+]
|
Changed |
crossroads-devel.ChangeLog
^
|
| @@ -1,3 +1,44 @@
+2.41 [KK 2009-01-05]
+- Bugfix in xrctl, thanks Eddie for reporting it.
+
+2.40 [KK 2009-01-03]
+- Netbuffer::read() failures are no longer logged as errors, but as
+ verbose messages.
+- XML configuration now supports "logger" to redefine logger program.
+- Small changes to xrctl: ps command is auto-guessed when not
+ specified in the XML configuration.
+
+2.39 [KK 2008-12-04]
+- Added Httpbuffer::reset()
+- The HTTP dispatcher will show back end error returns (when the HTTP
+ code is in the 400 or 500 range)
+- main() will show runtime limits when invoked with -v
+- The HTTP dispatcher no longer downgrades to HTTP/1.0 and closed
+ connections. Webserver back ends can do this.
+- Exceptions during the sending of an error page in HTTP mode are
+ discarded, no longer logged.
+- Mutex lock added around thread startups (see Thread::start()), when
+ requested soq in sys/sys.
+- Mutex locks around malloc()/realloc(), when requested so in sys/sys.
+- Fixed possible socket leak in TcpDispatcher::execute(). The back end
+ socket might not have been closed when the dispatch phase crashed.
+- Dispatchers are now derived from a new base class Dispatcher, in
+ preparation for UDP handling.
+- Timestamp handling centralized in a class Timestamp.
+- Messaging (msg(), debugmsg(), reportmsg(), warnmsg()) centralized.
+- Started threads are administered in Threadlist. Separate threads are
+ killable from the web interface, or all threads to a given back end.
+
+2.38 [KK 2008-11-19]
+- Bugfix in xrctl: Weights and max connections in back ends are now
+ passed correctly.
+- Added version ID to xrctl.
+
+2.37 [KK 2008-11-17]
+- Main accept-loop in Balancer::serve() doesn't throw an exception
+ when a network connection can't be accepted. The reason is shown in
+ a warnmsg().
+
2.36 [KK 2008-11-11]
- Typo bugfix in xrctl, fixed.
- xrctl will take the environment's PATH if no path is given in the
|
|
[-]
[+]
|
Changed |
crossroads-devel.tar.gz/ChangeLog
^
|
| @@ -1,3 +1,44 @@
+2.41 [KK 2009-01-05]
+- Bugfix in xrctl, thanks Eddie for reporting it.
+
+2.40 [KK 2009-01-03]
+- Netbuffer::read() failures are no longer logged as errors, but as
+ verbose messages.
+- XML configuration now supports "logger" to redefine logger program.
+- Small changes to xrctl: ps command is auto-guessed when not
+ specified in the XML configuration.
+
+2.39 [KK 2008-12-04]
+- Added Httpbuffer::reset()
+- The HTTP dispatcher will show back end error returns (when the HTTP
+ code is in the 400 or 500 range)
+- main() will show runtime limits when invoked with -v
+- The HTTP dispatcher no longer downgrades to HTTP/1.0 and closed
+ connections. Webserver back ends can do this.
+- Exceptions during the sending of an error page in HTTP mode are
+ discarded, no longer logged.
+- Mutex lock added around thread startups (see Thread::start()), when
+ requested soq in sys/sys.
+- Mutex locks around malloc()/realloc(), when requested so in sys/sys.
+- Fixed possible socket leak in TcpDispatcher::execute(). The back end
+ socket might not have been closed when the dispatch phase crashed.
+- Dispatchers are now derived from a new base class Dispatcher, in
+ preparation for UDP handling.
+- Timestamp handling centralized in a class Timestamp.
+- Messaging (msg(), debugmsg(), reportmsg(), warnmsg()) centralized.
+- Started threads are administered in Threadlist. Separate threads are
+ killable from the web interface, or all threads to a given back end.
+
+2.38 [KK 2008-11-19]
+- Bugfix in xrctl: Weights and max connections in back ends are now
+ passed correctly.
+- Added version ID to xrctl.
+
+2.37 [KK 2008-11-17]
+- Main accept-loop in Balancer::serve() doesn't throw an exception
+ when a network connection can't be accepted. The reason is shown in
+ a warnmsg().
+
2.36 [KK 2008-11-11]
- Typo bugfix in xrctl, fixed.
- xrctl will take the environment's PATH if no path is given in the
|
|
[-]
[+]
|
Changed |
crossroads-devel.tar.gz/Makefile
^
|
| @@ -1,7 +1,7 @@
# Top-level Makefile for XR
# -------------------------
-VER = 2.36
+VER = 2.41
PREFIX = $(DESTDIR)/usr
BINDIR = $(PREFIX)/sbin
MANDIR = $(PREFIX)/share/man
@@ -48,8 +48,8 @@
@echo ' Have fun with Crossroads $(VER),'
@echo ' -- $(MAINTAINER)'
@echo
-$(BINDIR)/xrctl: xrctl/xrctl
- cp xrctl/xrctl $(BINDIR)/xrctl
+$(BINDIR)/xrctl: xrctl/xrctl Makefile
+ sed 's:__VER__:$(VER):' < xrctl/xrctl > $(BINDIR)/xrctl
chmod +x $(BINDIR)/xrctl
install-manpages: $(MANDIR)/man1/xr.1 $(MANDIR)/man1/xrctl.1 \
$(MANDIR)/man5/xrctl.xml.5
|
|
|
Changed |
crossroads-devel.tar.gz/doc/xr.odt
^
|
|
|
Changed |
crossroads-devel.tar.gz/doc/xr.pdf
^
|
|
[-]
[+]
|
Changed |
crossroads-devel.tar.gz/doc/xrctl.1
^
|
| @@ -1,4 +1,4 @@
-.TH "XRCTL" "1" "Nov 7, 2008" "Crossroads" "Man Page"
+.TH "XRCTL" "1" "2008,2009" "Crossroads" "Man Page"
.SH "NAME"
xrctl \- Crossroads control-script
|
|
[-]
[+]
|
Changed |
crossroads-devel.tar.gz/doc/xrctl.xml.5
^
|
| @@ -1,4 +1,4 @@
-.TH "XRCTL.XML" "5" "Nov 8, 2008" "Crossroads" "Man Page"
+.TH "XRCTL.XML" "5" "2008,2009" "Crossroads" "Man Page"
.SH "NAME"
xrctl.xml \- Crossroads control-script configuration file
@@ -10,7 +10,6 @@
in xrctl.xml.
.SH "EXAMPLE"
-
The following is a configuration example. See the file xr.pdf which is
distributed with the sources for a full description.
@@ -22,24 +21,30 @@
<!-- General system configuration section -->
<system>
- <!-- Where do PID files get stored? -->
- <piddir>/var/run</piddir>
+ <!-- Path where the "xr" binary is searched, and zippers as "gzip"
+ and "bzip2", and the "ps" command. Default is that xrctl
+ uses $PATH. -->
+ <path>/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/opt/local/bin:/opt/local/sbin</path>
<!-- "ps" command that shows the PID and command. On Solaris, use
- /usr/bin/ps -ef "pid comm" -->
- <pscmd>/bin/ps ax -o pid,command</pscmd>
+ /usr/bin/ps -ef "pid comm" and on Linux/MacOSX use
+ /bin/ps -ax -o pid,command. Default is that xrctl guesses
+ the right command. Example:
+ <pscmd>/bin/ps ax -o pid,command</pscmd> -->
<!-- Use "logger" to add output to syslog or not? Logger will be
used if the binary can be found, and if uselogger is true. -->
<uselogger>true</uselogger>
- <!-- If logger is not used: where do logs get written? -->
- <logdir>/var/log</logdir>
- <!-- If logger is not used: how big may the logs become?
- Manipulated during "xrctl rotate". -->
- <maxlogsize>100000</maxlogsize>
- <!-- If logger is not used: how many history logs to keep? -->
- <loghistory>10</loghistory>
- <!-- Path where the "xr" binary is searched, and zippers as "gzip"
- and "bzip2" -->
- <path>/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/opt/local/bin:/opt/local/sbin</path>
+ <!-- The default logger is the program "logger". Redefine here if
+ you like, for example to a piping logrotate program. Example:
+ <logger>clpipe /var/log/xr.clog</logger>
+ The default <logger> command is: logger -t xr.{service} -->
+ <!-- If logger is NOT used, xrctl will manage log output. In that
+ case, specify the following:
+ - Where do logs get written?
+ <logdir>/var/log</logdir>
+ - How big may the logs become? Manipulated during "xrctl rotate".
+ <maxlogsize>100000</maxlogsize>
+ - How many history logs to keep?
+ <loghistory>10</loghistory> -->
</system>
<!-- Service descriptions: This section defines all balancing
@@ -131,7 +136,7 @@
softmaxconnrate (here: 150), then each connection is
delayed for defertime microsecs (here: 1.000.000, one
sec).
- Finally, the entire balancer will be allowed to serve up
+ Finally, the entire balancer will be allowed to serve up
to 400 simultaneous connections.
-->
<timeinterval>2</timeinterval>
@@ -140,13 +145,13 @@
<defertime>1000000</defertime>
<maxconnections>400</maxconnections>
- <!-- Let's add some more protection. When a user exceeds their
- hard maxconn rate, "/path/to/program" will be invoked
- with the IP as argument. That program may eg. call
- iptables to block the client. There is also a tag
- softmaxconnexcess (not shown here). -->
- <hardmaxconnexcess>/path/to/program</hardmaxconnexcess>
-
+ <!-- Let's add some more protection. When a user exceeds their
+ hard maxconn rate, "/path/to/program" will be invoked
+ with the IP as argument. That program may eg. call
+ iptables to block the client. There is also a tag
+ softmaxconnexcess (not shown here). -->
+ <hardmaxconnexcess>/path/to/program</hardmaxconnexcess>
+
</dosprotection>
<http>
|
|
[-]
[+]
|
Changed |
crossroads-devel.tar.gz/test/sampleconf.xml
^
|
| @@ -5,24 +5,30 @@
<!-- General system configuration section -->
<system>
- <!-- Where do PID files get stored? -->
- <piddir>/var/run</piddir>
+ <!-- Path where the "xr" binary is searched, and zippers as "gzip"
+ and "bzip2", and the "ps" command. Default is that xrctl
+ uses $PATH. -->
+ <path>/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/opt/local/bin:/opt/local/sbin</path>
<!-- "ps" command that shows the PID and command. On Solaris, use
- /usr/bin/ps -ef "pid comm" -->
- <pscmd>/bin/ps ax -o pid,command</pscmd>
+ /usr/bin/ps -ef "pid comm" and on Linux/MacOSX use
+ /bin/ps -ax -o pid,command. Default is that xrctl guesses
+ the right command. Example:
+ <pscmd>/bin/ps ax -o pid,command</pscmd> -->
<!-- Use "logger" to add output to syslog or not? Logger will be
used if the binary can be found, and if uselogger is true. -->
<uselogger>true</uselogger>
- <!-- If logger is not used: where do logs get written? -->
- <logdir>/var/log</logdir>
- <!-- If logger is not used: how big may the logs become?
- Manipulated during "xrctl rotate". -->
- <maxlogsize>100000</maxlogsize>
- <!-- If logger is not used: how many history logs to keep? -->
- <loghistory>10</loghistory>
- <!-- Path where the "xr" binary is searched, and zippers as "gzip"
- and "bzip2" -->
- <path>/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/opt/local/bin:/opt/local/sbin</path>
+ <!-- The default logger is the program "logger". Redefine here if
+ you like, for example to a piping logrotate program. Example:
+ <logger>clpipe /var/log/xr.clog</logger>
+ The default <logger> command is: logger -t xr.{service} -->
+ <!-- If logger is NOT used, xrctl will manage log output. In that
+ case, specify the following:
+ - Where do logs get written?
+ <logdir>/var/log</logdir>
+ - How big may the logs become? Manipulated during "xrctl rotate".
+ <maxlogsize>100000</maxlogsize>
+ - How many history logs to keep?
+ <loghistory>10</loghistory> -->
</system>
<!-- Service descriptions: This section defines all balancing
|
|
[-]
[+]
|
Changed |
crossroads-devel.tar.gz/xr/Checkers/checkupthread/checkupthread
^
|
| @@ -3,6 +3,7 @@
#include "sys/sys"
#include "ThreadsAndMutexes/thread/thread"
+#include "ThreadsAndMutexes/threadlist/threadlist"
#include "balancer/balancer"
#include "error/error"
|
|
[-]
[+]
|
Changed |
crossroads-devel.tar.gz/xr/Checkers/checkupthread/execute.cc
^
|
| @@ -1,6 +1,9 @@
#include "checkupthread"
void Checkupthread::execute() {
+
+ Threadlist::desc("Checkup thread");
+
while (1) {
if (config.checkupsec()) {
for (unsigned i = 0; i < balancer.nbackends(); i++) {
|
|
[-]
[+]
|
Changed |
crossroads-devel.tar.gz/xr/Checkers/wakeupthread/execute.cc
^
|
| @@ -1,6 +1,8 @@
#include "wakeupthread"
void Wakeupthread::execute() {
+ Threadlist::desc("Wakeup thread");
+
while (1) {
if (config.wakeupsec()) {
for (unsigned i = 0; i < balancer.nbackends(); i++) {
|
|
[-]
[+]
|
Changed |
crossroads-devel.tar.gz/xr/Checkers/wakeupthread/wakeupthread
^
|
| @@ -3,6 +3,7 @@
#include "sys/sys"
#include "ThreadsAndMutexes/thread/thread"
+#include "ThreadsAndMutexes/threadlist/threadlist"
#include "balancer/balancer"
#include "error/error"
|
|
[-]
[+]
|
Changed |
crossroads-devel.tar.gz/xr/DispatchAlgorithms/storedip/storedip
^
|
| @@ -5,6 +5,7 @@
#include "error/error"
#include "balancer/balancer"
#include "config/config"
+#include "timestamp/timestamp"
#include "DispatchAlgorithms/algorithm/algorithm"
#include "DispatchAlgorithms/leastconn/leastconn"
|
|
[-]
[+]
|
Changed |
crossroads-devel.tar.gz/xr/DispatchAlgorithms/storedip/target.cc
^
|
| @@ -25,14 +25,15 @@
if (store.count(clientip) > 0) {
// Client already known, maybe timed out.
time_t diff = now - store[clientip].lastaccess;
-
- msg ("Client IP " + static_cast<string>(inet_ntoa(clientip)) +
- (Mstr(" last visited on ")
- + timestamp(store[clientip].lastaccess)) +
- (Mstr(", ") + diff) +
- " sec ago, and went to " +
- balancer.backend(store[clientip].targetbackend).description() +
- "\n");
+
+ if (config.verbose()) {
+ Timestamp tm(store[clientip].lastaccess);
+ msg(Mstr("Client IP ") + Mstr(inet_ntoa(clientip)) +
+ " last visited on " + tm.desc() +
+ Mstr(Mstr(", ") + diff) + " sec ago, and went to " +
+ balancer.backend(store[clientip].targetbackend).description() +
+ "\n");
+ }
if (diff <= config.ipstoretimeout()) {
// Recent 'nuff
@@ -73,8 +74,11 @@
// Weed out store.
for (StoreMap::iterator iter = store.begin(); iter != store.end();
iter++) {
- debugmsg (Mstr(inet_ntoa(iter->first)) + Mstr(" visited on ") +
- timestamp((*iter).second.lastaccess) + "\n");
+ if (config.debug()) {
+ Timestamp tm((*iter).second.lastaccess);
+ debugmsg (Mstr(inet_ntoa(iter->first)) + Mstr(" visited on ") +
+ tm.desc() + "\n");
+ }
if (now - ((*iter).second.lastaccess) > config.ipstoretimeout()) {
debugmsg (" Erasing stale entry, stale\n");
store.erase(iter);
|
|
[-]
[+]
|
Added |
crossroads-devel.tar.gz/xr/ThreadsAndMutexes/thread/run.cc
^
|
| @@ -0,0 +1,22 @@
+#include "thread"
+
+void *Thread::_run (void *data) {
+ Thread *t = (Thread*) data;
+
+ Threadlist::enregister();
+ try {
+ t->execute();
+ } catch (Error const &e) {
+ lock(&cerr);
+ cerr << e.what() << "\n";
+ unlock(&cerr);
+ }
+ Threadlist::deregister();
+
+ // Cleanups
+ delete (t);
+
+ // To satisfy the prototype
+ return (0);
+}
+
|
|
[-]
[+]
|
Changed |
crossroads-devel.tar.gz/xr/ThreadsAndMutexes/thread/start.cc
^
|
| @@ -1,24 +1,6 @@
#include "thread"
#include "profiler/profiler"
-static void *_run (void *data) {
- Thread *t = (Thread*) data;
-
- try {
- t->execute();
- } catch (Error const &e) {
- Mutex::lock(&cerr);
- cerr << e.what() << "\n";
- Mutex::unlock(&cerr);
- }
-
- // Cleanups
- delete (t);
-
- // To satisfy the prototype
- return (0);
-}
-
void Thread::start() {
PROFILE ("Thread::start");
@@ -34,7 +16,13 @@
if (pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED))
throw static_cast<Error>("Cannot set thread state as detached");
for (int i = 0; i < 3; i++) {
+# ifdef MISTRUST_THREAD_CREATE_THREADSAFE
+ lock((void*)_run);
+# endif
res = pthread_create (&th, &attr, _run, (void*) this);
+# ifdef MISTRUST_THREAD_CREATE_THREADSAFE
+ unlock((void*)_run);
+# endif
if (!res) {
pthread_attr_destroy (&attr);
return;
|
|
[-]
[+]
|
Changed |
crossroads-devel.tar.gz/xr/ThreadsAndMutexes/thread/thread
^
|
| @@ -4,7 +4,9 @@
#include "sys/sys"
#include "error/error"
#include "config/config"
+#include "timestamp/timestamp"
#include "ThreadsAndMutexes/mutex/mutex"
+#include "ThreadsAndMutexes/threadlist/threadlist"
using namespace std;
@@ -13,6 +15,9 @@
virtual ~Thread();
void start();
virtual void execute();
+
+private:
+ static void *_run(void *data);
};
#endif
|
|
[-]
[+]
|
Added |
crossroads-devel.tar.gz/xr/ThreadsAndMutexes/threadinfo
^
|
| +(directory)
|
|
[-]
[+]
|
Added |
crossroads-devel.tar.gz/xr/ThreadsAndMutexes/threadinfo/threadinfo
^
|
| @@ -0,0 +1,34 @@
+#ifndef _THREADINFO_
+#define _THREADINFO_
+
+#include "sys/sys"
+#include "timestamp/timestamp"
+#include "ThreadsAndMutexes/mutex/mutex"
+
+class Threadinfo {
+public:
+ Threadinfo():
+ th_desc(), th_tm(), th_backend(-1), th_backendfd(-1), th_clientfd(-1)
+ {}
+
+ void desc(string s) { th_desc = s; }
+ string const &desc() const { return th_desc; }
+
+ Timestamp const ×tamp() const { return th_tm; }
+
+ void backend(int b) { th_backend = b; }
+ int backend() const { return th_backend; }
+
+ void backendfd(int f) { th_backendfd = f; }
+ int backendfd() const { return th_backendfd; }
+
+ void clientfd(int f) { th_clientfd = f; }
+ int clientfd() const { return th_clientfd; }
+
+private:
+ string th_desc;
+ Timestamp th_tm;
+ int th_backend, th_backendfd, th_clientfd;
+};
+
+#endif
|
|
[-]
[+]
|
Added |
crossroads-devel.tar.gz/xr/ThreadsAndMutexes/threadlist
^
|
| +(directory)
|
|
[-]
[+]
|
Added |
crossroads-devel.tar.gz/xr/ThreadsAndMutexes/threadlist/backend.cc
^
|
| @@ -0,0 +1,5 @@
+#include "threadlist"
+
+void Threadlist::backend(int b) {
+ th_map[pthread_self()].backend(b);
+}
|
|
[-]
[+]
|
Added |
crossroads-devel.tar.gz/xr/ThreadsAndMutexes/threadlist/backendfd.cc
^
|
| @@ -0,0 +1,5 @@
+#include "threadlist"
+
+void Threadlist::backendfd(int f) {
+ th_map[pthread_self()].backendfd(f);
+}
|
|
[-]
[+]
|
Added |
crossroads-devel.tar.gz/xr/ThreadsAndMutexes/threadlist/clientfd.cc
^
|
| @@ -0,0 +1,5 @@
+#include "threadlist"
+
+void Threadlist::clientfd(int f) {
+ th_map[pthread_self()].clientfd(f);
+}
|
|
[-]
[+]
|
Added |
crossroads-devel.tar.gz/xr/ThreadsAndMutexes/threadlist/deregister1.cc
^
|
| @@ -0,0 +1,7 @@
+#include "threadlist"
+
+void Threadlist::deregister(pthread_t id) {
+ Mutex::lock(&th_map);
+ th_map.erase(id);
+ Mutex::unlock(&th_map);
+}
|
|
[-]
[+]
|
Added |
crossroads-devel.tar.gz/xr/ThreadsAndMutexes/threadlist/deregister2.cc
^
|
| @@ -0,0 +1,6 @@
+#include "threadlist"
+
+void Threadlist::deregister() {
+ deregister(pthread_self());
+}
+
|
|
[-]
[+]
|
Added |
crossroads-devel.tar.gz/xr/ThreadsAndMutexes/threadlist/desc.cc
^
|
| @@ -0,0 +1,5 @@
+#include "threadlist"
+
+void Threadlist::desc(string const &s) {
+ th_map[pthread_self()].desc(s);
+}
|
|
[-]
[+]
|
Added |
crossroads-devel.tar.gz/xr/ThreadsAndMutexes/threadlist/enregister.cc
^
|
| @@ -0,0 +1,10 @@
+#include "threadlist"
+
+Threadmap Threadlist::th_map;
+
+void Threadlist::enregister() {
+ Threadinfo n;
+ Mutex::lock(&th_map);
+ th_map[pthread_self()] = n;
+ Mutex::unlock(&th_map);
+}
|
|
[-]
[+]
|
Added |
crossroads-devel.tar.gz/xr/ThreadsAndMutexes/threadlist/info.cc
^
|
| @@ -0,0 +1,5 @@
+#include "threadlist"
+
+Threadinfo Threadlist::info(pthread_t id) {
+ return th_map[id];
+}
|
|
[-]
[+]
|
Added |
crossroads-devel.tar.gz/xr/ThreadsAndMutexes/threadlist/map.cc
^
|
| @@ -0,0 +1,5 @@
+#include "threadlist"
+
+Threadmap &Threadlist::map() {
+ return th_map;
+}
|
|
[-]
[+]
|
Added |
crossroads-devel.tar.gz/xr/ThreadsAndMutexes/threadlist/threadlist
^
|
| @@ -0,0 +1,25 @@
+#ifndef _THREADLIST_
+#define _THREADLIST_
+
+#include "sys/sys"
+#include "ThreadsAndMutexes/threadinfo/threadinfo"
+
+typedef map<pthread_t, Threadinfo> Threadmap;
+
+class Threadlist {
+public:
+ static void enregister();
+ static void deregister(pthread_t id);
+ static void deregister();
+ static Threadmap &map();
+ static Threadinfo info(pthread_t id);
+ static void desc(string const &s);
+ static void backend(int b);
+ static void clientfd(int f);
+ static void backendfd(int f);
+
+private:
+ static Threadmap th_map;
+};
+
+#endif
|
|
[-]
[+]
|
Changed |
crossroads-devel.tar.gz/xr/backend/check.cc
^
|
| @@ -13,7 +13,6 @@
if (backendcheck().server() == "" && backendcheck().port() == 0) {
// Most common: TCP connect to the actual back end
connect();
- socketclose (sock());
} else {
// TCP connects to an alternative server or port.
// We instantiate a dummy backend and let it connect to the "other"
@@ -29,6 +28,7 @@
msg (Mstr("Alternative back end for testing ") +
tester.description() + " is " + livestr() + "\n");
}
+ socketclose (sock());
break;
case BackendCheck::c_get:
@@ -58,8 +58,8 @@
live(true);
else
debugmsg("Back end assumed dead.\n");
- socketclose(tester.sock());
}
+ socketclose(tester.sock());
break;
case BackendCheck::c_external:
|
|
[-]
[+]
|
Changed |
crossroads-devel.tar.gz/xr/backend/connect.cc
^
|
| @@ -37,6 +37,8 @@
int conres = ::connect (clsocket, (struct sockaddr *)&backendaddr,
sizeof(backendaddr));
int conerrno = errno;
+ debugmsg((Mstr("Connect result: ") + conres) +
+ (Mstr(", errno: ") + conerrno) + "\n");
// Put socket again in blocking mode.
if (fcntl (clsocket, F_SETFL, flags) == -1) {
@@ -50,7 +52,12 @@
// Wait for socket to go writable.
Fdset fdset (config.backend_timeout());
fdset.add (clsocket);
- if (fdset.readwriteable() == -1 && fdset.writeable() == clsocket)
+ int rwsock = fdset.readwriteable();
+ int wsock = fdset.writeable();
+ debugmsg (Mstr("Connecting to ") + description() +
+ Mstr(Mstr(": writesocket=") + wsock) +
+ Mstr(Mstr(", read/writesocket=") + rwsock) + "\n");
+ if (wsock == clsocket && rwsock == -1)
islive = true;
}
|
|
[-]
[+]
|
Changed |
crossroads-devel.tar.gz/xr/balancer/serve.cc
^
|
| @@ -80,8 +80,11 @@
size = sizeof(clname);
if ( (clsock = accept (server_fd, (struct sockaddr *) &clname,
- (socklen_t*) &size)) < 0 )
- throw static_cast<Error>("Failed to accept network connection");
+ (socklen_t*) &size)) < 0 ) {
+ warnmsg(Mstr("Failed to accept network connection: ") +
+ Mstr(strerror(errno)) + "\n");
+ continue;
+ }
string clientip = inet_ntoa(clname.sin_addr);
|
|
[-]
[+]
|
Added |
crossroads-devel.tar.gz/xr/dispatcher
^
|
| +(directory)
|
|
[-]
[+]
|
Added |
crossroads-devel.tar.gz/xr/dispatcher/dispatcher
^
|
| @@ -0,0 +1,51 @@
+#ifndef _DISPATCHER_
+#define _DISPATCHER_
+
+#include "sys/sys"
+#include "balancer/balancer"
+#include "config/config"
+#include "ThreadsAndMutexes/thread/thread"
+#include "ThreadsAndMutexes/threadlist/threadlist"
+#include "backendvector/backendvector"
+#include "netbuffer/netbuffer"
+
+// Dispatching algorithm workers
+#include "DispatchAlgorithms/algorithm/algorithm"
+#include "DispatchAlgorithms/roundrobin/roundrobin"
+#include "DispatchAlgorithms/firstactive/firstactive"
+#include "DispatchAlgorithms/leastconn/leastconn"
+#include "DispatchAlgorithms/external/external"
+#include "DispatchAlgorithms/hashedip/hashedip"
+#include "DispatchAlgorithms/storedip/storedip"
+#include "DispatchAlgorithms/weightedload/weightedload"
+
+class Dispatcher: public Thread {
+public:
+
+ Dispatcher (int fd, struct in_addr ip);
+ virtual ~Dispatcher();
+
+ virtual void execute() = 0;
+ virtual void dispatch() = 0;
+ virtual void handle() = 0;
+
+ int targetbackend() const { return target_backend; }
+ void targetbackend(int t) { target_backend = t; }
+ struct in_addr clientip() const { return client_ip; }
+ int clientfd() const { return client_fd; }
+ void clientfd(int c) { client_fd = c; }
+ int backendfd() const { return backend_fd; }
+ void backendfd(int b) { backend_fd = b; }
+ Algorithm *algorithm() const { return algo; }
+
+ BackendVector &targetlist() { return target_list; }
+ void targetlist (BackendVector t) { target_list = t; }
+
+private:
+ struct in_addr client_ip;
+ int target_backend, client_fd, backend_fd;
+ Algorithm *algo;
+ BackendVector target_list;
+};
+
+#endif
|
|
[-]
[+]
|
Added |
crossroads-devel.tar.gz/xr/dispatcher/dispatcher1.cc
^
|
| @@ -0,0 +1,40 @@
+#include "dispatcher"
+
+Dispatcher::Dispatcher(int cfd, struct in_addr cip):
+ Thread(), client_ip(cip), target_backend(-1), client_fd(cfd),
+ backend_fd(-1), target_list() {
+
+ // Instantiate dispatchmode algorithm
+ switch (config.dispatchmode()) {
+ case Dispatchmode::m_roundrobin:
+ algo = new Roundrobin;
+ break;
+ case Dispatchmode::m_firstactive:
+ algo = new Firstactive;
+ break;
+ case Dispatchmode::m_external:
+ algo = new External;
+ break;
+ case Dispatchmode::m_strict_hashed_ip:
+ case Dispatchmode::m_lax_hashed_ip:
+ algo = new HashedIp;
+ break;
+ case Dispatchmode::m_strict_stored_ip:
+ case Dispatchmode::m_lax_stored_ip:
+ algo = new StoredIp;
+ break;
+ case Dispatchmode::m_weighted_load:
+ algo = new Weightedload;
+ break;
+ case Dispatchmode::m_leastconn:
+ default:
+ algo = new Leastconn;
+ break;
+ }
+
+ // NOTE: Memory errors for algorithm pointer are not handled here,
+ // but in dispatch() (don't want to throw up in the constructor)
+
+ debugmsg("Dispatcher instantiated.\n");
+}
+
|
|
[-]
[+]
|
Added |
crossroads-devel.tar.gz/xr/dispatcher/dispatcher2.cc
^
|
| @@ -0,0 +1,6 @@
+#include "dispatcher"
+
+Dispatcher::~Dispatcher() {
+ delete algo;
+ debugmsg ("Dispatcher finished\n");
+}
|
|
[-]
[+]
|
Changed |
crossroads-devel.tar.gz/xr/dnsentry/dnsentry
^
|
| @@ -3,16 +3,17 @@
#include "config/config"
#include "error/error"
+#include "timestamp/timestamp"
#include "ThreadsAndMutexes/mutex/mutex"
class DNSEntry {
public:
- DNSEntry(): result(0), timestamp(0) {}
+ DNSEntry(): result(0), timestamp() {}
in_addr_t &resolve(string const &str);
private:
in_addr_t result;
- time_t timestamp;
+ Timestamp timestamp;
};
#endif
|
|
[-]
[+]
|
Changed |
crossroads-devel.tar.gz/xr/dnsentry/resolve.cc
^
|
| @@ -2,8 +2,7 @@
in_addr_t &DNSEntry::resolve (string const &h) {
// If the entry is there and if it's up to date, run with it
- if (timestamp &&
- time(0) <= timestamp + (time_t)config.dnscachetimeout())
+ if (result && timestamp.elapsed() <= (double)config.dnscachetimeout())
return result;
// Resolve now.
@@ -16,5 +15,6 @@
if (!hostaddr)
throw static_cast<Error>("Failed to resolve host '") + h + "'";
+ debugmsg(Mstr("Host ") + h + "resolved\n");
return result;
}
|
|
[-]
[+]
|
Changed |
crossroads-devel.tar.gz/xr/error/error
^
|
| @@ -1,7 +1,8 @@
#ifndef _ERROR_
#define _ERROR_
-#include "../sys/sys"
+#include "sys/sys"
+#include "timestamp/timestamp"
using namespace std;
@@ -10,7 +11,7 @@
Error (string s);
Error (int i);
Error &operator+ (Error const &other);
- Error &operator+ (string const s);
+ Error &operator+ (string const &s);
Error &operator+ (int i);
char const *what() const throw ();
|
|
[-]
[+]
|
Changed |
crossroads-devel.tar.gz/xr/error/opplus2.cc
^
|
| @@ -1,6 +1,6 @@
#include "error"
-Error &Error::operator+ (string s) {
+Error &Error::operator+ (string const &s) {
desc += s;
return (*this);
}
|
|
[-]
[+]
|
Changed |
crossroads-devel.tar.gz/xr/error/what.cc
^
|
| @@ -3,8 +3,10 @@
char const *Error::what() const throw (){
ostringstream o;
- if (config.prefixtimestamp())
- o << timestamp() << ' ';
+ if (config.prefixtimestamp()) {
+ Timestamp tm;
+ o << tm.desc() << ' ';
+ }
o << pthread_self() << " ERROR: " << desc;
return (o.str().c_str());
}
|
|
[-]
[+]
|
Changed |
crossroads-devel.tar.gz/xr/etc/status.xslt
^
|
| @@ -1,7 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-<xsl:output method="html"/>
+<xsl:output method="html"
+ encoding="UTF-8"
+ doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN"/>
<xsl:template match="/">
<html>
@@ -58,23 +60,110 @@
<xsl:template match="/status">
<table>
- <xsl:apply-templates select="/status/server"/>
- <xsl:apply-templates select="/status/backend"/>
-
- <tr> <td colspan="4"><hr/></td></tr>
<tr>
- <td class="backend" colspan="2">
- <b>Add back end ip:port</b>
+ <td valign="top">
+ <!-- This is the left hand detailed status view -->
+ <table>
+ <tr>
+ <td colspan="4"><b>Detailed Status</b></td>
+ </tr>
+ <tr>
+ <td colspan="4"><hr/></td>
+ </tr>
+ <xsl:apply-templates select="/status/server"/>
+ <xsl:apply-templates select="/status/backend"/>
+
+ <tr> <td colspan="4"><hr/></td></tr>
+ <tr>
+ <td class="backend" colspan="2">
+ <b>Add back end ip:port</b>
+ </td>
+ <td class="backend" colspan="2" align="right">
+ <input type="text" size="30" name="addbackend" id="addbackend"
+ onchange="goto('/server/addbackend/', 'addbackend');"/>
+ </td>
+ </tr>
+ <tr> <td colspan="4"><hr/></td></tr>
+
+ </table>
+ <xsl:apply-templates select="/status/id"/>
</td>
- <td class="backend" colspan="2" align="right">
- <input type="text" size="30" name="addbackend" id="addbackend"
- onchange="goto('/server/addbackend/', 'addbackend');"/>
+ <td valign="top">
+ <!-- This is the right-hand overview -->
+ <table width="100%">
+ <tr>
+ <td colspan="2"><b>Quick Overview</b></td>
+ </tr>
+ <tr>
+ <td colspan="2"><hr/></td>
+ </tr>
+ <xsl:for-each select="/status/backend">
+ <tr>
+ <td>
+ <b>Back end
+ <a href="#{nr}"><xsl:value-of select="address"/></a>
+ </b>
+ </td>
+ <td>
+ <xsl:value-of select="up"/>,
+ <xsl:value-of select="live"/>,
+ <xsl:value-of select="available"/>,
+ <xsl:value-of select="connections"/> connections
+ </td>
+ </tr>
+ </xsl:for-each>
+ </table>
+ <!-- This is the activity overview -->
+ <table width="100%">
+ <tr>
+ <td colspan="5"><hr/></td>
+ </tr>
+ <tr>
+ <td colspan="5"><b>Activity</b></td>
+ </tr>
+ <tr>
+ <td colspan="5"><hr/></td>
+ </tr>
+ <tr>
+ <td><b>Thread</b></td>
+ <td><b>Description</b></td>
+ <td><b>Back end</b></td>
+ <td><b>Duration</b></td>
+ <td></td>
+ </tr>
+ <xsl:apply-templates select="/status/activity/thread">
+ <xsl:sort select="duration" data-type="number"/>
+ </xsl:apply-templates>
+ </table>
</td>
</tr>
- <tr> <td colspan="4"><hr/></td></tr>
-
</table>
- <xsl:apply-templates select="/status/id"/>
+</xsl:template>
+
+<xsl:template match="/status/activity/thread">
+ <tr>
+ <td><xsl:value-of select="id"/></td>
+ <td><xsl:value-of select="description"/></td>
+ <xsl:choose>
+ <xsl:when test="backend = -1">
+ <td></td>
+ </xsl:when>
+ <xsl:otherwise>
+ <td><xsl:value-of select="address"/></td>
+ </xsl:otherwise>
+ </xsl:choose>
+ <td><xsl:value-of select="duration"/></td>
+ <xsl:choose>
+ <xsl:when test="backend = -1">
+ <td></td>
+ </xsl:when>
+ <xsl:otherwise>
+ <td><input type="button" value="Kill"
+ onclick="goto('/thread/kill/{id}', '');"/>
+ </td>
+ </xsl:otherwise>
+ </xsl:choose>
+ </tr>
</xsl:template>
<xsl:template match="/status/id">
@@ -441,6 +530,7 @@
<tr> <td colspan="4"><hr/></td></tr>
<tr>
<td class="backend" colspan="3">
+ <a name="{nr}"/>
<b> Back end <xsl:value-of select="address"/> </b>
</td>
<td class="backend">
@@ -554,6 +644,14 @@
</select>
</xsl:otherwise>
</xsl:choose>
+ </td>
+ </tr>
+ <tr>
+ <td></td>
+ <td colspan="2">Stop all connections</td>
+ <td>
+ <input type="button" value="Stop now"
+ onclick="goto('/backend/{nr}/stopconnections', '');"/>
</td>
</tr>
</xsl:template>
|
|
[-]
[+]
|
Changed |
crossroads-devel.tar.gz/xr/fdset/readable.cc
^
|
| @@ -21,10 +21,7 @@
// Prepare select sets.
FD_ZERO (&readset);
FD_ZERO (&exceptset);
- int max = 0;
for (unsigned i = 0; i < set.size(); i++) {
- if (set[i] > max)
- max = set[i];
FD_SET (set[i], &readset);
FD_SET (set[i], &exceptset);
}
@@ -39,7 +36,7 @@
// Run the select. Signal interrupts are returned as -1, so that
// the caller can handle them gracefully.
- if (select (max + 1, &readset, 0, &exceptset, tvp) < 0) {
+ if (select (FD_SETSIZE, &readset, 0, &exceptset, tvp) < 0) {
debugmsg (Mstr("Select interrupted with errno ") + errno +
" while waiting for readable fd\n");
if (errno != EINTR)
@@ -53,7 +50,7 @@
// Check for exceptions.
for (unsigned i = 0; i < set.size(); i++)
if (FD_ISSET (set[i], &exceptset))
- throw static_cast<Error>("Exception on fd/socket ") + set[i];
+ throw static_cast<Error>("Exception on fd/socket ") + int(set[i]);
// Check what's readable.
for (unsigned i = 0; i < set.size(); i++)
|
|
[-]
[+]
|
Changed |
crossroads-devel.tar.gz/xr/fdset/readwriteable.cc
^
|
| @@ -41,12 +41,14 @@
// Check for exceptions.
for (unsigned i = 0; i < set.size(); i++)
if (FD_ISSET (set[i], &exceptset))
- throw static_cast<Error>("Exception on fd/socket ") + set[i];
+ throw static_cast<Error>("Exception on fd/socket ") + int(set[i]);
// Check what's active.
for (unsigned i = 0; i < set.size(); i++)
- if (FD_ISSET (set[i], &readset) && FD_ISSET (set[i], &writeset))
+ if (FD_ISSET (set[i], &readset) && FD_ISSET (set[i], &writeset)) {
+ debugmsg(Mstr("Fd " ) + set[i] + " has become read/writeable\n");
return (set[i]);
+ }
// Nothing..
return (-1);
|
|
[-]
[+]
|
Changed |
crossroads-devel.tar.gz/xr/fdset/writeable.cc
^
|
| @@ -41,7 +41,7 @@
// Check for exceptions.
for (unsigned i = 0; i < set.size(); i++)
if (FD_ISSET (set[i], &exceptset))
- throw static_cast<Error>("Exception on fd/socket ") + set[i];
+ throw static_cast<Error>("Exception on fd/socket ") + int(set[i]);
// Check what's writeable.
for (unsigned i = 0; i < set.size(); i++)
|
|
[-]
[+]
|
Changed |
crossroads-devel.tar.gz/xr/httpbuffer/httpbuffer
^
|
| @@ -36,6 +36,8 @@
string requesturi();
+ void reset();
+
private:
unsigned findheader (string h);
unsigned bodystart;
|
|
[-]
[+]
|
Added |
crossroads-devel.tar.gz/xr/httpbuffer/reset.cc
^
|
| @@ -0,0 +1,7 @@
+#include "httpbuffer"
+
+void Httpbuffer::reset() {
+ first_line = "";
+ bodystart = 0;
+ Netbuffer::reset();
+}
|
|
[-]
[+]
|
Changed |
crossroads-devel.tar.gz/xr/httpbuffer/setversion.cc
^
|
| @@ -3,15 +3,16 @@
bool Httpbuffer::setversion (char v) {
PROFILE("Httpbuffer::setversion");
- // No headers? Nothing to do.
- if (!headersreceived())
+ // No first line? Nothing to do yet.
+ unsigned croff = charfind('\n');
+ if (!croff)
return false;
- // First line must start with HTTP/1.X.
- // Poke in the version right after that.
- if (bufsz() < 8 || strncmp(bufdata(), "HTTP/1.", 7))
+ // Find the HTTP/1.x header
+ unsigned stroff = strfind("HTTP/1.");
+ if (!stroff || stroff > croff)
return false;
// Poke in the new version.
- return setchar(7, v);
+ return setchar(stroff + 7, v);
}
|
|
[-]
[+]
|
Changed |
crossroads-devel.tar.gz/xr/httpdispatcher/dispatch.cc
^
|
| @@ -2,13 +2,12 @@
void HttpDispatcher::dispatch() {
PROFILE("HttpDispatcher::dispatch");
-
+
unsigned stickytarget;
string host_header = "";
// Try to dispatch. Since we're in HTTP mode, we must return an
// error page when dispatching fails.
-
try {
// Get the client's request. May need for cookie inspection or for the
@@ -17,9 +16,7 @@
if (!buf.netread(clientfd(), config.client_timeout()))
throw static_cast<Error>("Didn't receive a valid "
"client request.");
- if (config.verbose())
- msg ("Received client request: '" + buf.firstline() +
- "'\n");
+ msg ("Received client request: '" + buf.firstline() + "'\n");
// See if hostmatching is used. This is true when a backend
// matches against a non-dot host.
@@ -32,9 +29,8 @@
// Build new target list if host matching applies.
if (hostmatchused) {
host_header = buf.headerval ("Host");
- if (config.verbose())
- msg ("Will try to dispatch request host '" +
- host_header + "'\n");
+ msg ("Will try to dispatch request host '" +
+ host_header + "'\n");
// We need to build tcpdispatcher's target list now!
// Construct locally and poke into TcpDispatcher.
@@ -67,13 +63,11 @@
// to non-sticky dispatching.
targetbackend(stickytarget);
Backend tb = balancer.backend(stickytarget);
- if (config.verbose())
- msg ("Sticky HTTP request for " + tb.description() + "\n");
+ msg ("Sticky HTTP request for " + tb.description() + "\n");
if (! tb.connect()) {
balancer.backend(stickytarget).live(false);
- if (config.verbose())
- msg ("Failed to connect to back end " + tb.description() +
- ", trying to dispatch to other\n");
+ msg ("Failed to connect to back end " + tb.description() +
+ ", trying to dispatch to other\n");
issticky(false);
TcpDispatcher::dispatch();
} else {
@@ -81,11 +75,10 @@
issticky(true);
}
}
-
+
} catch (Error const &e) {
- senderrorpage();
+ senderrorpage(e.what());
throw e;
}
-
}
|
|
[-]
[+]
|
Changed |
crossroads-devel.tar.gz/xr/httpdispatcher/handle.cc
^
|
| @@ -5,12 +5,6 @@
// The client request was already retrieved before starting the
// dispatcher. We can continue by applying server-directed headers.
- debugmsg("Applying server-directed headers to client request\n");
- buf.setversion('0');
- buf.setheader ("Connection", "close");
- buf.setheader ("Proxy-Connection", "close");
-
- // Apply other server-side directed info
if (config.addxrversion())
buf.setheader ("XR", VER);
if (config.addxforwardedfor())
@@ -22,14 +16,18 @@
debugmsg("Sending client request to back end\n");
buf.netwrite(backendfd(), config.backend_timeout());
- // Let's see if we need to modify the server headers.
+ // Let's see if we will need to modify the server headers.
bool modify_serverheaders = false;
if (config.addxrversion() ||
(config.stickyhttp() && !issticky()))
modify_serverheaders = true;
+ // Store the client request. May want to log it later.
+ string client_request = buf.firstline();
+
// Go into copy-thru mode. If required, catch the server headers on
// their first appearance and modify them.
+ bool backend_response_checked = false;
while (1) {
Fdset readset (config.client_timeout());
readset.add(clientfd());
@@ -45,7 +43,7 @@
break;
if (sock == backendfd() && modify_serverheaders) {
- debugmsg("First back end request seen, applying modifications\n");
+ debugmsg("Back end response seen, applying modifications\n");
modify_serverheaders = false;
while (! buf.headersreceived())
if (!buf.netread (sock, config.backend_timeout()))
@@ -59,6 +57,18 @@
buf.setheader("Set-Cookie", o.str());
}
}
+
+ // The back end response may now get flushed to the client.
+ // If the response code is 4** or 5**, log it as a warning.
+ if (!backend_response_checked &&
+ sock == backendfd() && buf.headersreceived()) {
+ string respcode = buf.stringat(9, 3);
+ if (respcode[0] == '4' || respcode[0] == '5')
+ warnmsg("HTTP back end indicates fault: '" +
+ buf.firstline() + "' as response to '" +
+ client_request + "'\n");
+ backend_response_checked = true;
+ }
// Flush info to the other connected side.
int othersock, timeout;
@@ -77,4 +87,5 @@
if (sock == backendfd())
balancer.backend(targetbackend()).addbytes(buf.bufsz());
}
+
}
|
|
[-]
[+]
|
Changed |
crossroads-devel.tar.gz/xr/httpdispatcher/httpdispatcher
^
|
| @@ -15,7 +15,7 @@
void issticky (bool s) { is_sticky = s; }
private:
- void senderrorpage();
+ void senderrorpage(string const &desc);
Httpbuffer buf;
bool is_sticky;
|
|
[-]
[+]
|
Changed |
crossroads-devel.tar.gz/xr/httpdispatcher/senderrorpage.cc
^
|
| @@ -1,14 +1,9 @@
#include "httpdispatcher"
-#define ERRORSTR \
- "HTTP/1.0 502 Internal Server Error\r\n" \
- "Content-Length: 0\r\n" \
- "\r\n"
-
-void HttpDispatcher::senderrorpage() {
+void HttpDispatcher::senderrorpage(string const &reason) {
PROFILE("HttpDispatcher::senderrorpage");
- msg ("Sending error page to client.\n");
+ msg ("Sending error page to client: '" + reason + "'\n");
try {
string txt =
"<html>\n"
@@ -24,13 +19,16 @@
mess <<
"HTTP/1.0 502 Internal Server Error\r\n"
"Content-Length: " << txt.size() << "\r\n"
+ "XR-Reason: " << reason << "\r\n"
"\r\n" <<
txt;
Netbuffer buf(mess.str());
buf.netwrite(clientfd(), config.client_timeout());
} catch (Error const &e) {
- Mutex::lock(&cerr);
- cerr << e.what() << " (while sending error page)\n";
- Mutex::unlock(&cerr);
+ // Silently discard, we are not interested in errors
+ // that ocur when an error page is being sent
+ // Mutex::lock(&cerr);
+ // cerr << e.what() << " (while sending error page)\n";
+ // Mutex::unlock(&cerr);
}
}
|
|
[-]
[+]
|
Changed |
crossroads-devel.tar.gz/xr/mstr/mstr
^
|
| @@ -41,6 +41,12 @@
*this += o.str();
return *this;
}
+ Mstr const &operator+(rlim_t r) {
+ ostringstream o;
+ o << r;
+ *this += o.str();
+ return *this;
+ }
};
#endif
|
|
[-]
[+]
|
Changed |
crossroads-devel.tar.gz/xr/netbuffer/checkspace.cc
^
|
| @@ -5,14 +5,25 @@
if (!buf_alloced) {
buf_alloced = extra;
+ // When the first network buffer is allocated in HTTP mode, get
+ // twice as much. Most often that will be enough to fetch the whole
+ // client request, so that one realloc() will be spared.
+ if (extra == config.buffersize() &&
+ config.stype() == Servertype::t_http)
+ buf_alloced <<= 1;
+ msg (Mstr("Reserving ") + buf_alloced + " bytes for network buffer\n");
+ LOCK_MALLOC;
buf_data = (char*)malloc(buf_alloced);
+ UNLOCK_MALLOC;
if (! buf_data)
throw static_cast<Error>("Memory fault in Netbuffer::check_space");
} else if (buf_sz + extra > buf_alloced) {
msg((Mstr("Reallocating net buffer from ") + buf_alloced) +
(Mstr(" to ") + (buf_alloced + extra)) + " bytes\n");
buf_alloced += extra;
+ LOCK_MALLOC;
buf_data = (char*)realloc(buf_data, buf_alloced);
+ UNLOCK_MALLOC;
if (! buf_data)
throw static_cast<Error>("Memory fault in Netbuffer::check_space");
}
|
|
[-]
[+]
|
Changed |
crossroads-devel.tar.gz/xr/netbuffer/copy.cc
^
|
| @@ -3,8 +3,11 @@
void Netbuffer::copy (Netbuffer const &other) {
buf_sz = other.buf_sz;
buf_alloced = other.buf_alloced;
- if (! (buf_data = (char*)malloc(buf_sz)) )
+ LOCK_MALLOC;
+ buf_data = (char*)malloc(buf_alloced);
+ UNLOCK_MALLOC;
+ if (!buf_data)
throw static_cast<Error>("Memory fault in Netbuffer::copy");
- memcpy (buf_data, other.buf_data, buf_sz);
+ memcpy (buf_data, other.buf_data, buf_alloced);
}
|
|
[-]
[+]
|
Changed |
crossroads-devel.tar.gz/xr/netbuffer/netbuffer
^
|
| @@ -6,6 +6,17 @@
#include "config/config"
#include "profiler/profiler"
#include "fdset/fdset"
+#include "servertype/servertype"
+
+/* A few defs when malloc() / realloc() are suspected to be not thread-safe.
+ * The defines are used in eg. copy() and check_space(). */
+#ifdef MISTRUST_MALLOC_THREADSAFE
+#define LOCK_MALLOC Mutex::lock((void*)malloc)
+#define UNLOCK_MALLOC Mutex::unlock((void*)malloc)
+#else
+#define LOCK_MALLOC
+#define UNLOCK_MALLOC
+#endif
class Netbuffer {
public:
@@ -26,7 +37,7 @@
unsigned strfind (char const *s) const;
unsigned charfind (char ch, unsigned start = 0) const;
-
+
bool setchar(unsigned offset, char ch);
void setstring(string const &s);
@@ -36,7 +47,7 @@
bool removeat(unsigned index, unsigned len = 1);
void reset();
-
+
private:
void copy (Netbuffer const &other);
@@ -44,7 +55,7 @@
void check_space(unsigned extra);
string printable(char c) const;
-
+
char *buf_data;
unsigned buf_sz;
unsigned buf_alloced;
|
|
[-]
[+]
|
Changed |
crossroads-devel.tar.gz/xr/netbuffer/netread.cc
^
|
| @@ -8,15 +8,18 @@
set.add(fd);
if (set.readable() != fd)
throw static_cast<Error>("Fd ") + fd +
- " failed to become readable within " + timeout + "sec";
+ " failed to become readable within " + int(timeout) + " sec";
}
check_space(config.buffersize());
-
+
+ // Read from the network. If this fails, don't throw an exception
+ // because it's quite common (too much logging otherwise).
ssize_t nread = read (fd, buf_data + buf_sz, config.buffersize());
- if (nread < 0)
- throw static_cast<Error>("Read failed on fd ") + fd + ": " +
- strerror(errno);
+ if (nread < 0) {
+ msg(Mstr("Read failed on fd ") + fd + ": " + strerror(errno));
+ return 0;
+ }
buf_sz += nread;
if (config.debug() && nread) {
|
|
[-]
[+]
|
Changed |
crossroads-devel.tar.gz/xr/netbuffer/netwrite.cc
^
|
| @@ -57,7 +57,8 @@
totwritten += nwritten;
else if (errno != EINVAL && errno != EINPROGRESS)
throw static_cast<Error>("Write/send failed: errno=") +
- errno + ", " + strerror(errno) + ", result=" + nwritten;
+ int(errno) + ", " + strerror(errno) +
+ ", result=" + (int)nwritten;
}
return buf_sz;
|
|
[-]
[+]
|
Changed |
crossroads-devel.tar.gz/xr/profiler/profiler
^
|
| @@ -2,6 +2,7 @@
#define _PROFILER_
#include "sys/sys"
+#include "timestamp/timestamp"
#include "ThreadsAndMutexes/mutex/mutex"
class Profiler {
@@ -10,7 +11,7 @@
~Profiler();
private:
char const *fname;
- struct timeval tv_start;
+ Timestamp timestamp;
static FILE *outf;
};
|
|
[-]
[+]
|
Changed |
crossroads-devel.tar.gz/xr/profiler/profiler1.cc
^
|
| @@ -2,8 +2,7 @@
FILE *Profiler::outf;
-Profiler::Profiler (char const *f) {
+Profiler::Profiler (char const *f): timestamp() {
fname = f;
- gettimeofday(&tv_start, 0);
}
|
|
[-]
[+]
|
Changed |
crossroads-devel.tar.gz/xr/profiler/profiler2.cc
^
|
| @@ -1,22 +1,9 @@
#include "profiler"
Profiler::~Profiler() {
- struct timeval tv_end;
- gettimeofday (&tv_end, 0);
- double usec =
- ( ((double)tv_end.tv_sec * 1000000 + tv_end.tv_usec) -
- ((double)tv_start.tv_sec * 1000000 + tv_start.tv_usec) );
-
- /*
- cout << fname
- << " start " << tv_start.tv_sec << " . " << tv_start.tv_usec
- << ", end " << tv_end.tv_sec << '.' << tv_end.tv_usec
- << ", usec " << usec << '\n';
- */
-
if (!outf)
outf = fopen ("/tmp/xr-prof.txt", "w");
if (outf)
fprintf (outf, "%s %s %g\n",
- timestamp().c_str(), fname, usec);
+ timestamp.desc().c_str(), fname, timestamp.elapsed());
}
|
|
[-]
[+]
|
Added |
crossroads-devel.tar.gz/xr/sys/anymsg.cc
^
|
| @@ -0,0 +1,17 @@
+#include "sys"
+#include "config/config"
+#include "ThreadsAndMutexes/mutex/mutex"
+#include "profiler/profiler"
+#include "mstr/mstr"
+#include "timestamp/timestamp"
+
+void anymsg (Mstr const &s, ostream &o, string const &label) {
+ Mutex::lock(&o);
+ if (config.prefixtimestamp()) {
+ Timestamp tm;
+ o << tm.desc() << ' ';
+ }
+ o << pthread_self() << ' ' << label << ": " << s;
+ o.flush();
+ Mutex::unlock(&o);
+}
|
|
[-]
[+]
|
Changed |
crossroads-devel.tar.gz/xr/sys/debugmsg.cc
^
|
| @@ -3,14 +3,9 @@
#include "ThreadsAndMutexes/mutex/mutex"
#include "profiler/profiler"
#include "mstr/mstr"
+#include "timestamp/timestamp"
void _debugmsg (Mstr const &s) {
PROFILE("debugmsg");
-
- Mutex::lock(&cerr);
- if (config.prefixtimestamp())
- cerr << timestamp() << ' ';
- cerr << pthread_self() << " DEBUG: " << s;
- cerr.flush();
- Mutex::unlock(&cerr);
+ anymsg(s, cerr, "DEBUG");
}
|
|
[-]
[+]
|
Changed |
crossroads-devel.tar.gz/xr/sys/main.cc
^
|
| @@ -10,15 +10,52 @@
Config config;
Balancer balancer;
+static void showlimits() {
+ typedef struct {
+ int resource;
+ string description;
+ } Limit;
+ static Limit limit[] = {
+ { RLIMIT_CORE, "coredump size (bytes)" },
+ { RLIMIT_CPU, "cpu time (sec)" },
+ { RLIMIT_DATA, "data segment size (bytes)" },
+ { RLIMIT_FSIZE, "max file size (bytes)" },
+# ifdef RLIMIT_MEMLOCK
+ { RLIMIT_MEMLOCK, "locked mem size (bytes)" },
+# endif
+ { RLIMIT_NOFILE, "max open files" },
+# ifdef RLIMIT_NPROC
+ { RLIMIT_NPROC, "max processes" },
+# endif
+# ifdef RLIMIT_RSS
+ { RLIMIT_RSS, "max resident set size (bytes)" },
+# endif
+ { RLIMIT_STACK, "max stack size (bytes)" }
+ };
+
+ for (unsigned i = 0; i < sizeof(limit) / sizeof(Limit); i++) {
+ struct rlimit rl;
+ if (getrlimit(limit[i].resource, &rl))
+ throw static_cast<Error>("Failed to request limit: ") +
+ strerror(errno);
+ ostringstream o;
+ o << "Limits for " << limit[i].description
+ << ": hard limit " << unsigned(rl.rlim_max)
+ << ", soft limit " << unsigned(rl.rlim_cur) << '\n';
+ msg(o.str());
+ }
+}
+
static void sigcatcher (int sig) {
debugmsg ("Seen signal " + sig + '\n');
if (sig == SIGHUP)
balancer.report(true);
- else if (sig != SIGPIPE)
+ else if (sig != SIGPIPE && sig != SIGSTOP)
balancer.terminate(true);
// Actually we wouldn't need to test for SIGPIPE, it's ignored (see below).
// Leaving the test in place for future versions, better an extra if
// than forgetting it later.
+ // SIGSTOP is used for stopping separare threads.
}
int main (int argc, char **argv) {
@@ -33,6 +70,9 @@
// Load configuration from the commandline, promote verbosity
config.parsecmdline (argc, argv);
+ if (config.verbose())
+ showlimits();
+
msg ((Mstr("XR running as PID ") + getpid()) + "\n");
// Load the signal handler.
|
|
[-]
[+]
|
Changed |
crossroads-devel.tar.gz/xr/sys/msg.cc
^
|
| @@ -3,14 +3,9 @@
#include "ThreadsAndMutexes/mutex/mutex"
#include "profiler/profiler"
#include "mstr/mstr"
+#include "timestamp/timestamp"
void _msg (Mstr const &s) {
PROFILE("msg");
-
- Mutex::lock(&cerr);
- if (config.prefixtimestamp())
- cerr << timestamp() << ' ';
- cerr << pthread_self() << " INFO: " << s;
- cerr.flush();
- Mutex::unlock(&cerr);
+ anymsg(s, cerr, "INFO");
}
|
|
[-]
[+]
|
Changed |
crossroads-devel.tar.gz/xr/sys/reportmsg.cc
^
|
| @@ -2,12 +2,8 @@
#include "config/config"
#include "ThreadsAndMutexes/mutex/mutex"
#include "mstr/mstr"
+#include "timestamp/timestamp"
void reportmsg (Mstr const &s) {
- Mutex::lock(&cerr);
- if (config.prefixtimestamp())
- cerr << timestamp() << ' ';
- cerr << pthread_self() << " REPORT: " << s;
- cerr.flush();
- Mutex::unlock(&cerr);
+ anymsg(s, cerr, "REPORT");
}
|
|
[-]
[+]
|
Changed |
crossroads-devel.tar.gz/xr/sys/socketclose.cc
^
|
| @@ -9,7 +9,7 @@
if (config.fastclose()) {
struct linger l;
l.l_onoff = 1;
- l.l_linger = 0;
+ l.l_linger = 2;
setsockopt (fd, SOL_SOCKET, SO_LINGER, &l, sizeof(l));
}
close (fd);
|
|
[-]
[+]
|
Changed |
crossroads-devel.tar.gz/xr/sys/sys
^
|
| @@ -21,6 +21,7 @@
#include <unistd.h>
#include <arpa/inet.h>
#include <netinet/in.h>
+#include <sys/resource.h>
#include <sys/select.h>
#include <sys/socket.h>
#include <sys/time.h>
@@ -49,6 +50,15 @@
# define PROFILE(x)
#endif
+/* If you fear that your malloc() / realloc() may have threading problems,
+ * uncomment the following. It will cause mutex locks around the calls. */
+// #define MISTRUST_MALLOC_THREADSAFE
+
+/* If you fear racing conditions in thread_create() then uncomment this.
+ * BTW it would be really weird if thread_create() weren't thread-safe., so
+ * defining this is very likely not necessary. */
+// #define MISTRUST_THREAD_CREATE_THREADSAFE
+
using namespace std;
// This we need locally for msg(), debugmsg()
@@ -61,10 +71,10 @@
#define debugmsg(x) if (config.debug()) _debugmsg(x)
void reportmsg (Mstr const &s);
void warnmsg (Mstr const &s);
+void anymsg(Mstr const &s, ostream &o, string const &label);
/* Other */
int serversocket (string addr, int port, string description);
-string timestamp(time_t s = 0);
bool ipmatch (struct in_addr addr, struct in_addr mask);
void socketclose (int fd);
vector<string> str2parts (string const &s, char sep);
|
|
[-]
[+]
|
Deleted |
crossroads-devel.tar.gz/xr/sys/timestamp.cc
^
|
| @@ -1,21 +0,0 @@
-#include "sys"
-
-string timestamp(time_t s) {
- struct timeval tv;
-
- if (! s)
- gettimeofday (&tv, 0);
- else {
- tv.tv_sec = s;
- tv.tv_usec = 0;
- }
-
- struct tm *tmp = localtime(&tv.tv_sec);
-
- char buf[80];
- sprintf (buf, "%4.4d-%2.2d-%2.2d %2.2d:%2.2d:%2.2d,%3.3d",
- tmp->tm_year + 1900, tmp->tm_mon + 1, tmp->tm_mday,
- tmp->tm_hour, tmp->tm_min, tmp->tm_sec,
- int(tv.tv_usec / 1000));
- return (buf);
-}
|
|
[-]
[+]
|
Changed |
crossroads-devel.tar.gz/xr/sys/warnmsg.cc
^
|
| @@ -2,12 +2,8 @@
#include "config/config"
#include "ThreadsAndMutexes/mutex/mutex"
#include "mstr/mstr"
+#include "timestamp/timestamp"
void warnmsg (Mstr const &s) {
- Mutex::lock(&cerr);
- if (config.prefixtimestamp())
- cerr << timestamp() << ' ';
- cerr << pthread_self() << " WARNING: " << s;
- cerr.flush();
- Mutex::unlock(&cerr);
+ anymsg(s, cerr, "WARNING");
}
|
|
[-]
[+]
|
Changed |
crossroads-devel.tar.gz/xr/tcpdispatcher/dispatch.cc
^
|
| @@ -3,7 +3,7 @@
void TcpDispatcher::dispatch() {
// Check that a working algorithm is available. May be missing if
// constructor's "new" failed.
- if (!algorithm)
+ if (!algorithm())
throw static_cast<Error>("No algorithm in Tcpdispatcher::dispatch");
bool connected = false;
@@ -11,11 +11,11 @@
// Build up the target list, if not yet done so. The HTTP dispatcher
// might've created it already for host-based matching (in which case
// we won't bother here).
- if (! target_list.isdefined()) {
+ if (! targetlist().isdefined()) {
msg ("Creating target list for the TCP dispatcher\n");
for (unsigned i = 0; i < balancer.nbackends(); i++)
if (balancer.backend(i).available()) {
- target_list.add(i);
+ targetlist().add(i);
if (config.verbose())
msg (" Candidate target: " +
balancer.backend(i).description() + "\n");
@@ -25,10 +25,10 @@
// Call the dispatch algorithm until we can connect,
// or until the algorithm is out of back ends (throws exception).
while (!connected) {
- target_backend = algorithm->target(clientip(), target_list);
- Backend tb = balancer.backend(target_backend);
+ targetbackend(algorithm()->target(clientip(), targetlist()));
+ Backend tb = balancer.backend(targetbackend());
if (!tb.connect()) {
- balancer.backend(target_backend).live(false);
+ balancer.backend(targetbackend()).live(false);
if (config.verbose())
msg ("Failed to connect to back end " + tb.description() +
", trying to dispatch to other\n");
|
|
[-]
[+]
|
Changed |
crossroads-devel.tar.gz/xr/tcpdispatcher/execute.cc
^
|
| @@ -27,7 +27,10 @@
"' terminated abnormally!\n");
}
-void TcpDispatcher::execute() {
+void TcpDispatcher::execute() {
+ Threadlist::desc("Verifying");
+ Threadlist::clientfd(clientfd());
+
msg ((Mstr("Dispatch request for client fd ") + clientfd()) + "\n");
// Check 'softmaxconnrate' and 'hardmaxconnrate' now!
@@ -43,9 +46,9 @@
unsigned max_conns = max(config.hardmaxconnrate(),
config.softmaxconnrate());
- Mutex::lock (&accesslog[client_ip.s_addr]);
- accesslog[client_ip.s_addr].push(now);
- Mutex::unlock (&accesslog[client_ip.s_addr]);
+ Mutex::lock (&accesslog[clientip().s_addr]);
+ accesslog[clientip().s_addr].push(now);
+ Mutex::unlock (&accesslog[clientip().s_addr]);
if (accesslog_lastclean < min_ts) {
// Clean the entire access log, it's been a while...
@@ -74,61 +77,67 @@
} else {
// The "big log" doesn't need to be fully cleaned,
// but this particular IP should be!
- Mutex::lock(&accesslog[client_ip.s_addr]);
- while ( accesslog[client_ip.s_addr].front() < min_ts
- || accesslog[client_ip.s_addr].size() > max_conns ) {
- accesslog[client_ip.s_addr].pop();
+ Mutex::lock(&accesslog[clientip().s_addr]);
+ while ( accesslog[clientip().s_addr].front() < min_ts
+ || accesslog[clientip().s_addr].size() > max_conns ) {
+ accesslog[clientip().s_addr].pop();
}
- Mutex::unlock(&accesslog[client_ip.s_addr]);
+ Mutex::unlock(&accesslog[clientip().s_addr]);
}
if (config.hardmaxconnrate() &&
- accesslog[client_ip.s_addr].size() >= config.hardmaxconnrate() ) {
+ accesslog[clientip().s_addr].size() >= config.hardmaxconnrate() ) {
// This IP has violated the "HARD" limit! Reject the connection
ostringstream o;
- o << "Client " << inet_ntoa(client_ip)
+ o << "Client " << inet_ntoa(clientip())
<< " has hit the HARD maximum number of connections ("
<< config.hardmaxconnrate() << " conections in "
<< config.connrate_time() << " seconds; "
- << accesslog[client_ip.s_addr].size()
+ << accesslog[clientip().s_addr].size()
<< " connections recorded). Client is refused.\n";
warnmsg (o.str());
socketclose(clientfd());
- run_excess(config.hardmaxconnexcess(), inet_ntoa(client_ip));
+ run_excess(config.hardmaxconnexcess(), inet_ntoa(clientip()));
return;
} else if (config.softmaxconnrate() &&
- (accesslog[client_ip.s_addr].size() >=
+ (accesslog[clientip().s_addr].size() >=
config.softmaxconnrate())) {
// This IP has violated the "SOFT" Limit. Go to sleep for a while.
ostringstream o;
- o << "Client " << inet_ntoa(client_ip)
+ o << "Client " << inet_ntoa(clientip())
<< " has hit the SOFT maximum number of connections ("
<< config.softmaxconnrate() << " connections in "
<< config.connrate_time() << " sedonds; "
- << accesslog[client_ip.s_addr].size()
+ << accesslog[clientip().s_addr].size()
<< " connections recorded). Client is deferred for "
<< config.defertime() << " microseconds.\n";
warnmsg (o.str());
- run_excess(config.softmaxconnexcess(), inet_ntoa(client_ip));
+ run_excess(config.softmaxconnexcess(), inet_ntoa(clientip()));
usleep(config.defertime());
}
}
try {
+ Threadlist::desc("Dispatching");
dispatch();
} catch (Error const &e) {
Mutex::lock(&cerr);
cerr << e.what() << "\n";
Mutex::unlock(&cerr);
- socketclose (clientfd());
+ socketclose(clientfd());
+ socketclose(backendfd());
return;
}
msg ((Mstr("Dispatching client fd ") + clientfd()) +
- (Mstr(" to ") + balancer.backend(target_backend).description()) +
+ (Mstr(" to ") + balancer.backend(targetbackend()).description()) +
(Mstr(", fd ") + backendfd()) + "\n");
- balancer.backend(target_backend).startconnection();
+ Threadlist::desc("Serving");
+ Threadlist::backend(targetbackend());
+ Threadlist::backendfd(backendfd());
+
+ balancer.backend(targetbackend()).startconnection();
try {
handle();
@@ -138,12 +147,12 @@
Mutex::unlock(&cerr);
}
- balancer.backend(target_backend).endconnection();
+ balancer.backend(targetbackend()).endconnection();
socketclose (clientfd());
socketclose (backendfd());
msg ((Mstr("Done dispatching to back end fd ") + backendfd()) +
- (Mstr(" at ") + balancer.backend(target_backend).description()) +
+ (Mstr(" at ") + balancer.backend(targetbackend()).description()) +
"\n");
}
|
|
[-]
[+]
|
Changed |
crossroads-devel.tar.gz/xr/tcpdispatcher/handle.cc
^
|
| @@ -31,7 +31,7 @@
netbuffer.netwrite (othersock, timeout);
if (sock == backendfd())
- balancer.backend(target_backend).addbytes(netbuffer.bufsz());
+ balancer.backend(targetbackend()).addbytes(netbuffer.bufsz());
netbuffer.reset();
}
|
|
[-]
[+]
|
Changed |
crossroads-devel.tar.gz/xr/tcpdispatcher/tcpdispatcher
^
|
| @@ -1,53 +1,21 @@
#ifndef _TCPDISPATCHER_
#define _TCPDISPATCHER_
-#include "sys/sys"
-#include "balancer/balancer"
-#include "config/config"
-#include "ThreadsAndMutexes/thread/thread"
-#include "backendvector/backendvector"
+#include "dispatcher/dispatcher"
#include "netbuffer/netbuffer"
-// Dispatching algorithm workers
-#include "DispatchAlgorithms/algorithm/algorithm"
-#include "DispatchAlgorithms/roundrobin/roundrobin"
-#include "DispatchAlgorithms/firstactive/firstactive"
-#include "DispatchAlgorithms/leastconn/leastconn"
-#include "DispatchAlgorithms/external/external"
-#include "DispatchAlgorithms/hashedip/hashedip"
-#include "DispatchAlgorithms/storedip/storedip"
-#include "DispatchAlgorithms/weightedload/weightedload"
-
-class TcpDispatcher: public Thread {
+class TcpDispatcher: public Dispatcher {
public:
TcpDispatcher (int fd, struct in_addr ip);
- virtual ~TcpDispatcher();
virtual void execute();
-
virtual void dispatch();
- void dispatch (string host);
virtual void handle();
- int targetbackend() const { return target_backend; }
- void targetbackend(int t) { target_backend = t; }
- struct in_addr clientip() const { return client_ip; }
- int clientfd() const { return client_fd; }
- void clientfd(int c) { client_fd = c; }
- int backendfd() const { return backend_fd; }
- void backendfd(int b) { backend_fd = b; }
-
- BackendVector const &targetlist() const { return target_list; }
- void targetlist (BackendVector t) { target_list = t; }
-
unsigned readchunk (int src);
private:
- struct in_addr client_ip;
- int target_backend, client_fd, backend_fd;
- Algorithm *algorithm;
- BackendVector target_list;
Netbuffer netbuffer;
};
|
|
[-]
[+]
|
Changed |
crossroads-devel.tar.gz/xr/tcpdispatcher/tcpdispatcher1.cc
^
|
| @@ -1,37 +1,5 @@
#include "tcpdispatcher"
TcpDispatcher::TcpDispatcher(int cfd, struct in_addr cip):
- Thread(), client_ip(cip), target_backend(-1), client_fd(cfd),
- backend_fd(-1), target_list(), netbuffer() {
-
- // Instantiate dispatchmode algorithm
- switch (config.dispatchmode()) {
- case Dispatchmode::m_roundrobin:
- algorithm = new Roundrobin;
- break;
- case Dispatchmode::m_firstactive:
- algorithm = new Firstactive;
- break;
- case Dispatchmode::m_external:
- algorithm = new External;
- break;
- case Dispatchmode::m_strict_hashed_ip:
- case Dispatchmode::m_lax_hashed_ip:
- algorithm = new HashedIp;
- break;
- case Dispatchmode::m_strict_stored_ip:
- case Dispatchmode::m_lax_stored_ip:
- algorithm = new StoredIp;
- break;
- case Dispatchmode::m_weighted_load:
- algorithm = new Weightedload;
- break;
- case Dispatchmode::m_leastconn:
- default:
- algorithm = new Leastconn;
- break;
- }
-
- // NOTE: Memory errors for algorithm pointer are not handled here,
- // but in dispatch() (don't want to throw up in the constructor)
+ Dispatcher(cfd, cip), netbuffer() {
}
|
|
[-]
[+]
|
Deleted |
crossroads-devel.tar.gz/xr/tcpdispatcher/tcpdispatcher2.cc
^
|
| @@ -1,6 +0,0 @@
-#include "tcpdispatcher"
-
-TcpDispatcher::~TcpDispatcher() {
- delete algorithm;
- debugmsg ("TCP dispatcher finished\n");
-}
|
|
[-]
[+]
|
Added |
crossroads-devel.tar.gz/xr/timestamp
^
|
| +(directory)
|
|
[-]
[+]
|
Added |
crossroads-devel.tar.gz/xr/timestamp/desc.cc
^
|
| @@ -0,0 +1,11 @@
+#include "timestamp"
+
+string Timestamp::desc() const {
+ struct tm *tmp = localtime(&tv.tv_sec);
+ char buf[80];
+ sprintf (buf, "%4.4d-%2.2d-%2.2d %2.2d:%2.2d:%2.2d,%3.3d",
+ tmp->tm_year + 1900, tmp->tm_mon + 1, tmp->tm_mday,
+ tmp->tm_hour, tmp->tm_min, tmp->tm_sec,
+ int(tv.tv_usec / 1000));
+ return buf;
+}
|
|
[-]
[+]
|
Added |
crossroads-devel.tar.gz/xr/timestamp/elapsed.cc
^
|
| @@ -0,0 +1,10 @@
+#include "timestamp"
+
+double Timestamp::elapsed() const {
+ struct timeval end;
+ gettimeofday(&end, 0);
+ double usec =
+ ( ((double)end.tv_sec * 1000000 + end.tv_usec) -
+ ((double)tv.tv_sec * 1000000 + tv.tv_usec) );
+ return usec / 1000000;
+}
|
|
[-]
[+]
|
Added |
crossroads-devel.tar.gz/xr/timestamp/timestamp
^
|
| @@ -0,0 +1,17 @@
+#ifndef _TIMESTAMP_
+#define _TIMESTAMP_
+
+#include "sys/sys"
+
+class Timestamp {
+public:
+ Timestamp();
+ Timestamp(int sec_since_epoch);
+ double elapsed() const;
+ string desc() const;
+
+private:
+ struct timeval tv;
+};
+
+#endif
|
|
[-]
[+]
|
Added |
crossroads-devel.tar.gz/xr/timestamp/timestamp1.cc
^
|
| @@ -0,0 +1,5 @@
+#include "timestamp"
+
+Timestamp::Timestamp() {
+ gettimeofday(&tv, 0);
+}
|
|
[-]
[+]
|
Added |
crossroads-devel.tar.gz/xr/timestamp/timestamp2.cc
^
|
| @@ -0,0 +1,6 @@
+#include "timestamp"
+
+Timestamp::Timestamp(int sec_since_epoch) {
+ tv.tv_sec = sec_since_epoch;
+ tv.tv_usec = 0;
+}
|
|
[-]
[+]
|
Changed |
crossroads-devel.tar.gz/xr/webinterface/answer.cc
^
|
| @@ -1,5 +1,16 @@
#include "webinterface"
+static void stop_backend_thread(pthread_t id) {
+ Threadinfo info = Threadlist::info(id);
+ msg((Mstr("Stopping thread ") + id) +
+ (Mstr(" (backend socket ") + info.backendfd()) +
+ (Mstr(", client socket ") + info.clientfd()) +
+ ")\n");
+ socketclose(info.backendfd());
+ socketclose(info.clientfd());
+ Threadlist::deregister(id);
+}
+
static unsigned str2uns (string const &s, string const &desc) {
unsigned ret;
@@ -16,6 +27,21 @@
return (ret);
}
+static pthread_t str2threadid (string const &s, string const &desc) {
+ pthread_t ret;
+ long val;
+ int convret;
+
+ if (s[0] == '0' && (s[1] == 'x' || s[1] == 'X'))
+ convret = sscanf(s.c_str() + 2, "%lx", &val);
+ else
+ convret = sscanf(s.c_str(), "%ld", &val);
+ if (convret < 1)
+ throw static_cast<Error>("Bad ") + desc;
+ memcpy (&ret, &val, sizeof(ret));
+ return (ret);
+}
+
static unsigned backendindex (string const &s) {
unsigned ret;
@@ -455,6 +481,37 @@
answer_status();
return;
}
+
+ // /backend/NR/stopconnections
+ if (parts.size() == 3 &&
+ parts[0] == "backend" && parts[2] == "stopconnections") {
+ unsigned ind = backendindex(parts[1]);
+ bool done = false;
+ while (!done) {
+ done = true;
+ for (Threadmap::iterator it = Threadlist::map().begin();
+ it != Threadlist::map().end();
+ it++) {
+ pthread_t thread_id = (*it).first;
+ Threadinfo thread_info = (*it).second;
+ if (thread_info.backend() == (int)ind) {
+ stop_backend_thread(thread_id);
+ done = false;
+ break;
+ }
+ }
+ }
+ answer_status();
+ return;
+ }
+
+ // /thread/kill/VALUE
+ if (parts.size() == 3 && parts[0] == "thread" && parts[1] == "kill") {
+ pthread_t id = str2threadid(parts[2], "thread id");
+ stop_backend_thread(id);
+ answer_status();
+ return;
+ }
throw static_cast<Error>("No action for URI '/") + uri + "'";
}
|
|
[-]
[+]
|
Changed |
crossroads-devel.tar.gz/xr/webinterface/answerstatus.cc
^
|
| @@ -103,6 +103,28 @@
" <backendcheck>" << balancer.backend(i).backendcheck().setting() << "</backendcheck>\n"
" </backend>\n"
;
+
+ o << " <activity>\n";
+ for (Threadmap::iterator it = Threadlist::map().begin();
+ it != Threadlist::map().end();
+ it++) {
+ pthread_t thread_id = (*it).first;
+ Threadinfo thread_info = (*it).second;
+ o <<
+ " <thread>\n"
+ " <id>" << thread_id << "</id>\n"
+ " <description>" << thread_info.desc() << "</description>\n"
+ " <backend>" << thread_info.backend() << "</backend>\n"
+ " <address>";
+ if (thread_info.backend() >= 0)
+ o << balancer.backend(thread_info.backend()).description();
+ o <<
+ "</address>\n"
+ " <duration>" << thread_info.timestamp().elapsed() << "</duration>\n"
+ " </thread>\n";
+ }
+ o << " </activity>\n";
+
o <<
"</status>\n\n";
|
|
[-]
[+]
|
Changed |
crossroads-devel.tar.gz/xr/webinterface/execute.cc
^
|
| @@ -3,6 +3,8 @@
void Webinterface::execute() {
int sfd;
+ Threadlist::desc("Web interface");
+
// Create the server socket, or retry infinitely.
while (true) {
try {
|
|
[-]
[+]
|
Changed |
crossroads-devel.tar.gz/xr/webinterface/webinterface
^
|
| @@ -3,6 +3,7 @@
#include "sys/sys"
#include "ThreadsAndMutexes/thread/thread"
+#include "ThreadsAndMutexes/threadlist/threadlist"
#include "fdset/fdset"
#include "httpbuffer/httpbuffer"
#include "balancer/balancer"
|
|
[-]
[+]
|
Changed |
crossroads-devel.tar.gz/xrctl/xrctl
^
|
| @@ -2,6 +2,9 @@
use strict;
use Getopt::Std;
+# Versioning
+my $VER = "__VER__";
+
# --------------------------------------------------------------------------
# xrctl: used to start, stop, restart etc. the XR balancer.
@@ -47,14 +50,28 @@
# Load up the system config.
my %sysconf;
my $sysxp = new XMLParser($xp->data('system'));
-for my $tag qw(piddir pscmd uselogger logdir maxlogsize loghistory path) {
+for my $tag qw(pscmd logger uselogger logdir
+ maxlogsize loghistory path) {
$sysconf{$tag} = $sysxp->data($tag);
- msg("System config $tag: $sysconf{$tag}\n");
+ msg("System config $tag: $sysconf{$tag}\n") if ($sysconf{$tag} ne '');
}
if ($sysconf{path} eq '') {
msg ("No path in configuration, using environment\n");
$sysconf{path} = $ENV{PATH};
}
+if ($sysconf{logger} ne 'logger') {
+ msg ("Using non-default logger\n");
+ $default_logger = $sysconf{logger};
+}
+if ($sysconf{pscmd} eq '') {
+ $sysconf{pscmd} = xfind_bin('ps');
+ if (`uname` =~ /SunOS/) {
+ $sysconf{pscmd} .= ' -ef pid,comm';
+ } else {
+ $sysconf{pscmd} .= ' ax -o pid,command';
+ }
+}
+msg ("PS command: $sysconf{pscmd}\n");
# Load up the service names.
my @service_name;
@@ -102,7 +119,6 @@
for my $s (@_) {
print ("Service: $s\n");
print (" Process name : ", process_name($s), "\n");
- print (" PID file : ", pid_file($s), "\n");
print (" Logging : ", log_file($s), "\n");
print (" XR command : ", xr_command($s), "\n");
}
@@ -259,6 +275,7 @@
sub usage() {
die <<"ENDUSAGE";
+This is xrctl V$VER, the control script for XR, the Crossroads Load Balancer.
Usage: xrctl [-FLAGS] action [SERVICE ...]
Flags are:
-v increases verbosity
@@ -290,7 +307,7 @@
chomp ($line);
$line =~ s/^\s*//;
my ($pid, $cmd) = split(/\s+/, $line);
- msg("Command '$cmd' at pid '$pid' (line $line)\n");
+ # msg("Command '$cmd' at pid '$pid' (line $line)\n");
if ($cmd =~ /^xr-$s/) {
push (@ret, $pid);
msg ("Candidate PID: $pid\n");
@@ -344,10 +361,12 @@
# Find a binary along the path
sub find_bin {
my $bin = shift;
+ my @parts = split (/\s/, $bin);
for my $d (split (/:/, $sysconf{path})) {
- if (-x "$d/$bin") {
- msg ("Binary '$bin' found as '$d/$bin'\n");
- return ("$d/$bin");
+ if (-x "$d/$parts[0]" and -f "$d/$parts[0]") {
+ msg ("Binary '$parts[0]' found as '$d/$parts[0]'\n");
+ $parts[0] = "$d/$parts[0]";
+ return (join (' ', @parts));
}
}
msg ("Binary '$bin' not found along $sysconf{path}\n");
@@ -366,20 +385,16 @@
return ("xr-$service");
}
-# PID file according to a service name
-sub pid_file {
- my $service = shift;
- return ($sysconf{piddir} . '/' . process_name($service) . '.pid')
- if ($sysconf{piddir});
- return (undef);
-}
-
# Log file according to a service name
sub log_file {
my $service = shift;
my $logger = find_bin($default_logger);
if (istrue($sysconf{uselogger}) and defined($logger)) {
- return ("|$logger -t 'xr-$service'");
+ if ($logger eq 'logger') {
+ return ("|$logger -t 'xr-$service'");
+ } else {
+ return ("|$logger");
+ }
} else {
return ('>' . $sysconf{logdir} . '/' .
process_name($service) . '.log');
@@ -407,8 +422,6 @@
my @cmd;
push (@cmd, "xr-$service");
-
- push (@cmd, '--pidfile', pid_file($service)) if (pid_file($service));
push (@cmd, '--prefix-timestamp')
if (!istrue($sysconf{uselogger}) or !find_bin('logger'));
@@ -515,18 +528,15 @@
$last_backendcheck = $bc;
# Get address, weight and max connections
- my $wt = $bp->data('weight') or $default_weight;
- my $mx = $bp->data('maxconnections') or $default_maxconnections;
my $ad = $bp->data('address')
or die ("Backend in service '$service' lacks <address>\n");
+ my $mx = $bp->data('maxconnections');
+ $mx = $default_maxconnections if (!$mx);
+ $ad .= ":$mx";
+ my $wt = $bp->data('weight');
+ $wt = $default_weight if (!$wt);
+ $ad .= ":$wt";
- if ($mx and
- ($wt ne $default_weight or $mx ne $default_maxconnections)) {
- $ad .= ":$mx";
- }
- if ($wt and ($wt ne $default_weight)) {
- $ad .= ":$wt";
- }
push (@cmd, '--backend', $ad);
}
|
