shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2024-12-22 13:33:52 +03:00
Code Releases Wiki Activity

feature #1288: Update request id in add method for sync requests. AuthManager updated.

Browse Source
This commit is contained in:
Ruben S. Montero 2012-06-01 12:01:23 +02:00
parent f72e5f3a7d
commit 293ee180a4
3 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/MadManager.h
View File

@ -113,7 +113,7 @@ protected:
* @param ar pointer to the request
* @return the id for the request
*/
int add_request(SyncRequest *ar);
void add_request(SyncRequest *ar);
/**
* Gets request from the Request map
@ -122,19 +122,6 @@ protected:
*/
SyncRequest * get_request(int id);
/**
* Discards a pending request. Call this before freeing not notified or
* timeout requests.
*/
void discard_request(int id)
{
lock();
sync_requests.erase(id);
unlock();
}
private:
/**
* Function to lock the Manager

4
src/authm/AuthManager.cc
View File

@ -241,7 +241,7 @@ void AuthManager::authenticate_action(AuthRequest * ar)
// Queue the request
// ------------------------------------------------------------------------
ar->id = add_request(ar);
add_request(ar);
// ------------------------------------------------------------------------
// Make the request to the driver
@ -285,7 +285,7 @@ void AuthManager::authorize_action(AuthRequest * ar)
// Queue the request
// ------------------------------------------------------------------------
ar->id = add_request(ar);
add_request(ar);
// ------------------------------------------------------------------------
// Make the request to the driver

8
src/mad/MadManager.cc
View File

@ -377,20 +377,18 @@ void MadManager::check_time_outs_action()
/* -------------------------------------------------------------------------- */
/* -------------------------------------------------------------------------- */
int MadManager::add_request(SyncRequest *ar)
void MadManager::add_request(SyncRequest *ar)
{
static int request_id = 0;
int id;
lock();
id = request_id++;
ar->id = request_id++;
sync_requests.insert(sync_requests.end(),make_pair(id,ar));
sync_requests.insert(sync_requests.end(),make_pair(ar->id,ar));
unlock();
return id;
}
/* -------------------------------------------------------------------------- */