github.com/simh.simh
1
0
Fork 0
mirror of https://github.com/simh/simh.git synced 2026-04-28 20:57:26 +00:00
Code Releases Activity

SHMEM: Fix Linux code to properly use built-in's and cleanup on shutdown

Browse Source 
As reported in #909
This commit is contained in:
Mark Pizzolato
2020-09-15 14:31:03 -07:00
parent 02f97392d4
commit 29b0e7f121
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sim_shmem.c
View File

@@ -1,6 +1,6 @@
/* sim_shmem.c: simulator shared memory library /* sim_shmem.c: simulator shared memory library
Copyright (c) 2015-2016, Robert M Supnik Copyright (c) 2015-2020, Robert M Supnik
Permission is hereby granted, free of charge, to any person obtaining a Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"), copy of this software and associated documentation files (the "Software"),
@@ -134,7 +134,7 @@ struct SHMEM {
t_stat sim_shmem_open (const char *name, size_t size, SHMEM **shmem, void **addr) t_stat sim_shmem_open (const char *name, size_t size, SHMEM **shmem, void **addr)
{ {
#ifdef HAVE_SHM_OPEN #if defined (HAVE_SHM_OPEN) && defined (__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4)
*shmem = (SHMEM *)calloc (1, sizeof(**shmem)); *shmem = (SHMEM *)calloc (1, sizeof(**shmem));
mode_t orig_mask; mode_t orig_mask;
@@ -191,25 +191,30 @@ if ((*shmem)->shm_base == MAP_FAILED) {
*addr = (*shmem)->shm_base; *addr = (*shmem)->shm_base;
return SCPE_OK; return SCPE_OK;
#else #else
*shmem = NULL;
return SCPE_NOFNC; return SCPE_NOFNC;
#endif #endif
} }
void sim_shmem_close (SHMEM *shmem) void sim_shmem_close (SHMEM *shmem)
{ {
#if defined (HAVE_SHM_OPEN)
if (shmem == NULL) if (shmem == NULL)
return; return;
if (shmem->shm_base != MAP_FAILED) if (shmem->shm_base != MAP_FAILED)
munmap (shmem->shm_base, shmem->shm_size); munmap (shmem->shm_base, shmem->shm_size);
if (shmem->shm_fd != -1) if (shmem->shm_fd != -1) {
shm_unlink (shmem->shm_name);
close (shmem->shm_fd); close (shmem->shm_fd);
}
free (shmem->shm_name); free (shmem->shm_name);
free (shmem); free (shmem);
#endif
} }
int32 sim_shmem_atomic_add (int32 *p, int32 v) int32 sim_shmem_atomic_add (int32 *p, int32 v)
{ {
#if defined (HAVE_GCC_SYNC_BUILTINS) #if defined (__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4)
return __sync_add_and_fetch((int *) p, v); return __sync_add_and_fetch((int *) p, v);
#else #else
return *p + v; return *p + v;
@@ -218,7 +223,7 @@ return *p + v;
t_bool sim_shmem_atomic_cas (int32 *ptr, int32 oldv, int32 newv) t_bool sim_shmem_atomic_cas (int32 *ptr, int32 oldv, int32 newv)
{ {
#if defined (HAVE_GCC_SYNC_BUILTINS) #if defined (__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4)
return __sync_bool_compare_and_swap (ptr, oldv, newv); return __sync_bool_compare_and_swap (ptr, oldv, newv);
#else #else
if (*ptr == oldv) { if (*ptr == oldv) {