Browse Source

Set the lp_sent bool earlier to minimise the number of extra longpolls sent out.

nfactor-troky
Con Kolivas 13 years ago
parent
commit
fe4b5e1fc6
  1. 1
      cgminer.c
  2. 4
      util.c

1
cgminer.c

@ -1593,6 +1593,7 @@ static bool get_upstream_work(struct work *work, bool lagging)
/* If this is the current pool and supports longpoll but has not sent /* If this is the current pool and supports longpoll but has not sent
* a longpoll, send one now */ * a longpoll, send one now */
if (unlikely(pool == current_pool() && !pool->is_lp && pool->hdr_path && !pool->lp_sent)) { if (unlikely(pool == current_pool() && !pool->is_lp && pool->hdr_path && !pool->lp_sent)) {
pool->lp_sent = true;
req_longpoll = true; req_longpoll = true;
url = pool->lp_url; url = pool->lp_url;
} }

4
util.c

@ -301,12 +301,10 @@ json_t *json_rpc_call(CURL *curl, const char *url,
curl_easy_setopt(curl, CURLOPT_USERPWD, userpass); curl_easy_setopt(curl, CURLOPT_USERPWD, userpass);
curl_easy_setopt(curl, CURLOPT_HTTPAUTH, CURLAUTH_BASIC); curl_easy_setopt(curl, CURLOPT_HTTPAUTH, CURLAUTH_BASIC);
} }
if (longpoll) {
pool->lp_sent = true;
#ifdef CURL_HAS_SOCKOPT #ifdef CURL_HAS_SOCKOPT
if (longpoll)
curl_easy_setopt(curl, CURLOPT_SOCKOPTFUNCTION, json_rpc_call_sockopt_cb); curl_easy_setopt(curl, CURLOPT_SOCKOPTFUNCTION, json_rpc_call_sockopt_cb);
#endif #endif
}
curl_easy_setopt(curl, CURLOPT_POST, 1); curl_easy_setopt(curl, CURLOPT_POST, 1);
if (opt_protocol) if (opt_protocol)

Loading…
Cancel
Save