rdelaage
/
httpdirfs
mirror of https://github.com/fangfufu/httpdirfs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

started to re-add curl multi interface support

This commit is contained in:
Fufu Fang 2018-07-23 20:55:20 +01:00
parent 00f503c345
commit 1cd04a2a53
6 changed files with 27 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.kateproject
View File

@ -2,8 +2,6 @@
"name": "mount-http-dir",
"files": [ { "git": 1 } ],
"build" : {
"directory": "build",
"build": "make",
"install": "make install"
}
}

2
Makefile
View File

@ -1,7 +1,7 @@
CC=gcc
CFLAGS= -O2 -Wall -Wextra -lgumbo -lcurl -lfuse -D_FILE_OFFSET_BITS=64 \
-DHTTPDIRFS_INFO
OBJ = main.o network.o network_multi.o
OBJ = main.o network.o
%.o: %.c
$(CC) -c -o $@ $< $(CFLAGS)

49
network.c
View File

@ -10,22 +10,21 @@
#define HTTP_OK 200
#define HTTP_PARTIAL_CONTENT 206
/* ------------------------ External variables ----------------------------*/
LinkTable *ROOT_LINK_TBL;
CURLM *curl_multi;
CURLMsg *curl_msg;
/* ------------------------ Static variable ------------------------------ */
/** \brief curl shared interface - not actually being used. */
static CURLSH *curl_share;
/** \brief pthread mutex for thread safety */
static pthread_mutex_t pthread_curl_lock;
/** \brief curl multi interface handle */
static CURLM *curl_multi;
/* Forward declarations */
/* -----------Forward declarations for static functions --------------------*/
static void HTML_to_LinkTable(GumboNode *node, LinkTable *linktbl);
static LinkType p_url_type(const char *p_url);
static void Link_free(Link *link);
static Link *Link_new(const char *p_url, LinkType type);
static CURL *Link_to_curl(Link *link);
static void LinkTable_free(LinkTable *linktbl);
@ -35,7 +34,9 @@ static Link *path_to_Link_recursive(char *path, LinkTable *linktbl);
static char *url_append(const char *url, const char *sublink);
static size_t WriteMemoryCallback(void *contents, size_t size, size_t nmemb,
void *userp);
static void do_transfer(CURL *curl);
static void blocking_single_transfer(CURL *curl);
static void transfer_wrapper(CURL *curl);
static int is_downloading(Link *link);
/**
* \brief convert a HTML page to a LinkTable
@ -45,6 +46,15 @@ static void do_transfer(CURL *curl);
static void HTML_to_LinkTable(GumboNode *node, LinkTable *linktbl);
/* -------------------------- Functions ---------------------------------- */
static int is_downloading(Link *link)
{
return link->downloading;
}
static void transfer_wrapper(CURL *curl)
{
blocking_single_transfer(curl);
}
static void pthread_lock_cb(CURL *handle, curl_lock_data data,
curl_lock_access access, void *userptr)
@ -134,21 +144,20 @@ static char *url_append(const char *url, const char *sublink)
}
/* This is the single thread version */
static void do_transfer(CURL *curl)
static void blocking_single_transfer(CURL *curl)
{
#ifdef HTTPDIRFS_DEBUG
#pragma GCC diagnostic ignored "-Wformat"
fprintf(stderr, "do_transfer(): handle %x\n", curl);
fprintf(stderr, "blocking_single_transfer(): handle %p\n", curl);
fflush(stderr);
#endif
CURLcode res = curl_easy_perform(curl);
if (res) {
fprintf(stderr, "do_transfer() failed: %u, %s\n", res,
fprintf(stderr, "blocking_single_transfer() failed: %u, %s\n", res,
curl_easy_strerror(res));
fflush(stderr);
}
#ifdef HTTPDIRFS_DEBUG
fprintf(stderr, "do_transfer(): DONE\n");
fprintf(stderr, "blocking_single_transfer(): DONE\n");
fflush(stderr);
#endif
}
@ -189,12 +198,6 @@ static Link *Link_new(const char *p_url, LinkType type)
return link;
}
static void Link_free(Link *link)
{
free(link);
link = NULL;
}
long Link_download(const char *path, char *output_buf, size_t size,
off_t offset)
{
@ -216,7 +219,7 @@ long Link_download(const char *path, char *output_buf, size_t size,
curl_easy_setopt(curl, CURLOPT_WRITEDATA, (void *)&buf);
curl_easy_setopt(curl, CURLOPT_RANGE, range_str);
do_transfer(curl);
transfer_wrapper(curl);
long http_resp;
curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &http_resp);
@ -258,7 +261,7 @@ LinkTable *LinkTable_new(const char *url)
buf.memory = NULL;
curl_easy_setopt(curl, CURLOPT_WRITEDATA, (void *)&buf);
do_transfer(curl);
transfer_wrapper(curl);
/* if downloading base URL failed */
long http_resp;
@ -290,11 +293,10 @@ URL: %s, HTTP %ld\n", url, http_resp);
static void LinkTable_free(LinkTable *linktbl)
{
for (int i = 0; i < linktbl->num; i++) {
Link_free(linktbl->links[i]);
free(linktbl->links[i]);
}
free(linktbl->links);
free(linktbl);
linktbl = NULL;
}
static void LinkTable_add(LinkTable *linktbl, Link *link)
@ -313,7 +315,7 @@ size_t Link_get_size(Link *this_link)
if (this_link->type == LINK_FILE) {
CURL *curl = Link_to_curl(this_link);
curl_easy_setopt(curl, CURLOPT_NOBODY, 1);
do_transfer(curl);
transfer_wrapper(curl);
long http_resp;
curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &http_resp);
if (http_resp == HTTP_OK) {
@ -355,9 +357,8 @@ void LinkTable_fill(LinkTable *linktbl)
#ifdef HTTPDIRFS_INFO
void LinkTable_print(LinkTable *linktbl)
{
#pragma GCC diagnostic ignored "-Wformat"
fprintf(stderr, "--------------------------------------------\n");
fprintf(stderr, " LinkTable %x\n", linktbl);
fprintf(stderr, " LinkTable %p\n", linktbl);
fprintf(stderr, "--------------------------------------------\n");
for (int i = 0; i < linktbl->num; i++) {
Link *this_link = linktbl->links[i];

7
network.h
View File

@ -34,6 +34,7 @@ struct Link {
LinkType type;
size_t content_length;
LinkTable *next_table;
int downloading;
};
struct LinkTable {
@ -44,12 +45,6 @@ struct LinkTable {
/** \brief root link table */
extern LinkTable *ROOT_LINK_TBL;
/** \brief curl multi interface handle */
extern CURLM *curl_multi;
/** \brief curl message struct */
extern CURLMsg *curl_msg;
/** \brief Initialise the network module */
void network_init(const char *url);

1
network_multi.c
View File

@ -1 +0,0 @@
#include "network_multi.h"

6
network_multi.h
View File

@ -1,6 +0,0 @@
#ifdef NETWORK_MULTI_H
#define NETWORK_MULTI_H
#include "network.h"
#endif