Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Added an atomic.h header that provides a C++ file with a templatized

Browse Source 
64-bit safe version of atomic_test_and_set() for pointers:
  atomic_pointer_test_and_set().
* The VFS is now using this function (it's not used anywhere else in the
  kernel this way).


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@25260 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2008-04-29 21:05:05 +00:00
parent 8e4941e810
commit b1d749f8f1
2 changed files with 50 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
headers/private/kernel/util/atomic.h Normal file
View File

@ -0,0 +1,31 @@
/*
* Copyright 2008, Axel Dörfler, axeld@pinc-software.de.
* Distributed under the terms of the MIT License.
*/
#ifndef _KERNEL_UTIL_ATOMIC_H
#define _KERNEL_UTIL_ATOMIC_H
#include <limits.h>
#include <SupportDefs.h>
#ifdef __cplusplus
template<typename PointerType> PointerType*
atomic_pointer_test_and_set(PointerType** _pointer, PointerType* set,
PointerType* test)
{
#if LONG_MAX == INT_MAX
return (PointerType*)atomic_test_and_set((vint32*)_pointer, (int32)set,
(int32)test);
#else
return (PointerType*)atomic_test_and_set64((vint64*)_pointer, (int64)set,
(int64)test);
#endif
}
#endif // __cplusplus
#endif /* _KERNEL_UTIL_ATOMIC_H */

39
src/system/kernel/fs/vfs.cpp
View File

@ -27,27 +27,26 @@
#include <OS.h>
#include <StorageDefs.h>
#include <util/AutoLock.h>
#include <block_cache.h>
#include <fd.h>
#include <file_cache.h>
#include <khash.h>
#include <KPath.h>
#include <lock.h>
#include <syscalls.h>
#include <syscall_restart.h>
#include <vfs.h>
#include <vm.h>
#include <vm_cache.h>
#include <vm_low_memory.h>
#include <boot/kernel_args.h>
#include <disk_device_manager/KDiskDevice.h>
#include <disk_device_manager/KDiskDeviceManager.h>
#include <disk_device_manager/KDiskDeviceUtils.h>
#include <disk_device_manager/KDiskSystem.h>
#include <fd.h>
#include <file_cache.h>
#include <fs/node_monitor.h>
#include <khash.h>
#include <KPath.h>
#include <lock.h>
#include <syscalls.h>
#include <syscall_restart.h>
#include <util/AutoLock.h>
#include <util/atomic.h>
#include <vfs.h>
#include <vm.h>
#include <vm_cache.h>
#include <vm_low_memory.h>
#include "fifo.h"
@ -1144,8 +1143,8 @@ create_advisory_locking(struct vnode *vnode)
// We need to set the locking structure atomically - someone
// else might set one at the same time
do {
if (atomic_test_and_set((vint32 *)&vnode->advisory_locking,
(addr_t)locking, (addr_t)NULL) == (addr_t)NULL)
if (atomic_pointer_test_and_set(&vnode->advisory_locking, locking,
(advisory_locking*)NULL) == NULL)
return B_OK;
} while (get_advisory_locking(vnode) == NULL);
@ -5309,8 +5308,8 @@ common_lock_node(int fd, bool kernel)
// We need to set the locking atomically - someone
// else might set one at the same time
if (atomic_test_and_set((vint32 *)&vnode->mandatory_locked_by,
(addr_t)descriptor, (addr_t)NULL) != (addr_t)NULL)
if (atomic_pointer_test_and_set(&vnode->mandatory_locked_by, descriptor,
(file_descriptor*)NULL) != NULL)
status = B_BUSY;
put_fd(descriptor);
@ -5332,8 +5331,8 @@ common_unlock_node(int fd, bool kernel)
// We need to set the locking atomically - someone
// else might set one at the same time
if (atomic_test_and_set((vint32 *)&vnode->mandatory_locked_by,
(addr_t)NULL, (addr_t)descriptor) != (int32)descriptor)
if (atomic_pointer_test_and_set(&vnode->mandatory_locked_by,
(file_descriptor*)NULL, descriptor) != descriptor)
status = B_BAD_VALUE;
put_fd(descriptor);