summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/pulsecore/atomic.h4
-rw-r--r--src/pulsecore/cli-command.c20
-rw-r--r--src/pulsecore/memblock.c66
-rw-r--r--src/pulsecore/memblock.h29
-rw-r--r--src/pulsecore/protocol-native.c8
-rw-r--r--src/tests/memblock-test.c28
6 files changed, 80 insertions, 75 deletions
diff --git a/src/pulsecore/atomic.h b/src/pulsecore/atomic.h
index 8867f884..013e8c20 100644
--- a/src/pulsecore/atomic.h
+++ b/src/pulsecore/atomic.h
@@ -53,6 +53,10 @@ static inline int pa_atomic_add(pa_atomic_int_t *a, int i) {
return AO_fetch_and_add_full(&a->value, (AO_t) i);
}
+static inline int pa_atomic_sub(pa_atomic_int_t *a, int i) {
+ return AO_fetch_and_add_full(&a->value, (AO_t) -i);
+}
+
static inline int pa_atomic_inc(pa_atomic_int_t *a) {
return AO_fetch_and_add1_full(&a->value);
}
diff --git a/src/pulsecore/cli-command.c b/src/pulsecore/cli-command.c
index 2755c5c9..4dbf3afa 100644
--- a/src/pulsecore/cli-command.c
+++ b/src/pulsecore/cli-command.c
@@ -273,20 +273,20 @@ static int pa_cli_command_stat(pa_core *c, pa_tokenizer *t, pa_strbuf *buf, PA_G
stat = pa_mempool_get_stat(c->mempool);
pa_strbuf_printf(buf, "Memory blocks currently allocated: %u, size: %s.\n",
- (unsigned) AO_load_acquire_read((AO_t*) &stat->n_allocated),
- pa_bytes_snprint(s, sizeof(s), (size_t) AO_load_acquire_read((AO_t*) &stat->allocated_size)));
+ (unsigned) pa_atomic_load(&stat->n_allocated),
+ pa_bytes_snprint(s, sizeof(s), (size_t) pa_atomic_load(&stat->allocated_size)));
pa_strbuf_printf(buf, "Memory blocks allocated during the whole lifetime: %u, size: %s.\n",
- (unsigned) AO_load_acquire_read((AO_t*) &stat->n_accumulated),
- pa_bytes_snprint(s, sizeof(s), (size_t) AO_load_acquire_read((AO_t*) &stat->accumulated_size)));
+ (unsigned) pa_atomic_load(&stat->n_accumulated),
+ pa_bytes_snprint(s, sizeof(s), (size_t) pa_atomic_load(&stat->accumulated_size)));
pa_strbuf_printf(buf, "Memory blocks imported from other processes: %u, size: %s.\n",
- (unsigned) AO_load_acquire_read((AO_t*) &stat->n_imported),
- pa_bytes_snprint(s, sizeof(s), (size_t) AO_load_acquire_read((AO_t*) &stat->imported_size)));
+ (unsigned) pa_atomic_load(&stat->n_imported),
+ pa_bytes_snprint(s, sizeof(s), (size_t) pa_atomic_load(&stat->imported_size)));
pa_strbuf_printf(buf, "Memory blocks exported to other processes: %u, size: %s.\n",
- (unsigned) AO_load_acquire_read((AO_t*) &stat->n_exported),
- pa_bytes_snprint(s, sizeof(s), (size_t) AO_load_acquire_read((AO_t*) &stat->exported_size)));
+ (unsigned) pa_atomic_load(&stat->n_exported),
+ pa_bytes_snprint(s, sizeof(s), (size_t) pa_atomic_load(&stat->exported_size)));
pa_strbuf_printf(buf, "Total sample cache size: %s.\n",
pa_bytes_snprint(s, sizeof(s), pa_scache_total_size(c)));
@@ -305,8 +305,8 @@ static int pa_cli_command_stat(pa_core *c, pa_tokenizer *t, pa_strbuf *buf, PA_G
pa_strbuf_printf(buf,
"Memory blocks of type %s: %u allocated/%u accumulated.\n",
type_table[k],
- (unsigned) AO_load_acquire_read(&stat->n_allocated_by_type[k]),
- (unsigned) AO_load_acquire_read(&stat->n_accumulated_by_type[k]));
+ (unsigned) pa_atomic_load(&stat->n_allocated_by_type[k]),
+ (unsigned) pa_atomic_load(&stat->n_accumulated_by_type[k]));
return 0;
}
diff --git a/src/pulsecore/memblock.c b/src/pulsecore/memblock.c
index 5e7d6e48..6f09a906 100644
--- a/src/pulsecore/memblock.c
+++ b/src/pulsecore/memblock.c
@@ -114,40 +114,40 @@ static void stat_add(pa_memblock*b) {
assert(b);
assert(b->pool);
- AO_fetch_and_add1_release_write(&b->pool->stat.n_allocated);
- AO_fetch_and_add_release_write(&b->pool->stat.allocated_size, (AO_t) b->length);
+ pa_atomic_inc(&b->pool->stat.n_allocated);
+ pa_atomic_add(&b->pool->stat.allocated_size, b->length);
- AO_fetch_and_add1_release_write(&b->pool->stat.n_accumulated);
- AO_fetch_and_add_release_write(&b->pool->stat.accumulated_size, (AO_t) b->length);
+ pa_atomic_inc(&b->pool->stat.n_accumulated);
+ pa_atomic_add(&b->pool->stat.accumulated_size, b->length);
if (b->type == PA_MEMBLOCK_IMPORTED) {
- AO_fetch_and_add1_release_write(&b->pool->stat.n_imported);
- AO_fetch_and_add_release_write(&b->pool->stat.imported_size, (AO_t) b->length);
+ pa_atomic_inc(&b->pool->stat.n_imported);
+ pa_atomic_add(&b->pool->stat.imported_size, b->length);
}
- AO_fetch_and_add1_release_write(&b->pool->stat.n_allocated_by_type[b->type]);
- AO_fetch_and_add1_release_write(&b->pool->stat.n_accumulated_by_type[b->type]);
+ pa_atomic_inc(&b->pool->stat.n_allocated_by_type[b->type]);
+ pa_atomic_inc(&b->pool->stat.n_accumulated_by_type[b->type]);
}
static void stat_remove(pa_memblock *b) {
assert(b);
assert(b->pool);
- assert(AO_load_acquire_read(&b->pool->stat.n_allocated) > 0);
- assert(AO_load_acquire_read(&b->pool->stat.allocated_size) >= (AO_t) b->length);
+ assert(pa_atomic_load(&b->pool->stat.n_allocated) > 0);
+ assert(pa_atomic_load(&b->pool->stat.allocated_size) >= (int) b->length);
- AO_fetch_and_sub1_release_write(&b->pool->stat.n_allocated);
- AO_fetch_and_add_release_write(&b->pool->stat.allocated_size, (AO_t) (-b->length));
+ pa_atomic_dec(&b->pool->stat.n_allocated);
+ pa_atomic_sub(&b->pool->stat.allocated_size, b->length);
if (b->type == PA_MEMBLOCK_IMPORTED) {
- assert(AO_load_acquire_read(&b->pool->stat.n_imported) > 0);
- assert(AO_load_acquire_read(&b->pool->stat.imported_size) >= (AO_t) b->length);
+ assert(pa_atomic_load(&b->pool->stat.n_imported) > 0);
+ assert(pa_atomic_load(&b->pool->stat.imported_size) >= (int) b->length);
- AO_fetch_and_sub1_release_write(&b->pool->stat.n_imported);
- AO_fetch_and_add_release_write(&b->pool->stat.imported_size, (AO_t) (-b->length));
+ pa_atomic_dec(&b->pool->stat.n_imported);
+ pa_atomic_sub(&b->pool->stat.imported_size, b->length);
}
- AO_fetch_and_sub1_release_write(&b->pool->stat.n_allocated_by_type[b->type]);
+ pa_atomic_dec(&b->pool->stat.n_allocated_by_type[b->type]);
}
static pa_memblock *memblock_new_appended(pa_mempool *p, size_t length);
@@ -193,7 +193,7 @@ static struct mempool_slot* mempool_allocate_slot(pa_mempool *p) {
slot = (struct mempool_slot*) ((uint8_t*) p->memory.ptr + (p->block_size * p->n_init++));
else {
pa_log_debug("Pool full");
- AO_fetch_and_add1_release_write(&p->stat.n_pool_full);
+ pa_atomic_inc(&p->stat.n_pool_full);
return NULL;
}
@@ -249,7 +249,7 @@ pa_memblock *pa_memblock_new_pool(pa_mempool *p, size_t length) {
b->data = mempool_slot_data(slot);
} else {
pa_log_debug("Memory block too large for pool: %u > %u", length, p->block_size - sizeof(struct mempool_slot));
- AO_fetch_and_add1_release_write(&p->stat.n_too_large_for_pool);
+ pa_atomic_inc(&p->stat.n_too_large_for_pool);
return NULL;
}
@@ -372,7 +372,7 @@ void pa_memblock_unref(pa_memblock*b) {
static void memblock_make_local(pa_memblock *b) {
assert(b);
- AO_fetch_and_sub1_release_write(&b->pool->stat.n_allocated_by_type[b->type]);
+ pa_atomic_dec(&b->pool->stat.n_allocated_by_type[b->type]);
if (b->length <= b->pool->block_size - sizeof(struct mempool_slot)) {
struct mempool_slot *slot;
@@ -398,8 +398,8 @@ static void memblock_make_local(pa_memblock *b) {
b->data = pa_xmemdup(b->data, b->length);
finish:
- AO_fetch_and_add1_release_write(&b->pool->stat.n_allocated_by_type[b->type]);
- AO_fetch_and_add1_release_write(&b->pool->stat.n_accumulated_by_type[b->type]);
+ pa_atomic_inc(&b->pool->stat.n_allocated_by_type[b->type]);
+ pa_atomic_inc(&b->pool->stat.n_accumulated_by_type[b->type]);
}
void pa_memblock_unref_fixed(pa_memblock *b) {
@@ -419,10 +419,10 @@ static void memblock_replace_import(pa_memblock *b) {
assert(b);
assert(b->type == PA_MEMBLOCK_IMPORTED);
- assert(AO_load_acquire_read(&b->pool->stat.n_imported) > 0);
- assert(AO_load_acquire_read(&b->pool->stat.imported_size) >= (AO_t) b->length);
- AO_fetch_and_sub1_release_write(&b->pool->stat.n_imported);
- AO_fetch_and_add_release_write(&b->pool->stat.imported_size, (AO_t) - b->length);
+ assert(pa_atomic_load(&b->pool->stat.n_imported) > 0);
+ assert(pa_atomic_load(&b->pool->stat.imported_size) >= (int) b->length);
+ pa_atomic_dec(&b->pool->stat.n_imported);
+ pa_atomic_sub(&b->pool->stat.imported_size, b->length);
seg = b->per_type.imported.segment;
assert(seg);
@@ -486,7 +486,7 @@ void pa_mempool_free(pa_mempool *p) {
while (p->exports)
pa_memexport_free(p->exports);
- if (AO_load_acquire_read(&p->stat.n_allocated) > 0)
+ if (pa_atomic_load(&p->stat.n_allocated) > 0)
pa_log_warn("WARNING! Memory pool destroyed but not all memory blocks freed!");
pa_shm_free(&p->memory);
@@ -684,11 +684,11 @@ int pa_memexport_process_release(pa_memexport *e, uint32_t id) {
/* pa_log("Processing release for %u", id); */
- assert(AO_load_acquire_read(&e->pool->stat.n_exported) > 0);
- assert(AO_load_acquire_read(&e->pool->stat.exported_size) >= (AO_t) e->slots[id].block->length);
+ assert(pa_atomic_load(&e->pool->stat.n_exported) > 0);
+ assert(pa_atomic_load(&e->pool->stat.exported_size) >= (int) e->slots[id].block->length);
- AO_fetch_and_sub1_release_write(&e->pool->stat.n_exported);
- AO_fetch_and_add_release_write(&e->pool->stat.exported_size, (AO_t) -e->slots[id].block->length);
+ pa_atomic_dec(&e->pool->stat.n_exported);
+ pa_atomic_sub(&e->pool->stat.exported_size, e->slots[id].block->length);
pa_memblock_unref(e->slots[id].block);
e->slots[id].block = NULL;
@@ -785,8 +785,8 @@ int pa_memexport_put(pa_memexport *e, pa_memblock *b, uint32_t *block_id, uint32
*offset = (uint8_t*) b->data - (uint8_t*) memory->ptr;
*size = b->length;
- AO_fetch_and_add1_release_write(&e->pool->stat.n_exported);
- AO_fetch_and_add_release_write(&e->pool->stat.exported_size, (AO_t) b->length);
+ pa_atomic_inc(&e->pool->stat.n_exported);
+ pa_atomic_add(&e->pool->stat.exported_size, b->length);
return 0;
}
diff --git a/src/pulsecore/memblock.h b/src/pulsecore/memblock.h
index 3eace92c..fe4773d4 100644
--- a/src/pulsecore/memblock.h
+++ b/src/pulsecore/memblock.h
@@ -30,6 +30,7 @@
#include <pulsecore/llist.h>
#include <pulsecore/refcnt.h>
+#include <pulsecore/atomic.h>
/* A pa_memblock is a reference counted memory block. PulseAudio
* passed references to pa_memblocks around instead of copying
@@ -82,20 +83,20 @@ struct pa_memblock {
* n_accumulated is not yet. Take these values with a grain of salt,
* threy are here for purely statistical reasons.*/
struct pa_mempool_stat {
- AO_t n_allocated;
- AO_t n_accumulated;
- AO_t n_imported;
- AO_t n_exported;
- AO_t allocated_size;
- AO_t accumulated_size;
- AO_t imported_size;
- AO_t exported_size;
-
- AO_t n_too_large_for_pool;
- AO_t n_pool_full;
-
- AO_t n_allocated_by_type[PA_MEMBLOCK_TYPE_MAX];
- AO_t n_accumulated_by_type[PA_MEMBLOCK_TYPE_MAX];
+ pa_atomic_int_t n_allocated;
+ pa_atomic_int_t n_accumulated;
+ pa_atomic_int_t n_imported;
+ pa_atomic_int_t n_exported;
+ pa_atomic_int_t allocated_size;
+ pa_atomic_int_t accumulated_size;
+ pa_atomic_int_t imported_size;
+ pa_atomic_int_t exported_size;
+
+ pa_atomic_int_t n_too_large_for_pool;
+ pa_atomic_int_t n_pool_full;
+
+ pa_atomic_int_t n_allocated_by_type[PA_MEMBLOCK_TYPE_MAX];
+ pa_atomic_int_t n_accumulated_by_type[PA_MEMBLOCK_TYPE_MAX];
};
/* Allocate a new memory block of type PA_MEMBLOCK_MEMPOOL or PA_MEMBLOCK_APPENDED, depending on the size */
diff --git a/src/pulsecore/protocol-native.c b/src/pulsecore/protocol-native.c
index 774f6918..dbdb7dd4 100644
--- a/src/pulsecore/protocol-native.c
+++ b/src/pulsecore/protocol-native.c
@@ -1116,10 +1116,10 @@ static void command_stat(PA_GCC_UNUSED pa_pdispatch *pd, PA_GCC_UNUSED uint32_t
stat = pa_mempool_get_stat(c->protocol->core->mempool);
reply = reply_new(tag);
- pa_tagstruct_putu32(reply, (uint32_t) AO_load_acquire_read((AO_t*) &stat->n_allocated));
- pa_tagstruct_putu32(reply, (uint32_t) AO_load_acquire_read((AO_t*) &stat->allocated_size));
- pa_tagstruct_putu32(reply, (uint32_t) AO_load_acquire_read((AO_t*) &stat->n_accumulated));
- pa_tagstruct_putu32(reply, (uint32_t) AO_load_acquire_read((AO_t*) &stat->accumulated_size));
+ pa_tagstruct_putu32(reply, (uint32_t) pa_atomic_load(&stat->n_allocated));
+ pa_tagstruct_putu32(reply, (uint32_t) pa_atomic_load(&stat->allocated_size));
+ pa_tagstruct_putu32(reply, (uint32_t) pa_atomic_load(&stat->n_accumulated));
+ pa_tagstruct_putu32(reply, (uint32_t) pa_atomic_load(&stat->accumulated_size));
pa_tagstruct_putu32(reply, pa_scache_total_size(c->protocol->core));
pa_pstream_send_tagstruct(c->pstream, reply);
}
diff --git a/src/tests/memblock-test.c b/src/tests/memblock-test.c
index 13bfdf0d..8d25ba38 100644
--- a/src/tests/memblock-test.c
+++ b/src/tests/memblock-test.c
@@ -46,24 +46,24 @@ static void print_stats(pa_mempool *p, const char *text) {
"n_accumulated = %u\n"
"n_imported = %u\n"
"n_exported = %u\n"
- "allocated_size = %lu\n"
- "accumulated_size = %lu\n"
- "imported_size = %lu\n"
- "exported_size = %lu\n"
+ "allocated_size = %u\n"
+ "accumulated_size = %u\n"
+ "imported_size = %u\n"
+ "exported_size = %u\n"
"n_too_large_for_pool = %u\n"
"n_pool_full = %u\n"
"}\n",
text,
- (unsigned) AO_load_acquire_read((AO_t*) &s->n_allocated),
- (unsigned) AO_load_acquire_read((AO_t*) &s->n_accumulated),
- (unsigned) AO_load_acquire_read((AO_t*) &s->n_imported),
- (unsigned) AO_load_acquire_read((AO_t*) &s->n_exported),
- (unsigned long) AO_load_acquire_read((AO_t*) &s->allocated_size),
- (unsigned long) AO_load_acquire_read((AO_t*) &s->accumulated_size),
- (unsigned long) AO_load_acquire_read((AO_t*) &s->imported_size),
- (unsigned long) AO_load_acquire_read((AO_t*) &s->exported_size),
- (unsigned) AO_load_acquire_read((AO_t*) &s->n_too_large_for_pool),
- (unsigned) AO_load_acquire_read((AO_t*) &s->n_pool_full));
+ (unsigned) pa_atomic_load(&s->n_allocated),
+ (unsigned) pa_atomic_load(&s->n_accumulated),
+ (unsigned) pa_atomic_load(&s->n_imported),
+ (unsigned) pa_atomic_load(&s->n_exported),
+ (unsigned) pa_atomic_load(&s->allocated_size),
+ (unsigned) pa_atomic_load(&s->accumulated_size),
+ (unsigned) pa_atomic_load(&s->imported_size),
+ (unsigned) pa_atomic_load(&s->exported_size),
+ (unsigned) pa_atomic_load(&s->n_too_large_for_pool),
+ (unsigned) pa_atomic_load(&s->n_pool_full));
}
int main(int argc, char *argv[]) {
generated by cgit (git 2.34.1) at 2025-10-31 15:10:48 +0000