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

changed B_ANY_KERNEL_ADDRESS to B_ANY_ADDRESS, as our kernel doesn't allow user applications to create kernel areas

Browse Source 
added some error logs


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@14355 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval
2005-10-11 21:27:20 +00:00
parent d40a708ed3
commit 21b29fb2ef
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/media/SharedBufferList.cpp
+12 -6
View File
@@ -5,6 +5,7 @@
* Used for BBufferGroup and BBuffer management across teams * Used for BBufferGroup and BBuffer management across teams
***********************************************************************/ ***********************************************************************/
#include <Buffer.h> #include <Buffer.h>
#include <string.h>
#include "SharedBufferList.h" #include "SharedBufferList.h"
#include "debug.h" #include "debug.h"
@@ -39,18 +40,20 @@ _shared_buffer_list::Clone(area_id id)
if (id == -1) { if (id == -1) {
size_t size = ((sizeof(_shared_buffer_list)) + (B_PAGE_SIZE - 1)) & ~(B_PAGE_SIZE - 1); size_t size = ((sizeof(_shared_buffer_list)) + (B_PAGE_SIZE - 1)) & ~(B_PAGE_SIZE - 1);
status = create_area("shared buffer list",(void **)&adr,B_ANY_KERNEL_ADDRESS,size,B_LAZY_LOCK,B_READ_AREA | B_WRITE_AREA); status = create_area("shared buffer list",(void **)&adr,B_ANY_ADDRESS,size,B_LAZY_LOCK,B_READ_AREA | B_WRITE_AREA);
if (status >= B_OK) { if (status >= B_OK) {
status = adr->Init(); status = adr->Init();
if (status != B_OK) if (status != B_OK)
delete_area(area_for(adr)); delete_area(area_for(adr));
} }
} else { } else {
status = clone_area("shared buffer list clone",(void **)&adr,B_ANY_KERNEL_ADDRESS,B_READ_AREA | B_WRITE_AREA,id); status = clone_area("shared buffer list clone", (void **)&adr, B_ANY_ADDRESS, B_READ_AREA|B_WRITE_AREA, id);
//TRACE("cloned area, id = 0x%08lx, ptr = 0x%08x\n",status,(int)adr); if (status < B_OK) {
ERROR("_shared_buffer_list::Clone() clone area: %ld err = %s\n", id, strerror(status));
}
} }
return (status < B_OK) ? NULL : adr; return (status < B_OK) ? NULL : adr;
} }
void void
@@ -183,6 +186,7 @@ _shared_buffer_list::RequestBuffer(sem_id group_reclaim_sem, int32 buffers_in_gr
// try to exit savely if the lock fails // try to exit savely if the lock fails
if (Lock() != B_OK) { if (Lock() != B_OK) {
ERROR("_shared_buffer_list:: RequestBuffer: Lock failed\n");
release_sem_etc(group_reclaim_sem, count, 0); release_sem_etc(group_reclaim_sem, count, 0);
return B_ERROR; return B_ERROR;
} }
@@ -212,13 +216,15 @@ _shared_buffer_list::RequestBuffer(sem_id group_reclaim_sem, int32 buffers_in_gr
} }
release_sem_etc(group_reclaim_sem, count, B_DO_NOT_RESCHEDULE); release_sem_etc(group_reclaim_sem, count, B_DO_NOT_RESCHEDULE);
if (Unlock() != B_OK) if (Unlock() != B_OK) {
ERROR("_shared_buffer_list:: RequestBuffer: unlock failed\n");
return B_ERROR; return B_ERROR;
}
// prepare to request one more buffer next time // prepare to request one more buffer next time
count++; count++;
} while (count <= buffers_in_group); } while (count <= buffers_in_group);
ERROR("_shared_buffer_list:: RequestBuffer: no buffer found\n");
return B_ERROR; return B_ERROR;
} }