summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/htsback.c77
-rw-r--r--src/htslib.c28
-rw-r--r--src/htslib.h2
-rw-r--r--src/htsopt.h1
4 files changed, 48 insertions, 60 deletions
diff --git a/src/htsback.c b/src/htsback.c
index dfb522f..117b981 100644
--- a/src/htsback.c
+++ b/src/htsback.c
@@ -2142,20 +2142,17 @@ int back_add(struct_back * sback, httrackp * opt, cache_back * cache, char *adr,
#if USE_BEGINTHREAD
// lancement multithread du robot
typedef struct {
- char iadr_p[HTS_URLMAXSIZE];
httrackp *opt;
+ char iadr_p[HTS_URLMAXSIZE];
} HostlookupStruct;
void Hostlookup(void *pP) {
- HostlookupStruct *str = (HostlookupStruct *) pP;
+ HostlookupStruct *const str = (HostlookupStruct *) pP;
httrackp *const opt = str->opt;
char iadr[256];
t_hostent *hp;
t_fullhostent fullhostent_buffer;
// recopier (après id:pass)
-#if DEBUGDNS
- printf("resolv in background: %s\n", jump_identification(iadr_p));
-#endif
strcpybuff(iadr, jump_identification(str->iadr_p));
// couper éventuel :
{
@@ -2168,50 +2165,36 @@ void Hostlookup(void *pP) {
// resolve
hp = vxgethostbyname(iadr, &fullhostent_buffer);
+ hts_mutexlock(&opt->state.lock);
+
// found
if (hp != NULL) {
t_dnscache *cache;
- int error_found = 0;
- hts_mutexlock(&opt->state.lock);
+ hts_log_print(opt, LOG_DEBUG, "successfully resolved: %s", iadr);
- for(cache = _hts_cache(opt); cache->n != NULL; cache = cache->n) {
+ for(cache = _hts_cache(opt); cache != NULL; cache = cache->n) {
if (strcmp(cache->iadr, iadr) == 0) {
- error_found = 1;
+ break;
}
}
- if (strcmp(cache->iadr, iadr) == 0) {
- error_found = 1;
- }
- if (!error_found) {
- // en gros copie de hts_gethostbyname sans le return
- cache->n = (t_dnscache *) calloct(1, sizeof(t_dnscache));
- if (cache->n != NULL) {
- strcpybuff(cache->n->iadr, iadr);
- cache->n->host_length = 0; /* pour le moment rien */
- cache->n->n = NULL;
-
- cache->n->host_length = -1;
- memset(cache->n->host_addr, 0, sizeof(cache->n->host_addr));
- memcpy(cache->n->host_addr, hp->h_addr, hp->h_length);
- cache->n->host_length = hp->h_length;
- }
+ if (cache != NULL && cache->host_length == 0) {
+ memset(cache->host_addr, 0, sizeof(cache->host_addr));
+ memcpy(cache->host_addr, hp->h_addr, hp->h_length);
+ cache->host_length = hp->h_length;
+ hts_log_print(opt, LOG_DEBUG, "saved resolved host: %s", iadr);
} else {
-#if DEBUGDNS
- printf("aborting resolv for %s (found)\n", iadr);
-#endif
+ hts_log_print(opt, LOG_DEBUG, "could not save resolved host: %s", iadr);
}
-
- hts_mutexrelease(&opt->state.lock);
}
- freet(pP);
+ assertf(opt->state.dns_cache_nthreads > 0);
+ opt->state.dns_cache_nthreads--;
-#if DEBUGDNS
- printf("quitting resolv for %s (result: %d)\n", iadr,
- (cache->n != NULL) ? cache->n->host_length : (-999));
-#endif
+ hts_mutexrelease(&opt->state.lock);
+
+ freet(pP);
}
#endif
@@ -2236,31 +2219,17 @@ void back_solve(httrackp * opt, lien_back * back) {
a = back->r.req.proxy.name;
assertf(a != NULL);
a = jump_protocol(a);
- if (!hts_dnstest(opt, a)) { // non encore testé!..
- // inscire en thread
-#ifdef _WIN32
- // Windows
-#if USE_BEGINTHREAD
+ if (hts_dnstest(opt, a, 1) == 2) { // non encore testé!..
+ hts_log_print(opt, LOG_DEBUG, "resolving in background: %s", a);
{
HostlookupStruct *str =
(HostlookupStruct *) malloct(sizeof(HostlookupStruct));
- if (str) {
+ if (str != NULL) {
strcpybuff(str->iadr_p, a);
str->opt = opt;
hts_newthread(Hostlookup, str);
}
}
-#endif
-#else
-#if USE_BEGINTHREAD
- char *p = calloct(strlen(a) + 2, 1);
-
- if (p) {
- strcpybuff(p, a);
- hts_newthread(Hostlookup, p);
- }
-#endif
-#endif
}
}
}
@@ -2275,9 +2244,9 @@ int host_wait(httrackp * opt, lien_back * back) {
) {
//## if (back->url_adr[0]!=lOCAL_CHAR) {
if (!(back->r.req.proxy.active)) {
- return (hts_dnstest(opt, back->url_adr));
+ return (hts_dnstest(opt, back->url_adr, 0));
} else {
- return (hts_dnstest(opt, back->r.req.proxy.name));
+ return (hts_dnstest(opt, back->r.req.proxy.name, 0));
}
} else
return 1; // prêt, fichier local
diff --git a/src/htslib.c b/src/htslib.c
index 2c61ec2..c1ce400 100644
--- a/src/htslib.c
+++ b/src/htslib.c
@@ -4641,12 +4641,12 @@ static t_hostent *hts_ghbn(t_dnscache * cache, const char *iadr, t_hostent * ret
}
// tester si iadr a déja été testé (ou en cours de test)
-// 0 non encore
+// 0 non encore (en cours)
// 1 ok
// 2 non présent
-int hts_dnstest(httrackp * opt, const char *_iadr) {
+int hts_dnstest(httrackp * opt, const char *_iadr, int add) {
int ret = 2;
- t_dnscache *cache;
+ t_dnscache *cache, *tail;
char iadr[HTS_URLMAXSIZE * 2];
// sauter user:pass@ éventuel
@@ -4667,12 +4667,30 @@ int hts_dnstest(httrackp * opt, const char *_iadr) {
return 1;
hts_mutexlock(&opt->state.lock);
- for(cache = _hts_cache(opt); cache != NULL; cache = cache->n) {
+ for(cache = tail = _hts_cache(opt); cache != NULL; cache = cache->n) {
+ tail = cache;
if (strcmp(cache->iadr, iadr) == 0) { // ok trouvé
- ret = 1;
+ ret = cache->host_length != 0 ? 1 : 0;
break;
}
}
+ // Add empty entry ?
+ if (ret == 2 && add) {
+ assertf(tail != NULL);
+ assertf(tail->n == NULL);
+ if (opt->state.dns_cache_nthreads < 16) {
+ opt->state.dns_cache_nthreads++;
+ tail->n = (t_dnscache *) calloct(1, sizeof(t_dnscache));
+ if (tail->n != NULL) {
+ strcpybuff(tail->n->iadr, iadr);
+ tail->n->host_length = 0; /* pour le moment rien */
+ tail->n->n = NULL;
+ }
+ } else {
+ hts_log_print(opt, LOG_DEBUG, "too many threads, not adding another dns resolution in background");
+ ret = 0;
+ }
+ }
hts_mutexrelease(&opt->state.lock);
return ret;
}
diff --git a/src/htslib.h b/src/htslib.h
index 6760fb7..18d8d79 100644
--- a/src/htslib.h
+++ b/src/htslib.h
@@ -301,7 +301,7 @@ int ftp_available(void);
#if HTS_DNSCACHE
void hts_cache_free(t_dnscache * cache);
-int hts_dnstest(httrackp * opt, const char *_iadr);
+int hts_dnstest(httrackp * opt, const char *_iadr, int add);
t_dnscache *_hts_cache(httrackp * opt);
#endif
diff --git a/src/htsopt.h b/src/htsopt.h
index 76dc793..ae0c32d 100644
--- a/src/htsopt.h
+++ b/src/htsopt.h
@@ -232,6 +232,7 @@ struct htsoptstate {
int verif_backblue_done;
int verif_external_status;
t_dnscache *dns_cache;
+ int dns_cache_nthreads;
/* HTML parsing state */
char _hts_errmsg[HTS_CDLMAXSIZE + 256];
int _hts_in_html_parsing;
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-27 10:21:18 +0000