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

the last read() call would never return. Fixed.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@28493 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini 2008-11-04 14:40:30 +00:00
parent 7730c1fb0a
commit 6427c2e3fc
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/add-ons/kernel/bus_managers/acpi/acpi_ns_dump.cpp
View File

@ -72,7 +72,6 @@ make_space(acpi_ns_device_info *device, size_t space)
} }
static int32 sNumCount = 0;
static void static void
dump_acpi_namespace(acpi_ns_device_info *device, char *root, int indenting) dump_acpi_namespace(acpi_ns_device_info *device, char *root, int indenting)
@ -175,22 +174,18 @@ static int32
acpi_namespace_dump(void *arg) acpi_namespace_dump(void *arg)
{ {
acpi_ns_device_info *device = (acpi_ns_device_info*)(arg); acpi_ns_device_info *device = (acpi_ns_device_info*)(arg);
dprintf("**** start dumping ****\n");
dump_acpi_namespace(device, NULL, 0); dump_acpi_namespace(device, NULL, 0);
dprintf("**** finished dumping. Writing last line ****\n");
if (device->buffer->Lock()) { if (device->buffer->Lock()) {
size_t writable = device->buffer->WritableAmount(); size_t writable = device->buffer->WritableAmount();
if (writable < 1) if (writable < 1)
make_space(device, 1); make_space(device, 1);
device->buffer->Unlock();
}
if (device->buffer->Lock()) {
device->buffer->Write("\n", 1); device->buffer->Write("\n", 1);
device->buffer->Unlock(); device->buffer->Unlock();
} }
dprintf("written. exiting\n"); delete_sem(device->read_sem);
device->read_sem = -1;
return 0; return 0;
} }
@ -228,8 +223,6 @@ acpi_namespace_open(void *_cookie, const char* path, int flags, void** cookie)
device->buffer = ringBuffer; device->buffer = ringBuffer;
sNumCount = 0;
resume_thread(device->thread); resume_thread(device->thread);
return B_OK; return B_OK;
@ -258,7 +251,7 @@ acpi_namespace_read(void *_cookie, off_t position, void *buf, size_t* num_bytes)
//dprintf("acquiring read sem...\n"); //dprintf("acquiring read sem...\n");
ringBuffer.Unlock(); ringBuffer.Unlock();
status_t status = acquire_sem_etc(device->read_sem, 1, B_CAN_INTERRUPT, 0); status_t status = acquire_sem_etc(device->read_sem, 1, B_CAN_INTERRUPT, 0);
if (status < B_OK) { if (status == B_INTERRUPTED) {
//dprintf("read: acquire_sem returned %s\n", strerror(status)); //dprintf("read: acquire_sem returned %s\n", strerror(status));
*num_bytes = 0; *num_bytes = 0;
return status; return status;