Added DEBUG_INIT() categories.

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@3241 a95241bf-73f2-0310-859d-f6bbb57e9c96

src/add-ons/kernel/file_systems/udf/Volume.cpp

@@ -41,7 +41,7 @@ status_t
 Volume::Mount(const char *deviceName, off_t volumeStart, off_t volumeLength,
               uint32 flags, uint32 blockSize)
 {
-	DEBUG_INIT();
+	DEBUG_INIT(CF_PUBLIC | CF_VOLUME_OPS);
 	if (!deviceName)
 		RETURN_ERROR(B_BAD_VALUE);
 	if (_InitStatus() == B_INITIALIZED)
@@ -95,13 +95,13 @@ Volume::Mount(const char *deviceName, off_t volumeStart, off_t volumeLength,
 status_t
 Volume::_Identify()
 {
-	DEBUG_INIT();
+	DEBUG_INIT(CF_PRIVATE | CF_VOLUME_OPS);
 	
 	status_t err = _InitStatus() == B_DEVICE_INITIALIZED ? B_OK : B_BAD_VALUE;
 
 	// Check for a valid volume recognition sequence
 	if (!err)
-		err = _WalkVolumeRecognitionSequence();	
+		err = _WalkVolumeRecognitionSequence();
 	
 	// Now hunt down a volume descriptor sequence from one of
 	// the anchor volume pointers (if there are any).
@@ -126,7 +126,7 @@ Volume::_Identify()
 status_t
 Volume::_WalkVolumeRecognitionSequence()
 {
-	DEBUG_INIT();
+	DEBUG_INIT(CF_PRIVATE | CF_VOLUME_OPS);
 	// vrs starts at block 16. Each volume structure descriptor (vsd)
 	// should be one block long. We're expecting to find 0 or more iso9660
 	// vsd's followed by some ECMA-167 vsd's.
@@ -189,7 +189,7 @@ Volume::_WalkVolumeRecognitionSequence()
 status_t
 Volume::_WalkVolumeDescriptorSequence(off_t start)
 {
-	DEBUG_INIT();
+	DEBUG_INIT(CF_PRIVATE | CF_VOLUME_OPS);
 	
 	RETURN(B_ERROR);
 }

src/add-ons/kernel/file_systems/udf/vfs_interface.cpp

@@ -234,7 +234,7 @@ int
 udf_mount(nspace_id nsid, const char *deviceName, ulong flags, void *parms,
 		size_t parmsLength, void **volumeCookie, vnode_id *rootID)
 {
-	DEBUG_INIT();
+	DEBUG_INIT(CF_ENTRY | CF_VOLUME_OPS);
 
 	status_t err = B_OK;
 	off_t deviceSize = 0;	// in blocks
@@ -279,7 +279,7 @@ udf_mount(nspace_id nsid, const char *deviceName, ulong flags, void *parms,
 int
 udf_unmount(void *ns)
 {
-	DEBUG_INIT();
+	DEBUG_INIT(CF_ENTRY | CF_VOLUME_OPS);
 	return B_OK;	
 }
 
@@ -287,7 +287,7 @@ udf_unmount(void *ns)
 int
 udf_read_fs_stat(void *ns, struct fs_info *info)
 {
-	DEBUG_INIT();
+	DEBUG_INIT(CF_ENTRY | CF_VOLUME_OPS);
 	return B_ERROR;
 }
 
@@ -295,6 +295,7 @@ udf_read_fs_stat(void *ns, struct fs_info *info)
 int
 udf_write_fs_stat(void *ns, struct fs_info *info, long mask)
 {
+	DEBUG_INIT(CF_ENTRY | CF_VOLUME_OPS);
 	// FUNCTION_START(("mask = %ld\n",mask));
 	return B_ERROR;
 }
@@ -303,6 +304,7 @@ udf_write_fs_stat(void *ns, struct fs_info *info, long mask)
 int 
 udf_initialize(const char *deviceName, void *parms, size_t parmsLength)
 {
+	DEBUG_INIT(CF_ENTRY | CF_VOLUME_OPS);
 	// FUNCTION_START(("deviceName = %s, parameter len = %ld\n", deviceName, parmsLength));
 	return B_ERROR;
 }
@@ -311,7 +313,7 @@ udf_initialize(const char *deviceName, void *parms, size_t parmsLength)
 int 
 udf_sync(void *ns)
 {
-	DEBUG_INIT();
+	DEBUG_INIT(CF_ENTRY | CF_VOLUME_OPS);
 	return B_OK;
 }
 
@@ -319,7 +321,7 @@ udf_sync(void *ns)
 int
 udf_read_vnode(void *ns, vnode_id id, char reenter, void **node)
 {
-	dprintf("read_vnode\n");
+	DEBUG_INIT(CF_ENTRY | CF_VOLUME_OPS);
 	// FUNCTION_START(("vnode_id = %lld\n", id));
 
 	if (id == 1) {
@@ -333,6 +335,7 @@ udf_read_vnode(void *ns, vnode_id id, char reenter, void **node)
 int
 udf_release_vnode(void *ns, void *node, char reenter)
 {
+	DEBUG_INIT(CF_ENTRY | CF_VOLUME_OPS);
 	// FUNCTION_START(("node = %p\n",node));
 	return B_ERROR;
 }
@@ -341,7 +344,7 @@ udf_release_vnode(void *ns, void *node, char reenter)
 int 
 udf_remove_vnode(void *ns, void *node, char reenter)
 {
-	DEBUG_INIT();
+	DEBUG_INIT(CF_ENTRY | CF_VOLUME_OPS);
 	return B_ERROR;
 }
 
@@ -349,7 +352,7 @@ udf_remove_vnode(void *ns, void *node, char reenter)
 int
 udf_wake_vnode(void *ns, void *node)
 {
-	DEBUG_INIT();
+	DEBUG_INIT(CF_ENTRY | CF_VOLUME_OPS);
 	return B_ERROR;
 }
 
@@ -357,7 +360,7 @@ udf_wake_vnode(void *ns, void *node)
 int
 udf_suspend_vnode(void *ns, void *node)
 {
-	DEBUG_INIT();
+	DEBUG_INIT(CF_ENTRY | CF_VOLUME_OPS);
 	return B_ERROR;
 }
 
@@ -365,6 +368,7 @@ udf_suspend_vnode(void *ns, void *node)
 int
 udf_walk(void *ns, void *dir, const char *filename, char **resolvedPath, vnode_id *vnodeID)
 {
+	DEBUG_INIT(CF_ENTRY | CF_VOLUME_OPS);
 	// FUNCTION_START(("dir = %p, filename = `%s'\n", dir, filename));
 	return B_ERROR;
 }
@@ -373,6 +377,7 @@ udf_walk(void *ns, void *dir, const char *filename, char **resolvedPath, vnode_i
 int 
 udf_ioctl(void *ns, void *node, void *cookie, int cmd, void *buffer, size_t bufferLength)
 {
+	DEBUG_INIT(CF_ENTRY | CF_VOLUME_OPS);
 	// FUNCTION_START(("node = %p, cmd = %d, buf = %p, len = %ld\n", node, cmd, buffer, bufferLength));
 	return B_ERROR;
 }
@@ -381,6 +386,7 @@ udf_ioctl(void *ns, void *node, void *cookie, int cmd, void *buffer, size_t buff
 int 
 udf_setflags(void *ns, void *node, void *cookie, int flags)
 {
+	DEBUG_INIT(CF_ENTRY | CF_VOLUME_OPS);
 	// FUNCTION_START(("node = %p, flags = %d", node, flags));
 	return B_ERROR;
 }
@@ -389,6 +395,7 @@ udf_setflags(void *ns, void *node, void *cookie, int flags)
 int 
 udf_select(void *ns, void *node, void *cookie, uint8 event, uint32 ref, selectsync *sync)
 {
+	DEBUG_INIT(CF_ENTRY | CF_VOLUME_OPS);
 	// FUNCTION_START(("event = %d, ref = %lu, sync = %p\n", event, ref, sync));
 	return B_ERROR;
 }
@@ -397,7 +404,7 @@ udf_select(void *ns, void *node, void *cookie, uint8 event, uint32 ref, selectsy
 int 
 udf_deselect(void *ns, void *node, void *cookie, uint8 event, selectsync *sync)
 {
-	DEBUG_INIT();
+	DEBUG_INIT(CF_ENTRY | CF_VOLUME_OPS);
 	return B_ERROR;
 }
 
@@ -405,7 +412,7 @@ udf_deselect(void *ns, void *node, void *cookie, uint8 event, selectsync *sync)
 int 
 udf_fsync(void *_ns, void *_node)
 {
-	DEBUG_INIT();
+	DEBUG_INIT(CF_ENTRY | CF_VOLUME_OPS);
 	return B_ERROR;
 }
 
@@ -413,7 +420,7 @@ udf_fsync(void *_ns, void *_node)
 int
 udf_read_stat(void *ns, void *node, struct stat *st)
 {
-	DEBUG_INIT();
+	DEBUG_INIT(CF_ENTRY | CF_VOLUME_OPS);
 	return B_ERROR;
 }
 
@@ -421,7 +428,7 @@ udf_read_stat(void *ns, void *node, struct stat *st)
 int 
 udf_write_stat(void *ns, void *node, struct stat *stat, long mask)
 {
-	DEBUG_INIT();
+	DEBUG_INIT(CF_ENTRY | CF_VOLUME_OPS);
 	return B_ERROR;
 }
 
@@ -435,6 +442,7 @@ int
 udf_create(void *ns, void *dir, const char *name, int omode, int mode,
 	vnode_id *newID, void **newNode)
 {
+	DEBUG_INIT(CF_ENTRY | CF_FILE_OPS);
 	// FUNCTION_START(("name = \"%s\", perms = %d, omode = %d\n", name, mode, omode));
 	return B_ERROR;
 }
@@ -443,7 +451,7 @@ udf_create(void *ns, void *dir, const char *name, int omode, int mode,
 int 
 udf_symlink(void *ns, void *dir, const char *name, const char *path)
 {
-	DEBUG_INIT();
+	DEBUG_INIT(CF_ENTRY | CF_FILE_OPS);
 	return B_ERROR;
 }
 
@@ -451,6 +459,7 @@ udf_symlink(void *ns, void *dir, const char *name, const char *path)
 int 
 udf_link(void *ns, void *dir, const char *name, void *node)
 {
+	DEBUG_INIT(CF_ENTRY | CF_FILE_OPS);
 	// FUNCTION_START(("name = \"%s\"\n", name));
 	return B_ERROR;
 }
@@ -459,6 +468,7 @@ udf_link(void *ns, void *dir, const char *name, void *node)
 int 
 udf_unlink(void *ns, void *dir, const char *name)
 {
+	DEBUG_INIT(CF_ENTRY | CF_FILE_OPS);
 	// FUNCTION_START(("name = \"%s\"\n",name));
 	return B_ERROR;
 }
@@ -467,6 +477,7 @@ udf_unlink(void *ns, void *dir, const char *name)
 int 
 udf_rename(void *ns, void *oldDir, const char *oldName, void *newDir, const char *newName)
 {
+	DEBUG_INIT(CF_ENTRY | CF_FILE_OPS);
 	// FUNCTION_START(("oldDir = %p, oldName = \"%s\", newDir = %p, newName = \"%s\"\n", oldDir, oldName, newDir, newName));
 	return B_ERROR;
 }
@@ -474,14 +485,14 @@ udf_rename(void *ns, void *oldDir, const char *oldName, void *newDir, const char
 int
 udf_open(void *_ns, void *_node, int omode, void **_cookie)
 {
-	DEBUG_INIT();
+	DEBUG_INIT(CF_ENTRY | CF_FILE_OPS);
 	return B_ERROR;
 }
 
 int
 udf_read(void *_ns, void *_node, void *_cookie, off_t pos, void *buffer, size_t *_length)
 {
-	DEBUG_INIT();
+	DEBUG_INIT(CF_ENTRY | CF_FILE_OPS);
 	return B_ERROR;
 }
 
@@ -489,7 +500,7 @@ udf_read(void *_ns, void *_node, void *_cookie, off_t pos, void *buffer, size_t
 int 
 udf_write(void *_ns, void *_node, void *_cookie, off_t pos, const void *buffer, size_t *_length)
 {
-	DEBUG_INIT();
+	DEBUG_INIT(CF_ENTRY | CF_FILE_OPS);
 	return B_ERROR;
 }
 
@@ -497,7 +508,7 @@ udf_write(void *_ns, void *_node, void *_cookie, off_t pos, const void *buffer,
 int
 udf_close(void *_ns, void *_node, void *_cookie)
 {
-	DEBUG_INIT();
+	DEBUG_INIT(CF_ENTRY | CF_FILE_OPS);
 	return B_ERROR;
 }
 
@@ -505,7 +516,7 @@ udf_close(void *_ns, void *_node, void *_cookie)
 int
 udf_free_cookie(void *_ns, void *_node, void *_cookie)
 {
-	DEBUG_INIT();
+	DEBUG_INIT(CF_ENTRY | CF_FILE_OPS);
 	return B_ERROR;
 }
 
@@ -513,7 +524,7 @@ udf_free_cookie(void *_ns, void *_node, void *_cookie)
 int
 udf_access(void *_ns, void *_node, int accessMode)
 {
-	DEBUG_INIT();
+	DEBUG_INIT(CF_ENTRY | CF_FILE_OPS);
 	return B_ERROR;
 }
 
@@ -521,7 +532,7 @@ udf_access(void *_ns, void *_node, int accessMode)
 int
 udf_read_link(void *_ns, void *_node, char *buffer, size_t *bufferSize)
 {
-	DEBUG_INIT();
+	DEBUG_INIT(CF_ENTRY | CF_FILE_OPS);
 	return B_ERROR;
 }
 
@@ -534,6 +545,7 @@ udf_read_link(void *_ns, void *_node, char *buffer, size_t *bufferSize)
 int 
 udf_mkdir(void *ns, void *dir, const char *name, int mode)
 {
+	DEBUG_INIT(CF_ENTRY | CF_DIRECTORY_OPS);
 	// FUNCTION_START(("name = \"%s\", perms = %d\n", name, mode));
 	return B_ERROR;
 }
@@ -542,6 +554,7 @@ udf_mkdir(void *ns, void *dir, const char *name, int mode)
 int 
 udf_rmdir(void *ns, void *dir, const char *name)
 {
+	DEBUG_INIT(CF_ENTRY | CF_DIRECTORY_OPS);
 	// FUNCTION_START(("name = \"%s\"\n", name));
 	return B_ERROR;
 }
@@ -550,7 +563,7 @@ udf_rmdir(void *ns, void *dir, const char *name)
 int
 udf_open_dir(void *ns, void *node, void **cookie)
 {
-	DEBUG_INIT();
+	DEBUG_INIT(CF_ENTRY | CF_DIRECTORY_OPS);
 	return B_ERROR;
 }
 
@@ -559,7 +572,7 @@ int
 udf_read_dir(void *ns, void *node, void *cookie, long *num, 
 	struct dirent *dirent, size_t bufferSize)
 {
-	DEBUG_INIT();
+	DEBUG_INIT(CF_ENTRY | CF_DIRECTORY_OPS);
 	return B_ERROR;
 }
 
@@ -567,7 +580,7 @@ udf_read_dir(void *ns, void *node, void *cookie, long *num,
 int
 udf_rewind_dir(void *ns, void *node, void *cookie)
 {
-	DEBUG_INIT();
+	DEBUG_INIT(CF_ENTRY | CF_DIRECTORY_OPS);
 	return B_ERROR;
 }
 
@@ -575,7 +588,7 @@ udf_rewind_dir(void *ns, void *node, void *cookie)
 int		
 udf_close_dir(void *ns, void *node, void *cookie)
 {
-	DEBUG_INIT();
+	DEBUG_INIT(CF_ENTRY | CF_DIRECTORY_OPS);
 	return B_ERROR;
 }
 
@@ -583,7 +596,7 @@ udf_close_dir(void *ns, void *node, void *cookie)
 int
 udf_free_dir_cookie(void *ns, void *node, void *cookie)
 {
-	DEBUG_INIT();
+	DEBUG_INIT(CF_ENTRY | CF_DIRECTORY_OPS);
 	return B_ERROR;
 }
 
@@ -596,7 +609,7 @@ udf_free_dir_cookie(void *ns, void *node, void *cookie)
 int 
 udf_open_attrdir(void *ns, void *node, void **cookie)
 {
-	DEBUG_INIT();
+	DEBUG_INIT(CF_ENTRY | CF_ATTRIBUTE_OPS);
 	return B_ERROR;
 }
 
@@ -604,7 +617,7 @@ udf_open_attrdir(void *ns, void *node, void **cookie)
 int
 udf_close_attrdir(void *ns, void *node, void *cookie)
 {
-	DEBUG_INIT();
+	DEBUG_INIT(CF_ENTRY | CF_ATTRIBUTE_OPS);
 	return B_ERROR;
 }
 
@@ -612,7 +625,7 @@ udf_close_attrdir(void *ns, void *node, void *cookie)
 int
 udf_free_attrdir_cookie(void *ns, void *node, void *_cookie)
 {
-	DEBUG_INIT();
+	DEBUG_INIT(CF_ENTRY | CF_ATTRIBUTE_OPS);
 	return B_ERROR;
 }
 
@@ -620,7 +633,7 @@ udf_free_attrdir_cookie(void *ns, void *node, void *_cookie)
 int
 udf_rewind_attrdir(void *_ns, void *_node, void *_cookie)
 {
-	DEBUG_INIT();
+	DEBUG_INIT(CF_ENTRY | CF_ATTRIBUTE_OPS);
 	return B_ERROR;
 }
 
@@ -628,7 +641,7 @@ udf_rewind_attrdir(void *_ns, void *_node, void *_cookie)
 int 
 udf_read_attrdir(void *_ns, void *node, void *_cookie, long *num, struct dirent *dirent, size_t bufsize)
 {
-	DEBUG_INIT();
+	DEBUG_INIT(CF_ENTRY | CF_ATTRIBUTE_OPS);
 	return B_ERROR;
 }
 
@@ -636,6 +649,7 @@ udf_read_attrdir(void *_ns, void *node, void *_cookie, long *num, struct dirent
 int
 udf_remove_attr(void *_ns, void *_node, const char *name)
 {
+	DEBUG_INIT(CF_ENTRY | CF_ATTRIBUTE_OPS);
 	// FUNCTION_START(("name = \"%s\"\n",name));
 	return B_ERROR;
 }
@@ -644,6 +658,7 @@ udf_remove_attr(void *_ns, void *_node, const char *name)
 int
 udf_rename_attr(void *ns, void *node, const char *oldname, const char *newname)
 {
+	DEBUG_INIT(CF_ENTRY | CF_ATTRIBUTE_OPS);
 	// FUNCTION_START(("name = \"%s\",to = \"%s\"\n", oldname, newname));
 	return B_ERROR;
 }
@@ -652,6 +667,7 @@ udf_rename_attr(void *ns, void *node, const char *oldname, const char *newname)
 int
 udf_stat_attr(void *ns, void *_node, const char *name, struct attr_info *attrInfo)
 {
+	DEBUG_INIT(CF_ENTRY | CF_ATTRIBUTE_OPS);
 	// FUNCTION_START(("name = \"%s\"\n",name));
 	return B_ERROR;
 }
@@ -661,6 +677,7 @@ int
 udf_write_attr(void *_ns, void *_node, const char *name, int type, const void *buffer,
 	size_t *_length, off_t pos)
 {
+	DEBUG_INIT(CF_ENTRY | CF_ATTRIBUTE_OPS);
 	// FUNCTION_START(("name = \"%s\"\n",name));
 	return B_ERROR;
 }
@@ -670,7 +687,7 @@ int
 udf_read_attr(void *_ns, void *_node, const char *name, int type, void *buffer,
 	size_t *_length, off_t pos)
 {
-	DEBUG_INIT();
+	DEBUG_INIT(CF_ENTRY | CF_ATTRIBUTE_OPS);
 	return B_ERROR;
 }
 
@@ -683,7 +700,7 @@ udf_read_attr(void *_ns, void *_node, const char *name, int type, void *buffer,
 int 
 udf_open_indexdir(void *_ns, void **_cookie)
 {
-	DEBUG_INIT();
+	DEBUG_INIT(CF_ENTRY | CF_INDEX_OPS);
 	return B_ERROR;
 }
 
@@ -691,7 +708,7 @@ udf_open_indexdir(void *_ns, void **_cookie)
 int 
 udf_close_indexdir(void *_ns, void *_cookie)
 {
-	DEBUG_INIT();
+	DEBUG_INIT(CF_ENTRY | CF_INDEX_OPS);
 	return B_ERROR;
 }
 
@@ -699,7 +716,7 @@ udf_close_indexdir(void *_ns, void *_cookie)
 int 
 udf_free_indexdir_cookie(void *_ns, void *_node, void *_cookie)
 {
-	DEBUG_INIT();
+	DEBUG_INIT(CF_ENTRY | CF_INDEX_OPS);
 	return B_ERROR;
 }
 
@@ -707,7 +724,7 @@ udf_free_indexdir_cookie(void *_ns, void *_node, void *_cookie)
 int 
 udf_rewind_indexdir(void *_ns, void *_cookie)
 {
-	DEBUG_INIT();
+	DEBUG_INIT(CF_ENTRY | CF_INDEX_OPS);
 	return B_ERROR;
 }
 
@@ -715,7 +732,7 @@ udf_rewind_indexdir(void *_ns, void *_cookie)
 int 
 udf_read_indexdir(void *_ns, void *_cookie, long *num, struct dirent *dirent, size_t bufferSize)
 {
-	DEBUG_INIT();
+	DEBUG_INIT(CF_ENTRY | CF_INDEX_OPS);
 	return B_ERROR;
 }
 
@@ -723,6 +740,7 @@ udf_read_indexdir(void *_ns, void *_cookie, long *num, struct dirent *dirent, si
 int 
 udf_create_index(void *_ns, const char *name, int type, int flags)
 {
+	DEBUG_INIT(CF_ENTRY | CF_INDEX_OPS);
 	// FUNCTION_START(("name = \"%s\", type = %d, flags = %d\n", name, type, flags));
 	return B_ERROR;
 }
@@ -731,7 +749,7 @@ udf_create_index(void *_ns, const char *name, int type, int flags)
 int 
 udf_remove_index(void *_ns, const char *name)
 {
-	DEBUG_INIT();
+	DEBUG_INIT(CF_ENTRY | CF_INDEX_OPS);
 	return B_ERROR;
 }
 
@@ -739,6 +757,7 @@ udf_remove_index(void *_ns, const char *name)
 int 
 udf_rename_index(void *ns, const char *oldname, const char *newname)
 {
+	DEBUG_INIT(CF_ENTRY | CF_INDEX_OPS);
 	// FUNCTION_START(("from = %s, to = %s\n", oldname, newname));
 	return B_ERROR;
 }
@@ -747,6 +766,7 @@ udf_rename_index(void *ns, const char *oldname, const char *newname)
 int 
 udf_stat_index(void *_ns, const char *name, struct index_info *indexInfo)
 {
+	DEBUG_INIT(CF_ENTRY | CF_INDEX_OPS);
 	// FUNCTION_START(("name = %s\n",name));
 	return B_ERROR;
 }
@@ -759,7 +779,7 @@ int
 udf_open_query(void *_ns, const char *queryString, ulong flags, port_id port,
 	long token, void **cookie)
 {
-	DEBUG_INIT();
+	DEBUG_INIT(CF_ENTRY | CF_QUERY_OPS);
 	return B_ERROR;
 }
 
@@ -767,7 +787,7 @@ udf_open_query(void *_ns, const char *queryString, ulong flags, port_id port,
 int
 udf_close_query(void *ns, void *cookie)
 {
-	DEBUG_INIT();
+	DEBUG_INIT(CF_ENTRY | CF_QUERY_OPS);
 	return B_ERROR;
 }
 
@@ -775,7 +795,7 @@ udf_close_query(void *ns, void *cookie)
 int
 udf_free_query_cookie(void *ns, void *node, void *cookie)
 {
-	DEBUG_INIT();
+	DEBUG_INIT(CF_ENTRY | CF_QUERY_OPS);
 	return B_ERROR;
 }
 
@@ -783,7 +803,7 @@ udf_free_query_cookie(void *ns, void *node, void *cookie)
 int
 udf_read_query(void *ns, void *cookie, long *num, struct dirent *dirent, size_t bufferSize)
 {
-	DEBUG_INIT();
+	DEBUG_INIT(CF_ENTRY | CF_QUERY_OPS);
 	return B_ERROR;
 }