diff --git a/src/server/httpapi.c b/src/server/httpapi.c index e6c59be..96b3dc5 100644 --- a/src/server/httpapi.c +++ b/src/server/httpapi.c @@ -20,11 +20,16 @@ * */ +#include #include #include #include +#ifdef PLATFORM_OSX +#include +#else #include +#endif #include #include @@ -92,7 +97,11 @@ send_response(struct MHD_Connection* conn, const char* body, int status_code) int connection_cb(void* cls, struct MHD_Connection* conn, const char* url, const char* method, const char* version, const char* data, size_t* size, void** con_cls) { +#ifdef PLATFORM_OSX + pthread_setname_np("http"); +#else prctl(PR_SET_NAME, "http"); +#endif if (*con_cls == NULL) { ConnectionInfo *con_info = create_connection_info(); diff --git a/src/server/log.c b/src/server/log.c index d0a5b27..80d58a0 100644 --- a/src/server/log.c +++ b/src/server/log.c @@ -20,11 +20,15 @@ * */ +#include + #include #include #include #include +#ifndef PLATFORM_OSX #include +#endif #include #include @@ -152,7 +156,14 @@ log_println(stbbr_log_t loglevel, const char * const msg, ...) GDateTime *dt = g_date_time_new_now(tz); gchar *date_fmt = g_date_time_format(dt, "%d/%m/%Y %H:%M:%S"); char thr_name[16]; + +#ifdef PLATFORM_OSX + pthread_t self = pthread_self(); + pthread_getname_np(self, thr_name, 16); +#else prctl(PR_GET_NAME, thr_name); +#endif + char *levelstr = _levelstr(loglevel); fprintf(logp, "%s: [%s] [%s] %s\n", date_fmt, thr_name, levelstr, fmt_msg->str); g_date_time_unref(dt); diff --git a/src/server/server.c b/src/server/server.c index 0988da0..e615526 100644 --- a/src/server/server.c +++ b/src/server/server.c @@ -20,6 +20,8 @@ * */ +#include + #include #include #include @@ -27,7 +29,11 @@ #include #include #include +#ifdef PLATFORM_OSX +#include +#else #include +#endif #include "server/xmppclient.h" #include "server/stream_parser.h" @@ -255,7 +261,11 @@ server_wait_for(char *id) void* _start_server_cb(void* userdata) { +#ifdef PLATFORM_OSX + pthread_setname_np("stbr"); +#else prctl(PR_SET_NAME, "stbr"); +#endif struct sockaddr_in client_addr; @@ -299,7 +309,12 @@ _start_server_cb(void* userdata) int server_run(stbbr_log_t loglevel, int port, int httpport) { +#ifdef PLATFORM_OSX + pthread_setname_np("main"); +#else prctl(PR_SET_NAME, "main"); +#endif + pthread_mutex_lock(&send_queue_lock); send_queue = NULL; pthread_mutex_unlock(&send_queue_lock); diff --git a/stabber-curl.sh b/stabber-curl.sh new file mode 100755 index 0000000..047f63c --- /dev/null +++ b/stabber-curl.sh @@ -0,0 +1,6 @@ +curl --data '' http://localhost:5231/for?query=jabber:iq:roster + +echo "Press enter to send message..." +read + +curl --data 'Here is a message sent from stabber, using the Python bindings' http://localhost:5231/send