X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-sys%2Fevtloop.c;h=1c94706c6d5a755721e40cdc5e627dd8c026c57e;hp=a28c9b872844b6fddb6b4a9bdc405b0763bad2c9;hb=4d71119a25f96043c5d27cf46a732b216172708f;hpb=20e55d4252ca2db1fc2b1099acf8393c22903575

diff --git a/lib-sys/evtloop.c b/lib-sys/evtloop.c
index a28c9b8..1c94706 100644
--- a/lib-sys/evtloop.c
+++ b/lib-sys/evtloop.c
@@ -13,10 +13,12 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  *  MA 02110-1301, USA.
- *
- *  Copyright © 2006 Pierre Habouzit
+ */
+/*
+ *  Copyright © 2007 Pierre Habouzit
  */
 
+#include <netdb.h>
 #include <pthread.h>
 #include <sys/epoll.h>
 #include <sys/socket.h>
@@ -31,11 +33,17 @@
 #include "evtloop.h"
 #include "mutt.h"
 #include "mutt_ssl.li"
+#ifdef HAVE_LIBIDN
+#include <idna.h>
+#endif
 
 DO_ARRAY_TYPE(job_t, job);
 
 static int epollfd = -1;
 static job_array jobs;
+static pthread_mutex_t el_mx;
+static pthread_cond_t el_cond;
+static pthread_t el_thread;
 
 static int el_job_setemode(job_t *w, el_mode emode)
 {
@@ -110,6 +118,10 @@ job_t *el_job_start(const machine_t *m, void *cfg)
 
 int el_job_release(job_t *w, el_status reason)
 {
+    if (w->cond) {
+        pthread_cond_signal(&el_cond);
+        w->cond = false;
+    }
     w->state = EL_LLP_FINI;
     if (w->m && w->m->finalize) {
         w->m->finalize(w, reason);
@@ -220,6 +232,8 @@ int el_job_connect(job_t *w, struct sockaddr *addr, socklen_t len,
         goto error;
     if (fcntl(sock, F_SETFL, res | O_NONBLOCK) < 0)
         goto error;
+    if (fcntl(sock, F_SETFD, FD_CLOEXEC) < 0)
+        goto error;
     if (connect(sock, addr, len) < 0)
         goto error;
 
@@ -235,6 +249,47 @@ int el_job_connect(job_t *w, struct sockaddr *addr, socklen_t len,
     return el_job_release(w, EL_ERROR);
 }
 
+int el_job_connect2(job_t *w, const ACCOUNT *act)
+{
+    int rc;
+    char *host = NULL;
+    struct addrinfo *res;
+    struct addrinfo hints = {
+        .ai_family = AF_UNSPEC,
+        .ai_socktype = SOCK_STREAM,
+    };
+
+# ifdef HAVE_LIBIDN
+    if (idna_to_ascii_lz(act->host, &host, 1) != IDNA_SUCCESS) {
+        mutt_error(_("Bad IDN \"%s\"."), act->host);
+        return -1;
+    }
+# else
+    host = act->host;
+# endif
+    mutt_message(_("Looking up %s..."), act->host);
+    rc = getaddrinfo(host, NULL, &hints, &res);
+# ifdef HAVE_LIBIDN
+    p_delete(&host);
+# endif
+
+    if (rc) {
+        mutt_error(_("Could not find the host \"%s\""), act->host);
+        mutt_sleep(2);
+        return -1;
+    }
+    mutt_message(_("Connecting to %s..."), act->host);
+    rc = el_job_connect(w, res->ai_addr, res->ai_addrlen, res->ai_socktype,
+                        res->ai_protocol, act->has_ssl);
+    freeaddrinfo (res);
+    if (rc) {
+        mutt_error(_("Could not connect to %s (%m)."), act->host);
+        mutt_sleep(2);
+        return -1;
+    }
+    return 0;
+}
+
 int el_job_starttls(job_t *w)
 {
     if (tls_negotiate(w) < 0)
@@ -293,6 +348,16 @@ ssize_t el_job_write(job_t *w, buffer_t *buf)
     return nr;
 }
 
+void el_lock(void)
+{
+    pthread_mutex_lock(&el_mx);
+}
+
+void el_unlock(void)
+{
+    pthread_mutex_unlock(&el_mx);
+}
+
 int el_dispatch(int timeout)
 {
     struct epoll_event events[FD_SETSIZE];
@@ -305,11 +370,16 @@ int el_dispatch(int timeout)
         mutt_exit(EXIT_FAILURE);
     }
 
+    el_lock();
     while (--count >= 0) {
         job_t *w  = events[count].data.ptr;
         int event = events[count].events;
         int evt   = 0;
 
+        if (w->cond) {
+            pthread_cond_signal(&el_cond);
+            w->cond = false;
+        }
         gettimeofday(&w->mru, NULL);
         switch (w->state) {
           case EL_LLP_INIT:
@@ -335,11 +405,18 @@ int el_dispatch(int timeout)
             break;
         }
     }
+    el_unlock();
 
     return 0;
 }
 
-void *el_loop(void *data)
+void el_wait(volatile job_t *w)
+{
+    w->cond = true;
+    pthread_cond_wait(&el_cond, &el_mx);
+}
+
+static void *el_loop(void *data)
 {
     time_t sec = time(NULL);
 
@@ -354,16 +431,31 @@ void *el_loop(void *data)
             continue;
         sec = now.tv_sec;
         now.tv_sec -= 10;
+
+        el_lock();
         for (int i = jobs.len - 1; i >= 0; --i) {
             job_t *w = jobs.arr[i];
-            if (timercmp(&now, &w->mru, >))
+            if (timercmp(&now, &w->mru, >)) {
+                if (w->cond) {
+                    pthread_cond_signal(&el_cond);
+                    w->cond = false;
+                }
                 IGNORE(w->m->on_event(w, EL_EVT_WAKEUP));
+            }
         }
+        el_unlock();
     }
 }
 
 void el_initialize(void)
 {
+    pthread_mutexattr_t attr;
+
+    pthread_mutexattr_init(&attr);
+    pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE_NP);
+    pthread_mutex_init(&el_mx, &attr);
+    pthread_mutexattr_destroy(&attr);
+
     gnutls_global_init();
     epollfd = epoll_create(1024);
     if (epollfd < 0) {
@@ -371,11 +463,15 @@ void el_initialize(void)
         mutt_exit(EXIT_FAILURE);
     }
     job_array_init(&jobs);
+    pthread_create(&el_thread, NULL, &el_loop, NULL);
 }
 
 void el_shutdown(void)
 {
+    pthread_cancel(el_thread);
+    pthread_join(el_thread, NULL);
     job_array_wipe(&jobs);
     close(epollfd);
     gnutls_global_deinit();
+    pthread_mutex_destroy(&el_mx);
 }