wip

- Mostly work in the client

Signed-off-by: Andrew Opalach <andrew@akon.city>

1 files changed, 16 insertions, 10 deletions

diff --git a/src/cache/handlers/http.c b/src/cache/handlers/http.c
index dd3c8ac..97abf79 100644
--- a/src/cache/handlers/http.c
+++ b/src/cache/handlers/http.c
@@ -14,6 +14,19 @@ static bool handler_http_can_seek(struct cch_handler *handler)
     return false;
 }
 
+static void disable_waiters_internal(struct cch_handler_http *http)
+{
+    aki_mutex_lock(&http->mutex);
+    struct cch_handler_wait *wait;
+    al_array_foreach(http->handler.waits, i, wait) {
+        aki_mutex_lock(&wait->mutex);
+        wait->disabled = true;
+        aki_cond_signal(&wait->cond);
+        aki_mutex_unlock(&wait->mutex);
+    }
+    aki_mutex_unlock(&http->mutex);
+}
+
 static size_t http_callback(void *userdata, u8 op, u8 *buf, s64 int0)
 {
     struct cch_handler_http *http = (struct cch_handler_http *)userdata;
@@ -24,8 +37,9 @@ static size_t http_callback(void *userdata, u8 op, u8 *buf, s64 int0)
         break;
     }
     case AKI_HTTP_ERROR: {
+        disable_waiters_internal(http); // TODO: Untested.
         al_log_debug("cache_handler_http", "Error.");
-        break; // Unhandled.
+        break;
     }
     case AKI_HTTP_RESPONSE_CODE: {
         al_log_debug("cache_handler_http", "HTTP %ld.", int0);
@@ -141,15 +155,7 @@ static bool handler_http_wait_for_range(struct cch_handler *handler, struct cch_
 static void handler_http_free(struct cch_handler **handler)
 {
     struct cch_handler_http *http = (struct cch_handler_http *)*handler;
-    aki_mutex_lock(&http->mutex);
-    struct cch_handler_wait *wait;
-    al_array_foreach(http->handler.waits, i, wait) {
-        aki_mutex_lock(&wait->mutex);
-        wait->disabled = true;
-        aki_cond_signal(&wait->cond);
-        aki_mutex_unlock(&wait->mutex);
-    }
-    aki_mutex_unlock(&http->mutex);
+    disable_waiters_internal(http);
     camu_queue_push(http->queue, -1);
     aki_signal_send(&http->signal);
     aki_thread_join(&http->thread);