i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel: fix trace build for fd.cpp and fifo.cpp

Browse Source 
Change-Id: I12b2e85926ae63eaba5c077343cdaa2362cf8af1
Reviewed-on: https://review.haiku-os.org/c/haiku/+/5391
Reviewed-by: waddlesplash <[email protected]>
This commit is contained in:
Jérôme Duval
2022-06-20 15:29:43 +00:00
committed by waddlesplash
parent a3d84aba73
commit 177a801206
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/fs/fd.cpp
+5 -5
View File
@@ -210,7 +210,7 @@ put_fd(struct file_descriptor* descriptor)
TFD(PutFD(descriptor)); TFD(PutFD(descriptor));
TRACE(("put_fd(descriptor = %p [ref = %ld, cookie = %p])\n", TRACE(("put_fd(descriptor = %p [ref = %" B_PRId32 ", cookie = %p])\n",
descriptor, descriptor->ref_count, descriptor->cookie)); descriptor, descriptor->ref_count, descriptor->cookie));
// free the descriptor if we don't need it anymore // free the descriptor if we don't need it anymore
@@ -568,7 +568,7 @@ deselect_select_infos(file_descriptor* descriptor, select_info* infos,
status_t status_t
select_fd(int32 fd, struct select_info* info, bool kernel) select_fd(int32 fd, struct select_info* info, bool kernel)
{ {
TRACE(("select_fd(fd = %ld, info = %p (%p), 0x%x)\n", fd, info, TRACE(("select_fd(fd = %" B_PRId32 ", info = %p (%p), 0x%x)\n", fd, info,
info->sync, info->selected_events)); info->sync, info->selected_events));
FDGetter fdGetter; FDGetter fdGetter;
@@ -647,7 +647,7 @@ select_fd(int32 fd, struct select_info* info, bool kernel)
status_t status_t
deselect_fd(int32 fd, struct select_info* info, bool kernel) deselect_fd(int32 fd, struct select_info* info, bool kernel)
{ {
TRACE(("deselect_fd(fd = %ld, info = %p (%p), 0x%x)\n", fd, info, TRACE(("deselect_fd(fd = %" B_PRId32 ", info = %p (%p), 0x%x)\n", fd, info,
info->sync, info->selected_events)); info->sync, info->selected_events));
FDGetter fdGetter; FDGetter fdGetter;
@@ -945,7 +945,7 @@ _user_read_dir(int fd, struct dirent* userBuffer, size_t bufferSize,
uint32 maxCount) uint32 maxCount)
{ {
TRACE(("user_read_dir(fd = %d, userBuffer = %p, bufferSize = %ld, count = " TRACE(("user_read_dir(fd = %d, userBuffer = %p, bufferSize = %ld, count = "
"%lu)\n", fd, userBuffer, bufferSize, maxCount)); "%" B_PRIu32 ")\n", fd, userBuffer, bufferSize, maxCount));
if (maxCount == 0) if (maxCount == 0)
return 0; return 0;
@@ -1272,7 +1272,7 @@ _kern_read_dir(int fd, struct dirent* buffer, size_t bufferSize,
ssize_t retval; ssize_t retval;
TRACE(("sys_read_dir(fd = %d, buffer = %p, bufferSize = %ld, count = " TRACE(("sys_read_dir(fd = %d, buffer = %p, bufferSize = %ld, count = "
"%lu)\n",fd, buffer, bufferSize, maxCount)); "%" B_PRIu32 ")\n",fd, buffer, bufferSize, maxCount));
struct io_context* ioContext = get_current_io_context(true); struct io_context* ioContext = get_current_io_context(true);
descriptor = get_fd(ioContext, fd); descriptor = get_fd(ioContext, fd);
src/system/kernel/fs/fifo.cpp
+4 -4
View File
@@ -656,11 +656,11 @@ Inode::Open(int openMode)
void void
Inode::Close(file_cookie* cookie) Inode::Close(file_cookie* cookie)
{ {
TRACE("Inode %p::Close(openMode = %d)\n", this, openMode);
MutexLocker locker(RequestLock()); MutexLocker locker(RequestLock());
int openMode = cookie->open_mode; int openMode = cookie->open_mode;
TRACE("Inode %p::Close(openMode = %" B_PRId32 ")\n", this, openMode);
// Notify all currently reading file descriptors // Notify all currently reading file descriptors
ReadRequestList::Iterator iterator = fReadRequests.GetIterator(); ReadRequestList::Iterator iterator = fReadRequests.GetIterator();
@@ -1065,8 +1065,8 @@ fifo_ioctl(fs_volume* _volume, fs_vnode* _node, void* _cookie, uint32 op,
file_cookie* cookie = (file_cookie*)_cookie; file_cookie* cookie = (file_cookie*)_cookie;
Inode* inode = (Inode*)_node->private_node; Inode* inode = (Inode*)_node->private_node;
TRACE("fifo_ioctl: vnode %p, cookie %p, op %ld, buf %p, len %ld\n", TRACE("fifo_ioctl: vnode %p, cookie %p, op %" B_PRId32 ", buf %p, len %ld\n",
_vnode, _cookie, op, buffer, length); _node, _cookie, op, buffer, length);
switch (op) { switch (op) {
case FIONBIO: case FIONBIO:
@@ -1129,7 +1129,7 @@ fifo_set_flags(fs_volume* _volume, fs_vnode* _node, void* _cookie,
Inode* inode = (Inode*)_node->private_node; Inode* inode = (Inode*)_node->private_node;
file_cookie* cookie = (file_cookie*)_cookie; file_cookie* cookie = (file_cookie*)_cookie;
TRACE("fifo_set_flags(vnode = %p, flags = %x)\n", _vnode, flags); TRACE("fifo_set_flags(vnode = %p, flags = %x)\n", _node, flags);
MutexLocker locker(inode->RequestLock()); MutexLocker locker(inode->RequestLock());
cookie->open_mode = (cookie->open_mode & ~(O_APPEND | O_NONBLOCK)) | flags; cookie->open_mode = (cookie->open_mode & ~(O_APPEND | O_NONBLOCK)) | flags;