mirrors/mastodont-c
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Make thread safe

Browse source 
FossilOrigin-Name: f5ec8fae755f1e809ae4ff8446961b62f7ae4751a510ade2c9e211710b0f7f97
This commit is contained in:
nekobit 2022-07-20 04:45:59 +00:00
parent 7373faab3f
commit 78355004ce
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/fetch.c
View file

@ -15,6 +15,7 @@
#include <stdlib.h>
#include <string.h>
#include <pthread.h>
#include "mastodont_fetch.h"
/* For use with libcurl */
@ -91,30 +92,43 @@ int mastodont_fetch_curl(mastodont_t* mstdnt,
curl_easy_setopt(curl, request_t, 1);
// Add curl handle to multi, then run and block
static pthread_mutex_t multi_mutex = PTHREAD_MUTEX_INITIALIZER;
pthread_mutex_lock(&multi_mutex);
curl_multi_add_handle(mstdnt->curl, curl);
pthread_mutex_unlock(&multi_mutex);
int msgs_left;
while (running)
{
pthread_mutex_lock(&multi_mutex);
res = curl_multi_perform(mstdnt->curl, &running);
pthread_mutex_unlock(&multi_mutex);
if (running)
res = curl_multi_poll(mstdnt->curl, NULL, 0, 1000, NULL);
// Check if our socket is done
pthread_mutex_lock(&multi_mutex);
while ((msg = curl_multi_info_read(mstdnt->curl, &msgs_left)))
{
if (msg->msg == CURLMSG_DONE && msg->easy_handle == curl)
{
status = msg->data.result;
pthread_mutex_unlock(&multi_mutex);
goto out;
}
}
pthread_mutex_unlock(&multi_mutex);
if (res) break;
}
out:
pthread_mutex_lock(&multi_mutex);
// Looks like we're done here
curl_multi_remove_handle(mstdnt->curl, curl);
pthread_mutex_unlock(&multi_mutex);
if (list) curl_slist_free_all(list);
return status;

1
src/request.c
View file

@ -157,4 +157,3 @@ cleanup:
if (args->params_query) free(url_query);
return res;
}