1
This commit is contained in:
aozhiwei
parent
8524855f92
commit
0a591f7913
@ -25,8 +25,6 @@
|
||||
#include <f8/utils.h>
|
||||
#include <f8/timer.h>
|
||||
|
||||
#define F8_MUTLI_THREAD_HTTP 1
|
||||
|
||||
namespace f8
|
||||
{
|
||||
|
||||
@ -39,14 +37,8 @@ namespace f8
|
||||
struct AsyncHttpRequest
|
||||
{
|
||||
long long context_id = 0;
|
||||
#if 0
|
||||
a8::XParams param;
|
||||
#endif
|
||||
f8::HttpProxyCb cb;
|
||||
time_t add_time = 0;
|
||||
#if 0
|
||||
AsyncHttpOnOkFunc on_ok = nullptr;
|
||||
AsyncHttpOnErrorFunc on_error = nullptr;
|
||||
#endif
|
||||
f8::Attacher timer_attacher;
|
||||
};
|
||||
|
||||
@ -324,23 +316,16 @@ namespace f8
|
||||
|
||||
void UnInit()
|
||||
{
|
||||
#if F8_MUTLI_THREAD_HTTP
|
||||
for (auto& itr : http_thread_pool) {
|
||||
HttpThread* thread = itr;
|
||||
thread->UnInit();
|
||||
delete thread;
|
||||
}
|
||||
http_thread_pool.clear();
|
||||
#else
|
||||
async_curl_->UnInit();
|
||||
delete async_curl_;
|
||||
async_curl_ = nullptr;
|
||||
#endif
|
||||
}
|
||||
|
||||
void SetThreadNum(int thread_num)
|
||||
{
|
||||
#if F8_MUTLI_THREAD_HTTP
|
||||
assert(thread_num > 0);
|
||||
for (int i = 0; i < thread_num; i++) {
|
||||
HttpThread *http_thread = new HttpThread();
|
||||
@ -349,7 +334,6 @@ namespace f8
|
||||
http_thread->Init();
|
||||
http_thread_pool.push_back(http_thread);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
AsyncHttpRequest* GetAsyncHttpRequest(long long seqid)
|
||||
@ -388,10 +372,12 @@ namespace f8
|
||||
delete request;
|
||||
}
|
||||
|
||||
#if 0
|
||||
void InternalExecAsyncHttp(int method, const char* url, a8::XObject& url_params,
|
||||
const char* content, a8::XObject* headers,
|
||||
a8::XParams param, AsyncHttpOnOkFunc on_ok, AsyncHttpOnErrorFunc on_error,
|
||||
void InternalExecAsyncHttp(int method,
|
||||
const char* url,
|
||||
a8::XObject& url_params,
|
||||
const char* content,
|
||||
a8::XObject* headers,
|
||||
f8::HttpProxyCb cb,
|
||||
long long hash_code)
|
||||
|
||||
{
|
||||
@ -399,19 +385,15 @@ namespace f8
|
||||
AsyncHttpRequest* p = new AsyncHttpRequest();
|
||||
{
|
||||
p->context_id = ++curr_seqid;
|
||||
p->param = param;
|
||||
p->add_time = time(nullptr);
|
||||
p->on_ok = on_ok;
|
||||
p->on_error = on_error;
|
||||
p->cb = cb;
|
||||
async_http_hash[p->context_id] = p;
|
||||
}
|
||||
#if F8_MUTLI_THREAD_HTTP
|
||||
HttpThread* http_thread = GetHttpThread(hash_code);
|
||||
if (!http_thread) {
|
||||
abort();
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
{
|
||||
AsyncHttpNode* node = new AsyncHttpNode();
|
||||
node->socket_handle = 0;
|
||||
@ -424,9 +406,7 @@ namespace f8
|
||||
if (headers) {
|
||||
headers->DeepCopy(node->headers);
|
||||
}
|
||||
#if F8_MUTLI_THREAD_HTTP
|
||||
http_thread->AddAsyncHttp(node);
|
||||
#endif
|
||||
}
|
||||
f8::Timer::Instance()->SetTimeoutEx
|
||||
(1000 * 10,
|
||||
@ -436,9 +416,7 @@ namespace f8
|
||||
},
|
||||
&p->timer_attacher);
|
||||
}
|
||||
#endif
|
||||
|
||||
#if F8_MUTLI_THREAD_HTTP
|
||||
HttpThread* GetHttpThread(long long hash_code)
|
||||
{
|
||||
if (http_thread_pool.empty() || hash_code < 0) {
|
||||
@ -446,7 +424,6 @@ namespace f8
|
||||
}
|
||||
return http_thread_pool[hash_code % http_thread_pool.size()];
|
||||
}
|
||||
#endif
|
||||
|
||||
public:
|
||||
long long curr_seqid = 0;
|
||||
@ -454,33 +431,11 @@ namespace f8
|
||||
std::map<long long, AsyncHttpRequest*> async_http_hash;
|
||||
|
||||
unsigned short exec_async_http_msgid = 0;
|
||||
#if F8_MUTLI_THREAD_HTTP
|
||||
std::vector<HttpThread*> http_thread_pool;
|
||||
#else
|
||||
AsyncCurl* async_curl_ = nullptr;
|
||||
#endif
|
||||
pthread_mutex_t* mutex_buf = nullptr;
|
||||
size_t mutex_buf_size = 0;
|
||||
};
|
||||
|
||||
static void locking_function(int mode, int n, const char *file, int line)
|
||||
{
|
||||
if (n != (int)f8::HttpClientPool::Instance()->Impl()->mutex_buf_size) {
|
||||
abort();
|
||||
}
|
||||
pthread_mutex_t* mutex = &f8::HttpClientPool::Instance()->Impl()->mutex_buf[n];
|
||||
if(mode & CRYPTO_LOCK) {
|
||||
pthread_mutex_lock(mutex);
|
||||
} else {
|
||||
pthread_mutex_unlock(mutex);
|
||||
}
|
||||
}
|
||||
|
||||
static unsigned long id_function(void)
|
||||
{
|
||||
return pthread_self();
|
||||
}
|
||||
|
||||
void HttpClientPool::Init(int thread_num, int sys_num, int user_num)
|
||||
{
|
||||
if (thread_num < 0 || sys_num < 0 || user_num < 0) {
|
||||
@ -560,20 +515,29 @@ namespace f8
|
||||
a8::XObject* headers)
|
||||
|
||||
{
|
||||
#if 0
|
||||
impl_->InternalExecAsyncHttp(1, url, url_params, "", headers, param, on_ok, on_error, hash_code);
|
||||
#endif
|
||||
impl_->InternalExecAsyncHttp(1,
|
||||
url,
|
||||
url_params,
|
||||
"",
|
||||
headers,
|
||||
cb,
|
||||
hash_code);
|
||||
}
|
||||
|
||||
void HttpClientPool::HttpPost(f8::HttpProxyCb cb,
|
||||
const char* url,
|
||||
a8::XObject url_params,
|
||||
const std::string& content,
|
||||
long long hash_code, a8::XObject* headers)
|
||||
long long hash_code,
|
||||
a8::XObject* headers)
|
||||
{
|
||||
#if 0
|
||||
impl_->InternalExecAsyncHttp(2, url, url_params, content.c_str(), headers, param, on_ok, on_error, hash_code);
|
||||
#endif
|
||||
impl_->InternalExecAsyncHttp(2,
|
||||
url,
|
||||
url_params,
|
||||
content.c_str(),
|
||||
headers,
|
||||
cb,
|
||||
hash_code);
|
||||
}
|
||||
|
||||
long long HttpClientPool::GetPendingNum()
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user