aboutsummaryrefslogtreecommitdiffstats
path: root/src/bin/ethumb_client
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2013-07-09 19:56:18 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2013-07-09 19:56:18 +0900
commitbb4539c82652e88c9908fa75b6214723977ec2e7 (patch)
treefc25d0fd8a7463d224b4c47afbce32100d88a198 /src/bin/ethumb_client
parentup ethumbd timeout to 10sec by default (diff)
downloadefl-bb4539c82652e88c9908fa75b6214723977ec2e7.tar.gz
ethumbd timeout to 30s to not timeout in middle of long generate
Diffstat (limited to 'src/bin/ethumb_client')
-rw-r--r--src/bin/ethumb_client/ethumbd.c19
1 files changed, 16 insertions, 3 deletions
diff --git a/src/bin/ethumb_client/ethumbd.c b/src/bin/ethumb_client/ethumbd.c
index 9bf023b6af..c09c89a7b4 100644
--- a/src/bin/ethumb_client/ethumbd.c
+++ b/src/bin/ethumb_client/ethumbd.c
@@ -393,6 +393,11 @@ _generated_cb(Ethumbd *ed, Eina_Bool success, const char *thumb_path, const char
eina_stringshare_del(ed->processing->thumb_key);
free(ed->processing);
ed->processing = NULL;
+ if (!ed->queue.count)
+ {
+ _ethumbd_timeout_stop(ed);
+ _ethumbd_timeout_start(ed);
+ }
}
static void
@@ -497,6 +502,11 @@ _ethumbd_slave_data_read_cb(void *data, int type EINA_UNUSED, void *event)
}
}
+ if (!ed->queue.count)
+ {
+ _ethumbd_timeout_stop(ed);
+ _ethumbd_timeout_start(ed);
+ }
return 1;
}
@@ -711,8 +721,11 @@ _process_queue_cb(void *data)
if (!queue->nqueue)
{
ed->idler = NULL;
- if (!queue->count)
- _ethumbd_timeout_start(ed);
+ if (!ed->queue.count)
+ {
+ _ethumbd_timeout_stop(ed);
+ _ethumbd_timeout_start(ed);
+ }
ed->idler = NULL;
return 0;
}
@@ -1690,7 +1703,7 @@ main(int argc, char *argv[])
int arg_idx;
Ethumbd ed;
int child;
- double timeout = 10.0;
+ double timeout = 30.0;
memset(&ed, 0, sizeof(ed));
ecore_init();