Skip to content
Snippets Groups Projects
  • Stefan Hajnoczi's avatar
    d73415a3
    qemu/atomic.h: rename atomic_ to qatomic_ · d73415a3
    Stefan Hajnoczi authored
    
    clang's C11 atomic_fetch_*() functions only take a C11 atomic type
    pointer argument. QEMU uses direct types (int, etc) and this causes a
    compiler error when a QEMU code calls these functions in a source file
    that also included <stdatomic.h> via a system header file:
    
      $ CC=clang CXX=clang++ ./configure ... && make
      ../util/async.c:79:17: error: address argument to atomic operation must be a pointer to _Atomic type ('unsigned int *' invalid)
    
    Avoid using atomic_*() names in QEMU's atomic.h since that namespace is
    used by <stdatomic.h>. Prefix QEMU's APIs with 'q' so that atomic.h
    and <stdatomic.h> can co-exist. I checked /usr/include on my machine and
    searched GitHub for existing "qatomic_" users but there seem to be none.
    
    This patch was generated using:
    
      $ git grep -h -o '\<atomic\(64\)\?_[a-z0-9_]\+' include/qemu/atomic.h | \
        sort -u >/tmp/changed_identifiers
      $ for identifier in $(</tmp/changed_identifiers); do
            sed -i "s%\<$identifier\>%q$identifier%g" \
                $(git grep -I -l "\<$identifier\>")
        done
    
    I manually fixed line-wrap issues and misaligned rST tables.
    
    Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
    Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
    Acked-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
    Message-Id: <20200923105646.47864-1-stefanha@redhat.com>
    d73415a3
    History
    qemu/atomic.h: rename atomic_ to qatomic_
    Stefan Hajnoczi authored
    
    clang's C11 atomic_fetch_*() functions only take a C11 atomic type
    pointer argument. QEMU uses direct types (int, etc) and this causes a
    compiler error when a QEMU code calls these functions in a source file
    that also included <stdatomic.h> via a system header file:
    
      $ CC=clang CXX=clang++ ./configure ... && make
      ../util/async.c:79:17: error: address argument to atomic operation must be a pointer to _Atomic type ('unsigned int *' invalid)
    
    Avoid using atomic_*() names in QEMU's atomic.h since that namespace is
    used by <stdatomic.h>. Prefix QEMU's APIs with 'q' so that atomic.h
    and <stdatomic.h> can co-exist. I checked /usr/include on my machine and
    searched GitHub for existing "qatomic_" users but there seem to be none.
    
    This patch was generated using:
    
      $ git grep -h -o '\<atomic\(64\)\?_[a-z0-9_]\+' include/qemu/atomic.h | \
        sort -u >/tmp/changed_identifiers
      $ for identifier in $(</tmp/changed_identifiers); do
            sed -i "s%\<$identifier\>%q$identifier%g" \
                $(git grep -I -l "\<$identifier\>")
        done
    
    I manually fixed line-wrap issues and misaligned rST tables.
    
    Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
    Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
    Acked-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
    Message-Id: <20200923105646.47864-1-stefanha@redhat.com>
aio-wait.c 2.13 KiB
/*
 * AioContext wait support
 *
 * Copyright (C) 2018 Red Hat, Inc.
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
 * in the Software without restriction, including without limitation the rights
 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 * copies of the Software, and to permit persons to whom the Software is
 * furnished to do so, subject to the following conditions:
 *
 * The above copyright notice and this permission notice shall be included in
 * all copies or substantial portions of the Software.
 *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
 * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 * THE SOFTWARE.
 */

#include "qemu/osdep.h"
#include "qemu/main-loop.h"
#include "block/aio-wait.h"

AioWait global_aio_wait;

static void dummy_bh_cb(void *opaque)
{
    /* The point is to make AIO_WAIT_WHILE()'s aio_poll() return */
}

void aio_wait_kick(void)
{
    /* The barrier (or an atomic op) is in the caller.  */
    if (qatomic_read(&global_aio_wait.num_waiters)) {
        aio_bh_schedule_oneshot(qemu_get_aio_context(), dummy_bh_cb, NULL);
    }
}

typedef struct {
    bool done;
    QEMUBHFunc *cb;
    void *opaque;
} AioWaitBHData;

/* Context: BH in IOThread */
static void aio_wait_bh(void *opaque)
{
    AioWaitBHData *data = opaque;

    data->cb(data->opaque);

    data->done = true;
    aio_wait_kick();
}

void aio_wait_bh_oneshot(AioContext *ctx, QEMUBHFunc *cb, void *opaque)
{
    AioWaitBHData data = {
        .cb = cb,
        .opaque = opaque,
    };

    assert(qemu_get_current_aio_context() == qemu_get_aio_context());

    aio_bh_schedule_oneshot(ctx, aio_wait_bh, &data);
    AIO_WAIT_WHILE(ctx, !data.done);
}