From 94ceead22da63d4216edbcce3a2b23f8f06132f0 Mon Sep 17 00:00:00 2001
From: UnknownShadow200 <unknownshadow200@gmail.com>
Date: Thu, 17 Jun 2021 19:50:26 +1000
Subject: [PATCH] even more tidy up

---
 src/Http_Web.c    |  1 +
 src/Http_Worker.c | 52 ++++++++++++++++++++++++++---------------------
 src/_HttpBase.h   | 14 -------------
 3 files changed, 30 insertions(+), 37 deletions(-)

diff --git a/src/Http_Web.c b/src/Http_Web.c
index 7d7280842..395ae07ee 100644
--- a/src/Http_Web.c
+++ b/src/Http_Web.c
@@ -5,6 +5,7 @@
 #include "Errors.h"
 extern void interop_DownloadAsync(const char* url, int method, int reqID);
 extern int interop_IsHttpsOnly(void);
+static struct RequestList pendingReqs;
 
 
 /*########################################################################################################################*
diff --git a/src/Http_Worker.c b/src/Http_Worker.c
index 724f760d1..c25608614 100644
--- a/src/Http_Worker.c
+++ b/src/Http_Worker.c
@@ -3,6 +3,13 @@
 #include "_HttpBase.h"
 static void* workerWaitable;
 static void* workerThread;
+static void* pendingMutex;
+static volatile cc_bool http_terminate;
+static struct RequestList pendingReqs;
+
+static void* curRequestMutex;
+static struct HttpRequest http_curRequest;
+static volatile int http_curProgress = HTTP_PROGRESS_NOT_WORKING_ON;
 
 /* Allocates initial data buffer to store response contents */
 static void Http_BufferInit(struct HttpRequest* req) {
@@ -114,7 +121,7 @@ static void Http_SetRequestHeaders(struct HttpRequest* req) {
 	Http_AddHeader(req, "Cookie", &cookies);
 }
 
-static void Http_WorkerSignal(void);
+static void Http_SignalWorker(void) { Waitable_Signal(workerWaitable); }
 
 /* Adds a req to the list of pending requests, waking up worker thread if needed */
 static void Http_BackendAdd(struct HttpRequest* req, cc_bool priority) {
@@ -127,7 +134,7 @@ static void Http_BackendAdd(struct HttpRequest* req, cc_bool priority) {
 		}
 	}
 	Mutex_Unlock(pendingMutex);
-	Http_WorkerSignal();
+	Http_SignalWorker();
 }
 
 
@@ -170,7 +177,7 @@ void Http_ClearPending(void) {
 		RequestList_Free(&pendingReqs);
 	}
 	Mutex_Unlock(pendingMutex);
-	Http_WorkerSignal();
+	Http_SignalWorker();
 }
 
 void Http_TryCancel(int reqID) {
@@ -720,6 +727,15 @@ static cc_result Http_BackendDo(struct HttpRequest* req, cc_string* url) {
 static void Http_BackendFree(void) { }
 #endif
 
+static void ClearCurrentRequest(void) {
+	Mutex_Lock(curRequestMutex);
+	{
+		http_curRequest.id = 0;
+		http_curProgress   = HTTP_PROGRESS_NOT_WORKING_ON;
+	}
+	Mutex_Unlock(curRequestMutex);
+}
+
 static void WorkerLoop(void) {
 	char urlBuffer[URL_MAX_SIZE]; cc_string url;
 	struct HttpRequest request;
@@ -759,26 +775,12 @@ static void WorkerLoop(void) {
 		elapsed = Stopwatch_ElapsedMS(beg, end);
 		Platform_Log4("HTTP: result %i (http %i) in %i ms (%i bytes)",
 					&request.result, &request.statusCode, &elapsed, &request.size);
+
 		Http_FinishRequest(&request);
+		ClearCurrentRequest();
 	}
 }
 
-static void Http_WorkerInit(void) {
-	Http_BackendInit();
-	workerWaitable = Waitable_Create();
-}
-
-static void Http_WorkerStart(void) {
-	workerThread = Thread_Start(WorkerLoop);
-}
-static void Http_WorkerSignal(void) { Waitable_Signal(workerWaitable); }
-
-static void Http_WorkerStop(void) { 
-	Thread_Join(workerThread);
-	Waitable_Free(workerWaitable);
-	Http_BackendFree();
-}
-
 
 /*########################################################################################################################*
 *-----------------------------------------------------Http component------------------------------------------------------*
@@ -786,22 +788,26 @@ static void Http_WorkerStop(void) {
 static void OnInit(void) {
 	http_terminate = false;
 	httpOnly = Options_GetBool(OPT_HTTP_ONLY, false);
-
-	Http_WorkerInit();
+	Http_BackendInit();
 	ScheduledTask_Add(30, Http_CleanCacheTask);
+	
+	workerWaitable = Waitable_Create();
 	RequestList_Init(&pendingReqs);
 	RequestList_Init(&processedReqs);
 
 	pendingMutex    = Mutex_Create();
 	processedMutex  = Mutex_Create();
 	curRequestMutex = Mutex_Create();
-	Http_WorkerStart();
+	workerThread    = Thread_Start(WorkerLoop);
 }
 
 static void OnFree(void) {
 	http_terminate = true;
 	Http_ClearPending();
-	Http_WorkerStop();
+
+	Thread_Join(workerThread);
+	Waitable_Free(workerWaitable);
+	Http_BackendFree();
 
 	RequestList_Free(&pendingReqs);
 	RequestList_Free(&processedReqs);
diff --git a/src/_HttpBase.h b/src/_HttpBase.h
index 05c5a54fd..d1f385e8e 100644
--- a/src/_HttpBase.h
+++ b/src/_HttpBase.h
@@ -97,15 +97,8 @@ static void RequestList_Free(struct RequestList* list) {
 /*########################################################################################################################*
 *--------------------------------------------------Common downloader code-------------------------------------------------*
 *#########################################################################################################################*/
-static void* pendingMutex;
 static void* processedMutex;
-static void* curRequestMutex;
-static volatile cc_bool http_terminate;
-
-static struct RequestList pendingReqs;
 static struct RequestList processedReqs;
-static struct HttpRequest http_curRequest;
-static volatile int http_curProgress = HTTP_PROGRESS_NOT_WORKING_ON;
 static int nextReqID;
 static void Http_BackendAdd(struct HttpRequest* req, cc_bool priority);
 
@@ -184,13 +177,6 @@ static void Http_FinishRequest(struct HttpRequest* req) {
 		RequestList_Append(&processedReqs, req);
 	}
 	Mutex_Unlock(processedMutex);
-
-	Mutex_Lock(curRequestMutex);
-	{
-		http_curRequest.id = 0;
-		http_curProgress   = HTTP_PROGRESS_NOT_WORKING_ON;
-	}
-	Mutex_Unlock(curRequestMutex);
 }
 
 /* Deletes cached responses that are over 10 seconds old */