openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

server rpc: Remove APIs for manipulating filters on locked client 

We don't need to add or remove filters when client object is already
locked anymore. There's no reason to keep the *Locked variants of those
APIs.
This commit is contained in:
Jiri Denemark 2012-06-12 09:02:38 +02:00
parent 0ec514b359
commit d9ad416698
1 changed files with 12 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/rpc/virnetserverclient.c
View File

@ -218,20 +218,21 @@ static void virNetServerClientUpdateEvent(virNetServerClientPtr client)
}
static int
virNetServerClientAddFilterLocked(virNetServerClientPtr client,
virNetServerClientFilterFunc func,
void *opaque)
int virNetServerClientAddFilter(virNetServerClientPtr client,
virNetServerClientFilterFunc func,
void *opaque)
{
virNetServerClientFilterPtr filter;
virNetServerClientFilterPtr *place;
int ret = -1;
int ret;
if (VIR_ALLOC(filter) < 0) {
virReportOOMError();
goto cleanup;
return -1;
}
virNetServerClientLock(client);
filter->id = client->nextFilterID++;
filter->func = func;
filter->opaque = opaque;
@ -243,28 +244,18 @@ virNetServerClientAddFilterLocked(virNetServerClientPtr client,
ret = filter->id;
cleanup:
return ret;
}
int virNetServerClientAddFilter(virNetServerClientPtr client,
virNetServerClientFilterFunc func,
void *opaque)
{
int ret;
virNetServerClientLock(client);
ret = virNetServerClientAddFilterLocked(client, func, opaque);
virNetServerClientUnlock(client);
return ret;
}
static void
virNetServerClientRemoveFilterLocked(virNetServerClientPtr client,
int filterID)
void virNetServerClientRemoveFilter(virNetServerClientPtr client,
int filterID)
{
virNetServerClientFilterPtr tmp, prev;
virNetServerClientLock(client);
prev = NULL;
tmp = client->filters;
while (tmp) {
@ -280,13 +271,7 @@ virNetServerClientRemoveFilterLocked(virNetServerClientPtr client,
prev = tmp;
tmp = tmp->next;
}
}
void virNetServerClientRemoveFilter(virNetServerClientPtr client,
int filterID)
{
virNetServerClientLock(client);
virNetServerClientRemoveFilterLocked(client, filterID);
virNetServerClientUnlock(client);
}