Skip to content
GitLab
Commit ce8e1c60 authored by Alejandro Homs Puron's avatar Alejandro Homs Puron
Browse files

Refactor CurlLoop code

parent f59a16c9
Hide whitespace changes
Inline Side-by-side
sdk/linux/EigerAPI/include/eigerapi/CurlLoop.h
View file @ ce8e1c60
......@@ -57,12 +57,14 @@ namespace eigerapi
typedef std::shared_ptr<Callback> CallbackPtr;
void register_callback(CallbackPtr& cbk, bool in_thread = false);
CURL* get_handle() {return m_handle;}
const std::string& get_url() {return m_url;}
CURL* get_handle() const {return m_handle;}
const std::string& get_url() const {return m_url;}
FutureRequest(const std::string& url);
protected:
virtual void _request_finished() {};
void handle_result(CURLcode result);
void _status_changed();
static void *_callback_thread_runFunc(void *data);
......@@ -77,27 +79,33 @@ namespace eigerapi
bool m_cbk_in_thread;
std::string m_url;
};
typedef std::shared_ptr<FutureRequest> CurlReq;
CurlLoop();
~CurlLoop();
void quit(); // quit the curl loop
void add_request(std::shared_ptr<FutureRequest>);
void cancel_request(std::shared_ptr<FutureRequest>);
void add_request(CurlReq);
void cancel_request(CurlReq);
private:
typedef std::map<CURL*,std::shared_ptr<FutureRequest> > MapRequests;
typedef std::list<std::shared_ptr<FutureRequest> > ListRequests;
struct ActiveCurlRequest;
typedef std::shared_ptr<ActiveCurlRequest> ActReq;
typedef std::map<CURL*,ActReq> MapRequests;
typedef std::list<CurlReq> ListRequests;
static void* _runFunc(void*);
void _run();
void _check_new_requests();
bool _wait_input_events();
void _remove_canceled_requests();
// Synchro
int m_pipes[2];
volatile bool m_running;
volatile bool m_quit;
pthread_mutex_t m_lock;
pthread_cond_t m_cond;
CURLM* m_multi_handle;
int m_pipes[2];
bool m_quit;
pthread_t m_thread_id;
//Pending Request
MapRequests m_pending_requests;
......
sdk/linux/EigerAPI/include/eigerapi/Requests.h
View file @ ce8e1c60
......@@ -40,7 +40,7 @@ namespace eigerapi
class Requests
{
public:
typedef std::shared_ptr<CurlLoop::FutureRequest> CurlReq;
typedef CurlLoop::CurlReq CurlReq;
class Command : public CurlLoop::FutureRequest
{
......
sdk/linux/EigerAPI/src/AutoMutex.h 0 → 100644
View file @ ce8e1c60
//###########################################################################
// This file is part of LImA, a Library for Image Acquisition
//
// Copyright (C) : 2009-2015
// European Synchrotron Radiation Facility
// BP 220, Grenoble 38043
// FRANCE
//
// This is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 3 of the License, or
// (at your option) any later version.
//
// This software is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, see <http://www.gnu.org/licenses/>.
//###########################################################################
#ifndef EIGERAPI_AUTOMUTEX_H
#define EIGERAPI_AUTOMUTEX_H
#include <pthread.h>
namespace eigerapi
{
//Lock class
class Lock
{
public:
Lock(pthread_mutex_t *aLock,bool aLockFlag = true) :
_lock(aLock),_lockFlag(false)
{if(aLockFlag) lock();}
~Lock() {unLock();}
void lock()
{
if(!_lockFlag)
while(pthread_mutex_lock(_lock)) ;
_lockFlag = true;
}
void unLock()
{
if(_lockFlag)
{
_lockFlag = false;
pthread_mutex_unlock(_lock);
}
}
private:
pthread_mutex_t *_lock;
bool _lockFlag;
};
class Unlock
{
public:
Unlock(Lock& aLock) :
_lock(aLock)
{_lock.unLock();}
~Unlock()
{_lock.lock();}
private:
Lock& _lock;
};
} // namespace eigerapi
#endif // EIGERAPI_AUTOMUTEX_H
sdk/linux/EigerAPI/src/CurlLoop.cpp
View file @ ce8e1c60
......@@ -26,33 +26,7 @@
#include "eigerapi/CurlLoop.h"
#include "eigerapi/EigerDefines.h"
//Lock class
class Lock
{
public:
Lock(pthread_mutex_t *aLock,bool aLockFlag = true) :
_lock(aLock),_lockFlag(false)
{if(aLockFlag) lock();}
~Lock() {unLock();}
inline void lock()
{
if(!_lockFlag)
while(pthread_mutex_lock(_lock)) ;
_lockFlag = true;
}
inline void unLock()
{
if(_lockFlag)
{
_lockFlag = false;
pthread_mutex_unlock(_lock);
}
}
private:
pthread_mutex_t *_lock;
volatile bool _lockFlag;
};
#include "AutoMutex.h"
using namespace eigerapi;
......@@ -71,236 +45,8 @@ struct CURL_INIT
}
} global_init;
CurlLoop::CurlLoop() :
m_running(false),
m_quit(false),
m_thread_id(0)
{
if(pthread_mutex_init(&m_lock,NULL))
THROW_EIGER_EXCEPTION("pthread_mutex_init","Can't initialize the lock");
if(pthread_cond_init(&m_cond,NULL))
THROW_EIGER_EXCEPTION("pthread_cond_init",
"Can't initialize the variable condition");
if(pipe(m_pipes))
THROW_EIGER_EXCEPTION("pipe","Can't create pipe");
//set pipe none blocking
fcntl(m_pipes[0],F_SETFL,O_NONBLOCK);
fcntl(m_pipes[1],F_SETFL,O_NONBLOCK);
pthread_create(&m_thread_id,NULL,_runFunc,this);
}
CurlLoop::~CurlLoop()
{
quit();
pthread_cond_destroy(&m_cond);
pthread_mutex_destroy(&m_lock);
}
void CurlLoop::quit()
{
if(!m_thread_id) return;
Lock alock(&m_lock);
m_quit = true;
write(m_pipes[1],"|",1);
pthread_cond_broadcast(&m_cond);
alock.unLock();
if(m_thread_id > 0)
pthread_join(m_thread_id,NULL);
close(m_pipes[1]),close(m_pipes[0]);
m_thread_id = 0;
}
void CurlLoop::add_request(std::shared_ptr<CurlLoop::FutureRequest> new_request)
{
Lock alock(&m_lock);
if(write(m_pipes[1],"|",1) == -1 && errno != EAGAIN)
THROW_EIGER_EXCEPTION("write into pipe","synchronization failed");
m_new_requests.push_back(new_request);
new_request->m_status = FutureRequest::RUNNING;
pthread_cond_broadcast(&m_cond);
}
void CurlLoop::cancel_request(std::shared_ptr<CurlLoop::FutureRequest> request)
{
Lock alock(&m_lock);
m_cancel_requests.push_back(request);
alock.unLock();
Lock req_lock(&request->m_lock);
request->m_status = FutureRequest::CANCEL;
}
void* CurlLoop::_runFunc(void *curlloopPt)
{
((CurlLoop*)curlloopPt)->_run();
return NULL;
}
void CurlLoop::_run()
{
CURLM* multi_handle = curl_multi_init();
Lock lock(&m_lock);
while(!m_quit)
{
lock.lock();
while(!m_quit &&
m_pending_requests.empty() && m_new_requests.empty())
{
m_running = false;
pthread_cond_broadcast(&m_cond);
pthread_cond_wait(&m_cond,&m_lock);
}
if(m_quit) break;
m_running = true;
//Add all new requests
for(ListRequests::iterator i = m_new_requests.begin();
i != m_new_requests.end();++i)
{
std::pair<MapRequests::iterator,bool> result =
m_pending_requests.insert(MapRequests::value_type((*i)->m_handle,*i));
if(result.second)
curl_multi_add_handle(multi_handle,(*i)->m_handle);
}
m_new_requests.clear();
lock.unLock();
fd_set fdread;
fd_set fdwrite;
fd_set fdexcep;
FD_ZERO(&fdread);
FD_SET(m_pipes[0],&fdread);
FD_ZERO(&fdwrite);
FD_ZERO(&fdexcep);
//get curl timeout
struct timeval timeout{1,0};
struct timeval* timeoutPt;
long curl_timeout = -1;
curl_multi_timeout(multi_handle,&curl_timeout);
if(curl_timeout >=0)
{
timeout.tv_sec = curl_timeout / 1000;
timeout.tv_usec = (curl_timeout % 1000) * 1000;
timeoutPt = &timeout;
}
else
timeoutPt = NULL;
int max_fd = -1;
CURLMcode mc = curl_multi_fdset(multi_handle,
&fdread,&fdwrite,&fdexcep,
&max_fd);
if(mc != CURLM_OK)
{
std::cerr << "Big problem occurred in curl loop " <<
__FILE__ << ":" << __LINE__ << ", exit" << std::endl;
break;
}
// fds are not ready in curl, wait 100ms
int nb_event = 0;
if(max_fd == -1)
usleep(100 * 1000);
else
nb_event = select(max_fd + 1,&fdread,&fdwrite,&fdexcep,timeoutPt);
if(nb_event == -1)
{
if(errno != EINTR)
{
std::cerr << "Big problem occurred in curl loop " <<
__FILE__ << ":" << __LINE__ << ", exit" << std::endl;
break;
}
}
else if(nb_event >= 0 || max_fd == -1)
{
// flush pipe
char buffer[1024];
if(read(m_pipes[0],buffer,sizeof(buffer)) == -1 && errno != EAGAIN)
std::cerr << "Warning: something strange happen! (" <<
errno << ',' << strerror(errno) << ')' <<
__FILE__ << ":" << __LINE__ << ", exit" << std::endl;
int nb_running;
curl_multi_perform(multi_handle,&nb_running);
lock.lock();
CURLMsg *msg;
int msg_left;
while((msg = curl_multi_info_read(multi_handle,&msg_left)))
{
if(msg->msg == CURLMSG_DONE)
{
curl_multi_remove_handle(multi_handle,msg->easy_handle);
MapRequests::iterator request = m_pending_requests.find(msg->easy_handle);
if(request == m_pending_requests.end())
{
std::cerr << "Warning CurlLoop: something strange happen! " <<
__FILE__ << ":" << __LINE__ << ", exit" << std::endl;
}
else
{
std::shared_ptr<FutureRequest> req = request->second;
m_pending_requests.erase(request);
lock.unLock();
Lock request_lock(&req->m_lock);
if(req->m_status != FutureRequest::CANCEL)
{
switch(msg->data.result)
{
case CURLE_OK:
req->m_status = FutureRequest::OK;
break;
default: // error
req->m_status = FutureRequest::ERROR;
req->m_error_code =
curl_easy_strerror(msg->data.result);
break;
}
}
pthread_cond_broadcast(&req->m_cond);
if(req->m_cbk)
req->_status_changed();
req->_request_finished();
lock.lock();
}
}
}
//Remove canceled request
for(ListRequests::iterator i = m_cancel_requests.begin();
i != m_cancel_requests.end();++i)
{
MapRequests::iterator request = m_pending_requests.find((*i)->m_handle);
if(request != m_pending_requests.end())
{
curl_multi_remove_handle(multi_handle,(*i)->m_handle);
m_pending_requests.erase(request);
}
}
m_cancel_requests.clear();
}
}
//cleanup
for(MapRequests::iterator i = m_pending_requests.begin();
i != m_pending_requests.end();++i)
curl_multi_remove_handle(multi_handle,i->first);
m_pending_requests.clear();
curl_multi_cleanup(multi_handle);
}
// -------------------- CurlLoop::Request --------------------
CurlLoop::FutureRequest::FutureRequest(const std::string& url) :
m_status(IDLE),
......@@ -324,11 +70,33 @@ CurlLoop::FutureRequest::~FutureRequest()
{
curl_easy_cleanup(m_handle);
delete m_cbk;
pthread_cond_destroy(&m_cond);
pthread_mutex_destroy(&m_lock);
}
inline void CurlLoop::FutureRequest::handle_result(CURLcode result)
{
Lock lock(&m_lock);
if(m_status != FutureRequest::CANCEL)
{
switch(result)
{
case CURLE_OK:
m_status = FutureRequest::OK;
break;
default: // error
m_status = FutureRequest::ERROR;
m_error_code = curl_easy_strerror(result);
break;
}
}
pthread_cond_broadcast(&m_cond);
if(m_cbk)
_status_changed();
_request_finished();
}
void CurlLoop::FutureRequest::wait(double timeout,bool lock_flag) const
{
Lock lock(&m_lock,lock_flag);
......@@ -343,8 +111,8 @@ void CurlLoop::FutureRequest::wait(double timeout,bool lock_flag) const
struct timespec waitTimeout;
gettimeofday(&now,NULL);
waitTimeout.tv_sec = now.tv_sec + long(timeout);
waitTimeout.tv_nsec = (now.tv_usec * 1000) +
long((timeout - long(timeout)) * 1e9);
waitTimeout.tv_nsec = ((now.tv_usec * 1000) +
long((timeout - long(timeout)) * 1e9));
if(waitTimeout.tv_nsec >= 1000000000L) // Carry
++waitTimeout.tv_sec,waitTimeout.tv_nsec -= 1000000000L;
......@@ -369,20 +137,6 @@ CurlLoop::FutureRequest::get_status() const
return m_status;
}
void CurlLoop::FutureRequest::register_callback(CallbackPtr& cbk,
bool in_thread)
{
if (!cbk)
THROW_EIGER_EXCEPTION("register_callback","invalid callback");
Lock lock(&m_lock);
delete m_cbk;
m_cbk = new CallbackPtr(cbk);
m_cbk_in_thread = in_thread;
if(m_status != RUNNING)
_status_changed();
}
struct StatusChangedCallback {
CurlLoop::FutureRequest::CallbackPtr cbk;
CurlLoop::FutureRequest::Status status;
......@@ -391,7 +145,7 @@ struct StatusChangedCallback {
};
typedef std::unique_ptr<StatusChangedCallback> StatusChangedCallbackPtr;
void CurlLoop::FutureRequest::_status_changed()
inline void CurlLoop::FutureRequest::_status_changed()
{
StatusChangedCallback cbk{*m_cbk, m_status, m_error_code};
if (!m_cbk_in_thread) {
......@@ -400,10 +154,7 @@ void CurlLoop::FutureRequest::_status_changed()
}
#define ERROR(x) \
do { \
std::cout << "CurlLoop::FutureRequest::_status_changed: " \
<<"Error: " << x << std::endl; \
} while (0)
THROW_EIGER_EXCEPTION("CurlLoop::FutureRequest::_status_changed", x)
StatusChangedCallbackPtr tcbk(new StatusChangedCallback(cbk));
pthread_t thread;
......@@ -426,3 +177,253 @@ void *CurlLoop::FutureRequest::_callback_thread_runFunc(void *data)
cbk->fire();
return NULL;
}
void CurlLoop::FutureRequest::register_callback(CallbackPtr& cbk,
bool in_thread)
{
if (!cbk)
THROW_EIGER_EXCEPTION("register_callback","invalid callback");
Lock lock(&m_lock);
delete m_cbk;
m_cbk = new CallbackPtr(cbk);
m_cbk_in_thread = in_thread;
if(m_status != RUNNING)
_status_changed();
}
// ----------------- CurlLoop::ActiveCurlRequest ------------
struct CurlLoop::ActiveCurlRequest
{
CurlReq req;
CURLM *multi_handle;
ActiveCurlRequest(CurlReq r, CURLM *mh)
: req(r), multi_handle(mh)
{ curl_multi_add_handle(multi_handle, req->get_handle()); }
~ActiveCurlRequest()
{ curl_multi_remove_handle(multi_handle, req->get_handle()); };
};
// ------------------------ CurlLoop -------------------------
CurlLoop::CurlLoop() :
m_multi_handle(NULL),
m_quit(false),
m_thread_id(0)
{
if(pthread_mutex_init(&m_lock,NULL))
THROW_EIGER_EXCEPTION("pthread_mutex_init","Can't initialize the lock");
if(pthread_cond_init(&m_cond,NULL))
THROW_EIGER_EXCEPTION("pthread_cond_init",
"Can't initialize the variable condition");
m_multi_handle = curl_multi_init();
if(pipe(m_pipes))
THROW_EIGER_EXCEPTION("pipe","Can't create pipe");
//set pipe none blocking
fcntl(m_pipes[0],F_SETFL,O_NONBLOCK);
fcntl(m_pipes[1],F_SETFL,O_NONBLOCK);
pthread_create(&m_thread_id,NULL,_runFunc,this);
}
CurlLoop::~CurlLoop()
{
quit();
curl_multi_cleanup(m_multi_handle);
pthread_cond_destroy(&m_cond);
pthread_mutex_destroy(&m_lock);
}
void CurlLoop::quit()
{
if(!m_thread_id) return;
Lock alock(&m_lock);
m_quit = true;
write(m_pipes[1],"|",1);
pthread_cond_broadcast(&m_cond);
alock.unLock();
if(m_thread_id > 0)
pthread_join(m_thread_id,NULL);
close(m_pipes[1]),close(m_pipes[0]);
m_pipes[0] = m_pipes[1] = -1;
m_thread_id = 0;
}
void CurlLoop::add_request(CurlReq new_request)
{
Lock alock(&m_lock);
m_new_requests.push_back(new_request);
new_request->m_status = FutureRequest::RUNNING;
if(write(m_pipes[1],"|",1) == -1 && errno != EAGAIN)
THROW_EIGER_EXCEPTION("write into pipe","synchronization failed");
pthread_cond_broadcast(&m_cond);
}
void CurlLoop::cancel_request(CurlReq request)
{
{
Lock alock(&m_lock);
m_cancel_requests.push_back(request);
}
{