/*
- * Copyright (c) 1998-2012 by the citadel.org team
+ * Copyright (c) 1998-2015 by the citadel.org team
*
- * This program is open source software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3.
- *
- *
+ * This program is open source software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- *
- *
- *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*/
#include "sysdep.h"
#include "server.h"
#include "citserver.h"
#include "support.h"
-
#include "ctdl_module.h"
-
+#include "config.h"
#include "event_client.h"
#include "serv_curl.h"
int DebugEventLoop = 0;
int DebugEventLoopBacktrace = 0;
int DebugCurl = 0;
+pthread_key_t evConKey;
long EvIDSource = 1;
/*****************************************************************************
#define DBGLOG(LEVEL) if ((LEVEL != LOG_DEBUG) || (DebugCurl != 0))
#define EVCURL_syslog(LEVEL, FORMAT, ...) \
- DBGLOG (LEVEL) syslog(LEVEL, "EVCURL:IO[%ld]CC[%d] " FORMAT, \
- IO->ID, CCID, __VA_ARGS__)
+ DBGLOG (LEVEL) syslog(LEVEL, "EVCURL:%s[%ld]CC[%d] " FORMAT, \
+ IOSTR, IO->ID, CCID, __VA_ARGS__)
#define EVCURLM_syslog(LEVEL, FORMAT) \
- DBGLOG (LEVEL) syslog(LEVEL, "EVCURL:IO[%ld]CC[%d] " FORMAT, \
- IO->ID, CCID)
+ DBGLOG (LEVEL) syslog(LEVEL, "EVCURL:%s[%ld]CC[%d] " FORMAT, \
+ IOSTR, IO->ID, CCID)
#define CURL_syslog(LEVEL, FORMAT, ...) \
DBGLOG (LEVEL) syslog(LEVEL, "CURL: " FORMAT, __VA_ARGS__)
ev_async WakeupCurl;
evcurl_global_data global;
+eNextState QueueAnDBOperation(AsyncIO *IO);
+
static void
gotstatus(int nnrun)
{
if (CURLMSG_DONE == msg->msg) {
CURL *chnd;
- char *chandle = NULL;
+ void *chandle = NULL;
CURLcode sta;
CURLMcode msta;
AsyncIO*IO;
IO);
continue;
}
+ SetEVState(IO, eCurlGotStatus);
EVCURLM_syslog(LOG_DEBUG, "request complete\n");
- IO->Now = ev_now(event_base);
+ IO->CitContext->lastcmd = IO->Now = ev_now(event_base);
ev_io_stop(event_base, &IO->recv_event);
ev_io_stop(event_base, &IO->send_event);
EVCURL_syslog(LOG_ERR,
"error description: %s\n",
IO->HttpReq.errdesc);
+ IO->HttpReq.CurlError = curl_easy_strerror(sta);
EVCURL_syslog(LOG_ERR,
"error performing request: %s\n",
- curl_easy_strerror(sta));
+ IO->HttpReq.CurlError);
+ if (sta == CURLE_OPERATION_TIMEDOUT)
+ {
+ IO->SendBuf.fd = 0;
+ IO->RecvBuf.fd = 0;
+ }
}
sta = curl_easy_getinfo(chnd,
CURLINFO_RESPONSE_CODE,
curl_slist_free_all(IO->HttpReq.headers);
+ IO->HttpReq.headers = NULL;
msta = curl_multi_remove_handle(global.mhnd, chnd);
if (msta)
EVCURL_syslog(LOG_ERR,
"%s\n",
curl_multi_strerror(msta));
- ev_cleanup_stop(event_base, &IO->abort_by_shutdown);
+ ev_cleanup_stop(event_base, &IO->abort_by_shutdown);
IO->HttpReq.attached = 0;
switch(IO->SendDone(IO))
{
case eDBQuery:
- curl_easy_cleanup(IO->HttpReq.chnd);
- IO->HttpReq.chnd = NULL;
+ FreeURL(&IO->ConnectMe);
+ QueueAnDBOperation(IO);
break;
case eSendDNSQuery:
case eReadDNSReply:
case eReadMore:
case eReadPayload:
case eReadFile:
- curl_easy_cleanup(IO->HttpReq.chnd);
- IO->HttpReq.chnd = NULL;
break;
case eTerminateConnection:
case eAbort:
}
static size_t
-gotdata(void *data, size_t size, size_t nmemb, void *cglobal) {
+gotdata(void *data, size_t size, size_t nmemb, void *cglobal)
+{
AsyncIO *IO = (AsyncIO*) cglobal;
+ SetEVState(IO, eCurlGotData);
if (IO->HttpReq.ReplyData == NULL)
{
IO->HttpReq.ReplyData = NewStrBufPlain(NULL, SIZ);
}
- IO->Now = ev_now(event_base);
+ IO->CitContext->lastcmd = IO->Now = ev_now(event_base);
return CurlFillStrBuf_callback(data,
size,
nmemb,
{
evcurl_global_data *global = cglobal;
CURLM *mhnd = global->mhnd;
- char *f;
+ void *f;
AsyncIO *IO = (AsyncIO*) vIO;
CURLcode sta;
const char *Action;
if (IO == NULL) {
sta = curl_easy_getinfo(easy, CURLINFO_PRIVATE, &f);
if (sta) {
- EVCURL_syslog(LOG_ERR,
- "EVCURL: error asking curl for private "
- "cookie of curl handle: %s\n",
- curl_easy_strerror(sta));
+ CURL_syslog(LOG_ERR,
+ "EVCURL: error asking curl for private "
+ "cookie of curl handle: %s\n",
+ curl_easy_strerror(sta));
return -1;
}
IO = (AsyncIO *) f;
+ SetEVState(IO, eCurlNewIO);
EVCURL_syslog(LOG_DEBUG,
"EVCURL: got socket for URL: %s\n",
IO->ConnectMe->PlainUrl);
curl_multi_assign(mhnd, fd, IO);
}
- IO->Now = ev_now(event_base);
+ SetEVState(IO, eCurlGotIO);
+ IO->CitContext->lastcmd = IO->Now = ev_now(event_base);
Action = "";
switch (action)
OPT(WRITEDATA, (void *)IO);
OPT(ERRORBUFFER, IO->HttpReq.errdesc);
- if ((!IsEmptyStr(config.c_ip_addr))
- && (strcmp(config.c_ip_addr, "*"))
- && (strcmp(config.c_ip_addr, "::"))
- && (strcmp(config.c_ip_addr, "0.0.0.0"))
+ if ((!IsEmptyStr(CtdlGetConfigStr("c_ip_addr")))
+ && (strcmp(CtdlGetConfigStr("c_ip_addr"), "*"))
+ && (strcmp(CtdlGetConfigStr("c_ip_addr"), "::"))
+ && (strcmp(CtdlGetConfigStr("c_ip_addr"), "0.0.0.0"))
)
{
- OPT(INTERFACE, config.c_ip_addr);
+ OPT(INTERFACE, CtdlGetConfigStr("c_ip_addr"));
}
#ifdef CURLOPT_HTTP_CONTENT_DECODING
if (IO == NULL)
return;
- IO->Now = ev_now(event_base);
+
+ SetEVState(IO, eCurlShutdown);
+ IO->CitContext->lastcmd = IO->Now = ev_now(event_base);
EVCURL_syslog(LOG_DEBUG, "EVENT Curl: %s\n", __FUNCTION__);
curl_slist_free_all(IO->HttpReq.headers);
+ IO->HttpReq.headers = NULL;
msta = curl_multi_remove_handle(global.mhnd, IO->HttpReq.chnd);
if (msta)
{
assert(IO->ShutdownAbort);
IO->ShutdownAbort(IO);
}
+
eNextState
evcurl_handle_start(AsyncIO *IO)
{
CURLcode sta;
CURL *chnd;
+ SetEVState(IO, eCurlStart);
chnd = IO->HttpReq.chnd;
EVCURL_syslog(LOG_DEBUG,
"EVCURL: Loading URL: %s\n", IO->ConnectMe->PlainUrl);
HashList *QueueEvents = NULL;
HashList *InboundEventQueue = NULL;
HashList *InboundEventQueues[2] = { NULL, NULL };
+extern void ShutDownCLient(AsyncIO *IO);
ev_async AddJob;
ev_async ExitEventLoop;
static void QueueEventAddCallback(EV_P_ ev_async *w, int revents)
{
CitContext *Ctx;
+ long IOID = -1;
+ long count = 0;
ev_tstamp Now;
HashList *q;
void *v;
while (GetNextHashPos(q, It, &len, &Key, &v))
{
IOAddHandler *h = v;
+ count ++;
if (h->IO->ID == 0) {
h->IO->ID = EvIDSource++;
}
+ IOID = h->IO->ID;
if (h->IO->StartIO == 0.0)
h->IO->StartIO = Now;
+ SetEVState(h->IO, eIOAttach);
+
Ctx = h->IO->CitContext;
become_session(Ctx);
- h->IO->Now = Now;
- h->EvAttch(h->IO);
+ h->IO->CitContext->lastcmd = h->IO->Now = Now;
+ switch (h->EvAttch(h->IO))
+ {
+ case eReadMore:
+ case eReadMessage:
+ case eReadFile:
+ case eSendReply:
+ case eSendMore:
+ case eReadPayload:
+ case eSendFile:
+ case eDBQuery:
+ case eSendDNSQuery:
+ case eReadDNSReply:
+ case eConnect:
+ break;
+ case eTerminateConnection:
+ case eAbort:
+ ShutDownCLient(h->IO);
+ break;
+ }
}
DeleteHashPos(&It);
DeleteHashContent(&q);
- EVQM_syslog(LOG_DEBUG, "EVENT Q Add done.\n");
+ EVQ_syslog(LOG_DEBUG, "%s CC[%ld] EVENT Q Add %ld done.", IOSTR, IOID, count);
}
extern void CtdlDestroyEVCleanupHooks(void);
extern int EVQShutDown;
+const char *IOLog = "IO";
/*
* this thread operates the select() etc. via libev.
*/
struct CitContext libev_client_CC;
CtdlFillSystemContext(&libev_client_CC, "LibEv Thread");
-// citthread_setspecific(MyConKey, (void *)&smtp_queue_CC);
+
+ pthread_setspecific(evConKey, IOLog);
+
EVQM_syslog(LOG_DEBUG, "client_event_thread() initializing\n");
event_base = ev_default_loop (EVFLAG_AUTO);
static void DBQueueEventAddCallback(EV_P_ ev_async *w, int revents)
{
CitContext *Ctx;
+ long IOID = -1;
+ long count = 0;;
ev_tstamp Now;
HashList *q;
void *v;
{
IOAddHandler *h = v;
eNextState rc;
+ count ++;
if (h->IO->ID == 0)
h->IO->ID = EvIDSource++;
+ IOID = h->IO->ID;
if (h->IO->StartDB == 0.0)
h->IO->StartDB = Now;
- h->IO->Now = Now;
+ h->IO->CitContext->lastcmd = h->IO->Now = Now;
+ SetEVState(h->IO, eDBAttach);
Ctx = h->IO->CitContext;
become_session(Ctx);
ev_cleanup_start(event_db, &h->IO->db_abort_by_shutdown);
}
DeleteHashPos(&It);
DeleteHashContent(&q);
- EVQM_syslog(LOG_DEBUG, "DBEVENT Q Add done.\n");
+ EVQ_syslog(LOG_DEBUG, "%s CC[%ld] DBEVENT Q Add %ld done.", IOSTR, IOID, count);
}
DBInboundEventQueue = DBInboundEventQueues[0];
}
+const char *DBLog = "BD";
+
/*
* this thread operates writing to the message database via libev.
*/
ev_loop *tmp;
struct CitContext libev_msg_CC;
+ pthread_setspecific(evConKey, DBLog);
+
CtdlFillSystemContext(&libev_msg_CC, "LibEv DB IO Thread");
EVQM_syslog(LOG_DEBUG, "dbevent_thread() initializing\n");
DebugCurl = n;
}
+const char *WLog = "WX";
CTDL_MODULE_INIT(event_client)
{
if (!threading)
{
+ if (pthread_key_create(&evConKey, NULL) != 0) {
+ syslog(LOG_CRIT, "Can't create TSD key: %s", strerror(errno));
+ }
+ pthread_setspecific(evConKey, WLog);
+
CtdlRegisterDebugFlagHook(HKEY("eventloop"), DebugEventloopEnable, &DebugEventLoop);
CtdlRegisterDebugFlagHook(HKEY("eventloopbacktrace"), DebugEventloopBacktraceEnable, &DebugEventLoopBacktrace);
CtdlRegisterDebugFlagHook(HKEY("curl"), DebugCurlEnable, &DebugCurl);
projects / citadel.git / blobdiff