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

Renamed node_monitor.c to node_monitor.cpp and fixed implicit conversions from void*.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@11155 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold 2005-01-30 14:09:01 +00:00
parent 0bd6021a12
commit 3424c4fea4
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/kernel/core/fs/Jamfile
View File

@ -14,7 +14,7 @@ KernelMergeObject kernel_fs.o :
vfs.cpp vfs.cpp
vfs_select.c vfs_select.c
message.c message.c
node_monitor.c node_monitor.cpp
IOScheduler.cpp IOScheduler.cpp
KPath.cpp KPath.cpp

29
src/kernel/core/fs/node_monitor.c → src/kernel/core/fs/node_monitor.cpp
View File

@ -66,8 +66,8 @@ static mutex gMonitorMutex;
static int static int
monitor_compare(void *_monitor, const void *_key) monitor_compare(void *_monitor, const void *_key)
{ {
node_monitor *monitor = _monitor; node_monitor *monitor = (node_monitor*)_monitor;
const struct monitor_hash_key *key = _key; const struct monitor_hash_key *key = (const struct monitor_hash_key*)_key;
if (monitor->device == key->device && monitor->node == key->node) if (monitor->device == key->device && monitor->node == key->node)
return 0; return 0;
@ -79,8 +79,8 @@ monitor_compare(void *_monitor, const void *_key)
static uint32 static uint32
monitor_hash(void *_monitor, const void *_key, uint32 range) monitor_hash(void *_monitor, const void *_key, uint32 range)
{ {
node_monitor *monitor = _monitor; node_monitor *monitor = (node_monitor*)_monitor;
const struct monitor_hash_key *key = _key; const struct monitor_hash_key *key = (const struct monitor_hash_key*)_key;
#define MHASH(device, node) (((uint32)((node) >> 32) + (uint32)(node)) ^ (uint32)(device)) #define MHASH(device, node) (((uint32)((node) >> 32) + (uint32)(node)) ^ (uint32)(device))
@ -116,7 +116,8 @@ get_listener_for(node_monitor *monitor, port_id port, uint32 token)
{ {
monitor_listener *listener = NULL; monitor_listener *listener = NULL;
while ((listener = list_get_next_item(&monitor->listeners, listener)) != NULL) { while ((listener = (monitor_listener*)list_get_next_item(
&monitor->listeners, listener)) != NULL) {
// does this listener match? // does this listener match?
if (listener->port == port && listener->token == token) if (listener->port == port && listener->token == token)
return listener; return listener;
@ -295,13 +296,15 @@ remove_node_monitors_by_target(struct io_context *context, port_id port, uint32
monitor_listener *listener = NULL; monitor_listener *listener = NULL;
int32 count = 0; int32 count = 0;
while ((listener = list_get_next_item(&context->node_monitors, listener)) != NULL) { while ((listener = (monitor_listener*)list_get_next_item(
&context->node_monitors, listener)) != NULL) {
monitor_listener *removeListener; monitor_listener *removeListener;
if (listener->port != port || listener->token != token) if (listener->port != port || listener->token != token)
continue; continue;
listener = list_get_prev_item(&context->node_monitors, removeListener = listener); listener = (monitor_listener*)list_get_prev_item(
&context->node_monitors, removeListener = listener);
// this line sets the listener one item back, allowing us // this line sets the listener one item back, allowing us
// to remove its successor (which is saved in "removeListener") // to remove its successor (which is saved in "removeListener")
@ -325,7 +328,8 @@ remove_node_monitors(struct io_context *context)
while (!list_is_empty(&context->node_monitors)) { while (!list_is_empty(&context->node_monitors)) {
// the remove_listener() function will also free the node_monitor // the remove_listener() function will also free the node_monitor
// if it doesn't have any listeners attached anymore // if it doesn't have any listeners attached anymore
remove_listener(list_get_first_item(&context->node_monitors)); remove_listener(
(monitor_listener*)list_get_first_item(&context->node_monitors));
} }
mutex_unlock(&gMonitorMutex); mutex_unlock(&gMonitorMutex);
@ -435,7 +439,8 @@ notify_listener(int op, mount_id device, vnode_id parentNode, vnode_id toParentN
// iterate over all listeners for this monitor, and see // iterate over all listeners for this monitor, and see
// if we have to send anything // if we have to send anything
listener = NULL; listener = NULL;
while ((listener = list_get_next_item(&monitor->listeners, listener)) != NULL) { while ((listener = (monitor_listener*)list_get_next_item(
&monitor->listeners, listener)) != NULL) {
// do we have a reason to notify this listener? // do we have a reason to notify this listener?
if (((listener->flags & B_WATCH_NAME) != 0 if (((listener->flags & B_WATCH_NAME) != 0
&& (op == B_ENTRY_MOVED || op == B_ENTRY_REMOVED)) && (op == B_ENTRY_MOVED || op == B_ENTRY_REMOVED))
@ -459,7 +464,8 @@ notify_listener(int op, mount_id device, vnode_id parentNode, vnode_id toParentN
// iterate over all listeners for this monitor, and see // iterate over all listeners for this monitor, and see
// if we have to send anything // if we have to send anything
listener = NULL; listener = NULL;
while ((listener = list_get_next_item(&monitor->listeners, listener)) != NULL) { while ((listener = (monitor_listener*)list_get_next_item(
&monitor->listeners, listener)) != NULL) {
// do we have a reason to notify this listener? // do we have a reason to notify this listener?
if ((listener->flags & B_WATCH_DIRECTORY) != 0) { if ((listener->flags & B_WATCH_DIRECTORY) != 0) {
send_notification(listener->port, listener->token, B_NODE_MONITOR, send_notification(listener->port, listener->token, B_NODE_MONITOR,
@ -475,7 +481,8 @@ notify_listener(int op, mount_id device, vnode_id parentNode, vnode_id toParentN
// iterate over all listeners for this monitor, and see // iterate over all listeners for this monitor, and see
// if we have to send anything // if we have to send anything
listener = NULL; listener = NULL;
while ((listener = list_get_next_item(&monitor->listeners, listener)) != NULL) { while ((listener = (monitor_listener*)list_get_next_item(
&monitor->listeners, listener)) != NULL) {
// do we have a reason to notify this listener? // do we have a reason to notify this listener?
if ((listener->flags & B_WATCH_DIRECTORY) != 0) { if ((listener->flags & B_WATCH_DIRECTORY) != 0) {
send_notification(listener->port, listener->token, B_NODE_MONITOR, send_notification(listener->port, listener->token, B_NODE_MONITOR,