diff options
| author | Stefan Metzmacher <metze@samba.org> | 2012-07-25 08:33:31 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2012-07-25 12:15:01 +0200 |
| commit | e0bc1650805159645ae2217a81fbf92d656f0e34 (patch) | |
| tree | 8af07cd4b67c6fbcdd72b928b1b7e70ba72e6ffc | |
| parent | c66a45d3f29570a907ef1f9a3e499eb19e804e7e (diff) | |
| download | samba-e0bc1650805159645ae2217a81fbf92d656f0e34.tar.gz samba-e0bc1650805159645ae2217a81fbf92d656f0e34.tar.bz2 samba-e0bc1650805159645ae2217a81fbf92d656f0e34.zip | |
s3:torture: replace shm_setup() with anonymous_shared_allocate()
metze
| -rw-r--r-- | source3/torture/nbio.c | 2 | ||||
| -rw-r--r-- | source3/torture/torture.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source3/torture/nbio.c b/source3/torture/nbio.c index 4cf4cc7549..0c918c11ba 100644 --- a/source3/torture/nbio.c +++ b/source3/torture/nbio.c @@ -76,7 +76,7 @@ void nb_alarm(int ignore) void nbio_shmem(int n) { nprocs = n; - children = (struct children *)shm_setup(sizeof(*children) * nprocs); + children = (struct children *)anonymous_shared_allocate(sizeof(*children) * nprocs); if (!children) { printf("Failed to setup shared memory!\n"); exit(1); diff --git a/source3/torture/torture.c b/source3/torture/torture.c index a9edd61520..ca72f5e963 100644 --- a/source3/torture/torture.c +++ b/source3/torture/torture.c @@ -3555,7 +3555,7 @@ static bool run_oplock2(int dummy) size_t nread; NTSTATUS status; - shared_correct = (volatile bool *)shm_setup(sizeof(bool)); + shared_correct = (volatile bool *)anonymous_shared_allocate(sizeof(bool)); *shared_correct = True; use_level_II_oplocks = True; @@ -8871,13 +8871,13 @@ static double create_procs(bool (*fn)(int), bool *result) synccount = 0; - child_status = (volatile pid_t *)shm_setup(sizeof(pid_t)*torture_nprocs); + child_status = (volatile pid_t *)anonymous_shared_allocate(sizeof(pid_t)*torture_nprocs); if (!child_status) { printf("Failed to setup shared memory\n"); return -1; } - child_status_out = (volatile bool *)shm_setup(sizeof(bool)*torture_nprocs); + child_status_out = (volatile bool *)anonymous_shared_allocate(sizeof(bool)*torture_nprocs); if (!child_status_out) { printf("Failed to setup result status shared memory\n"); return -1; |