Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-20 15:00:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Added the basics of GxsCircles service to libretroshare.

Browse source 
- Defined the control group stuff.
  	- Background task to determine friend membership.
	- Caching of Circle info,
	- Added GXS interface class to gxs/rsgixs.h
 	- TODO: Serialiser is incomplete.
	- TODO: SubCircles to be done in Phase 2.

 * Improvements to RsMemCache:
	- Added Value& ref(Key) to avoid data copying.
	- Added Statistics to check cache performance.
	- Fixed up bugs in tracking membership.

 * Improvements to RsTickEvent:
	- Added additional string parameter for more specificity.




git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5910 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2012-11-29 22:48:28 +00:00
parent baa949eaac
commit 5a55c1b5d6
18 changed files with 2353 additions and 427 deletions
Download patch file Download diff file Expand all files Collapse all files

53
libretroshare/src/util/rstickevent.cc
View file

@ -67,16 +67,16 @@ void RsTickEvent::tick_events()
}
}
std::list<uint32_t> toProcess;
std::list<uint32_t>::iterator it;
std::list<EventData> toProcess;
std::list<EventData>::iterator it;
{
RsStackMutex stack(mEventMtx); /********** STACK LOCKED MTX ******/
while((!mEvents.empty()) && (mEvents.begin()->first <= now))
{
std::multimap<time_t, uint32_t>::iterator it = mEvents.begin();
uint32_t event_type = it->second;
toProcess.push_back(event_type);
std::multimap<time_t, EventData>::iterator it = mEvents.begin();
uint32_t event_type = it->second.mEventType;
toProcess.push_back(it->second);
mEvents.erase(it);
count_adjust_locked(event_type, -1);
@ -86,40 +86,53 @@ void RsTickEvent::tick_events()
for(it = toProcess.begin(); it != toProcess.end(); it++)
{
std::cerr << "RsTickEvent::tick_events() calling handle_event(";
std::cerr << *it << ")";
std::cerr << it->mEventType << ", " << it->mEventLabel << ")";
std::cerr << std::endl;
handle_event(*it);
handle_event(it->mEventType, it->mEventLabel);
}
}
void RsTickEvent::schedule_now(uint32_t event_type)
{
RsTickEvent::schedule_in(event_type, 0);
std::string elabel;
RsTickEvent::schedule_in(event_type, 0, elabel);
}
void RsTickEvent::schedule_event(uint32_t event_type, time_t when)
void RsTickEvent::schedule_now(uint32_t event_type, const std::string &elabel)
{
RsTickEvent::schedule_in(event_type, 0, elabel);
}
void RsTickEvent::schedule_event(uint32_t event_type, time_t when, const std::string &elabel)
{
RsStackMutex stack(mEventMtx); /********** STACK LOCKED MTX ******/
mEvents.insert(std::make_pair(when, event_type));
mEvents.insert(std::make_pair(when, EventData(event_type, elabel)));
count_adjust_locked(event_type, 1);
}
void RsTickEvent::schedule_in(uint32_t event_type, uint32_t in_secs)
{
std::cerr << "RsTickEvent::schedule_in(" << event_type << ") in " << in_secs << " secs";
std::cerr << std::endl;
RsStackMutex stack(mEventMtx); /********** STACK LOCKED MTX ******/
time_t event_time = time(NULL) + in_secs;
mEvents.insert(std::make_pair(event_time, event_type));
count_adjust_locked(event_type, 1);
std::string elabel;
RsTickEvent::schedule_in(event_type, in_secs, elabel);
}
void RsTickEvent::handle_event(uint32_t event_type)
void RsTickEvent::schedule_in(uint32_t event_type, uint32_t in_secs, const std::string &elabel)
{
std::cerr << "RsTickEvent::handle_event(" << event_type << ") ERROR Not Handled";
std::cerr << "RsTickEvent::schedule_in(" << event_type << ", " << elabel << ") in " << in_secs << " secs";
std::cerr << std::endl;
time_t event_time = time(NULL) + in_secs;
RsTickEvent::schedule_event(event_type, event_time, elabel);
}
void RsTickEvent::handle_event(uint32_t event_type, const std::string &elabel)
{
std::cerr << "RsTickEvent::handle_event(" << event_type << ", " << elabel;
std::cerr << ") ERROR Not Handled";
std::cerr << std::endl;
}