david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

block/archipelago: Use QEMU atomic builtins

Browse Source 
Replace __sync builtins with ones provided by QEMU
for atomic operations.

Special thanks goes to Paolo Bonzini for his refactoring
suggestion in order to use the already existing atomic builtins
interface.

Signed-off-by: Chrysostomos Nanakos <cnanakos@grnet.gr>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Chrysostomos Nanakos 2014-09-02 15:41:34 +03:00 committed by Stefan Hajnoczi
parent 3ba6796d08
commit 072f9ac44a
1 changed files with 23 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
block/archipelago.c
View File

@ -57,6 +57,7 @@
#include "qapi/qmp/qint.h" #include "qapi/qmp/qint.h"
#include "qapi/qmp/qstring.h" #include "qapi/qmp/qstring.h"
#include "qapi/qmp/qjson.h" #include "qapi/qmp/qjson.h"
#include "qemu/atomic.h"
#include <inttypes.h> #include <inttypes.h>
#include <xseg/xseg.h> #include <xseg/xseg.h>
@ -214,7 +215,7 @@ static void xseg_request_handler(void *state)
xseg_put_request(s->xseg, req, s->srcport); xseg_put_request(s->xseg, req, s->srcport);
if ((__sync_add_and_fetch(&segreq->ref, -1)) == 0) { if (atomic_fetch_dec(&segreq->ref) == 1) {
if (!segreq->failed) { if (!segreq->failed) {
reqdata->aio_cb->ret = segreq->count; reqdata->aio_cb->ret = segreq->count;
archipelago_finish_aiocb(reqdata); archipelago_finish_aiocb(reqdata);
@ -233,7 +234,7 @@ static void xseg_request_handler(void *state)
segreq->count += req->serviced; segreq->count += req->serviced;
xseg_put_request(s->xseg, req, s->srcport); xseg_put_request(s->xseg, req, s->srcport);
if ((__sync_add_and_fetch(&segreq->ref, -1)) == 0) { if (atomic_fetch_dec(&segreq->ref) == 1) {
if (!segreq->failed) { if (!segreq->failed) {
reqdata->aio_cb->ret = segreq->count; reqdata->aio_cb->ret = segreq->count;
archipelago_finish_aiocb(reqdata); archipelago_finish_aiocb(reqdata);
@ -824,78 +825,47 @@ static int archipelago_aio_segmented_rw(BDRVArchipelagoState *s,
ArchipelagoAIOCB *aio_cb, ArchipelagoAIOCB *aio_cb,
int op) int op)
{ {
int i, ret, segments_nr, last_segment_size; int ret, segments_nr;
size_t pos = 0;
ArchipelagoSegmentedRequest *segreq; ArchipelagoSegmentedRequest *segreq;
segreq = g_new(ArchipelagoSegmentedRequest, 1); segreq = g_new0(ArchipelagoSegmentedRequest, 1);
if (op == ARCHIP_OP_FLUSH) { if (op == ARCHIP_OP_FLUSH) {
segments_nr = 1; segments_nr = 1;
segreq->ref = segments_nr; } else {
segreq->total = count;
segreq->count = 0;
segreq->failed = 0;
ret = archipelago_submit_request(s, 0, count, offset, aio_cb,
segreq, ARCHIP_OP_FLUSH);
if (ret < 0) {
goto err_exit;
}
return 0;
}
segments_nr = (int)(count / MAX_REQUEST_SIZE) + \ segments_nr = (int)(count / MAX_REQUEST_SIZE) + \
((count % MAX_REQUEST_SIZE) ? 1 : 0); ((count % MAX_REQUEST_SIZE) ? 1 : 0);
last_segment_size = (int)(count % MAX_REQUEST_SIZE); }
segreq->ref = segments_nr;
segreq->total = count; segreq->total = count;
segreq->count = 0; atomic_mb_set(&segreq->ref, segments_nr);
segreq->failed = 0;
for (i = 0; i < segments_nr - 1; i++) { while (segments_nr > 1) {
ret = archipelago_submit_request(s, i * MAX_REQUEST_SIZE, ret = archipelago_submit_request(s, pos,
MAX_REQUEST_SIZE, MAX_REQUEST_SIZE,
offset + i * MAX_REQUEST_SIZE, offset + pos,
aio_cb, segreq, op); aio_cb, segreq, op);
if (ret < 0) { if (ret < 0) {
goto err_exit; goto err_exit;
} }
count -= MAX_REQUEST_SIZE;
pos += MAX_REQUEST_SIZE;
segments_nr--;
} }
ret = archipelago_submit_request(s, pos, count, offset + pos,
if ((segments_nr > 1) && last_segment_size) {
ret = archipelago_submit_request(s, i * MAX_REQUEST_SIZE,
last_segment_size,
offset + i * MAX_REQUEST_SIZE,
aio_cb, segreq, op); aio_cb, segreq, op);
} else if ((segments_nr > 1) && !last_segment_size) {
ret = archipelago_submit_request(s, i * MAX_REQUEST_SIZE,
MAX_REQUEST_SIZE,
offset + i * MAX_REQUEST_SIZE,
aio_cb, segreq, op);
} else if (segments_nr == 1) {
ret = archipelago_submit_request(s, 0, count, offset, aio_cb,
segreq, op);
}
if (ret < 0) { if (ret < 0) {
goto err_exit; goto err_exit;
} }
return 0; return 0;
err_exit: err_exit:
__sync_add_and_fetch(&segreq->failed, 1); segreq->failed = 1;
if (segments_nr == 1) { if (atomic_fetch_sub(&segreq->ref, segments_nr) == segments_nr) {
if (__sync_add_and_fetch(&segreq->ref, -1) == 0) {
g_free(segreq); g_free(segreq);
} }
} else {
if ((__sync_add_and_fetch(&segreq->ref, -segments_nr + i)) == 0) {
g_free(segreq);
}
}
return ret; return ret;
} }