#define MAX_KERNEL_FILES 128
// === PROTOTYPES ===
-inline void _ReferenceNode(tVFS_Node *Node);
// === GLOBALS ===
tVFS_Handle *gaUserHandles = (void*)MM_PPD_HANDLES;
tVFS_Handle *gaKernelHandles = (void*)MM_KERNEL_VFS;
// === CODE ===
-inline void _ReferenceNode(tVFS_Node *Node)
-{
- if( !MM_GetPhysAddr(Node->Type) ) {
- Log_Error("VFS", "Node %p's type is invalid (%p bad pointer) - %P corrupted",
- Node, Node->Type, MM_GetPhysAddr(&Node->Type));
- return ;
- }
- if( Node->Type && Node->Type->Reference )
- Node->Type->Reference( Node );
- else
- Node->ReferenceCount ++;
-}
-
/**
* \fn tVFS_Handle *VFS_GetHandle(int FD)
* \brief Gets a pointer to the handle information structure
if(FD >= MAX_KERNEL_FILES) return NULL;
h = &gaKernelHandles[ FD ];
} else {
- if(FD >= *Threads_GetMaxFD()) return NULL;
+ if(FD >= *Threads_GetMaxFD(NULL)) return NULL;
h = &gaUserHandles[ FD ];
}
h = &gaKernelHandles[FD];
}
else {
- if( FD >= *Threads_GetMaxFD()) return -1;
+ if( FD >= *Threads_GetMaxFD(NULL)) return -1;
h = &gaUserHandles[FD];
}
h->Node = Node;
// Check for a user open
if(bIsUser)
{
- int max_handles = *Threads_GetMaxFD();
+ int max_handles = *Threads_GetMaxFD(NULL);
// Allocate Buffer
if( MM_GetPhysAddr( gaUserHandles ) == 0 )
{
- Uint addr, size;
- size = max_handles * sizeof(tVFS_Handle);
- for(addr = 0; addr < size; addr += 0x1000)
+ tPage *pageptr = (void*)gaUserHandles;
+ size_t size = max_handles * sizeof(tVFS_Handle);
+ for( size_t ofs = 0; ofs < size; ofs ++)
{
- if( !MM_Allocate( (tVAddr)gaUserHandles + addr ) )
+ if( !MM_Allocate( pageptr ) )
{
Warning("OOM - VFS_AllocHandle");
Threads_Exit(0, 0xFF); // Terminate user
}
+ pageptr ++;
}
memset( gaUserHandles, 0, size );
}
// Allocate space if not already
if( MM_GetPhysAddr( gaKernelHandles ) == 0 )
{
- Uint addr, size;
- size = MAX_KERNEL_FILES * sizeof(tVFS_Handle);
- for(addr = 0; addr < size; addr += 0x1000)
+ tPage *pageptr = (void*)gaKernelHandles;
+ size_t size = MAX_KERNEL_FILES * sizeof(tVFS_Handle);
+ for(size_t ofs = 0; ofs < size; ofs += size)
{
- if( !MM_Allocate( (tVAddr)gaKernelHandles + addr ) )
+ if( !MM_Allocate( pageptr ) )
{
Panic("OOM - VFS_AllocHandle");
- Threads_Exit(0, 0xFF); // Terminate application (get some space back)
}
+ pageptr ++;
}
memset( gaKernelHandles, 0, size );
}
void VFS_ReferenceUserHandles(void)
{
- int i;
- int max_handles = *Threads_GetMaxFD();
+ const int max_handles = *Threads_GetMaxFD(NULL);
// Check if this process has any handles
if( MM_GetPhysAddr( gaUserHandles ) == 0 )
return ;
- for( i = 0; i < max_handles; i ++ )
+ for( int i = 0; i < max_handles; i ++ )
{
tVFS_Handle *h;
h = &gaUserHandles[i];
}
}
-void VFS_CloseAllUserHandles(void)
+void VFS_CloseAllUserHandles(struct sProcess *Process)
{
- int i;
- int max_handles = *Threads_GetMaxFD();
+ const int max_handles = *Threads_GetMaxFD(Process);
+ ENTER("pProcess", Process);
+
+ if( max_handles >= PAGE_SIZE / sizeof(tVFS_Handle) )
+ TODO("More than a page of handles");
+ tVFS_Handle *handles = MM_MapTempFromProc(Process, gaUserHandles);
+ LOG("handles=%p", handles);
// Check if this process has any handles
- if( MM_GetPhysAddr( gaUserHandles ) == 0 )
+ if( !handles ) {
+ LEAVE('-');
return ;
+ }
- for( i = 0; i < max_handles; i ++ )
+ for( int i = 0; i < max_handles; i ++ )
{
- tVFS_Handle *h;
- h = &gaUserHandles[i];
+ tVFS_Handle *h = &handles[i];
+ LOG("handles[%i].Node = %p", i, h->Node);
if( !h->Node )
continue ;
_CloseNode(h->Node);
+ h->Node = NULL;
}
+
+ MM_FreeTemp(handles);
+ LEAVE('-');
}
/**
void *VFS_SaveHandles(int NumFDs, int *FDs)
{
tVFS_Handle *ret;
- int i;
- int max_handles = *Threads_GetMaxFD();
+ const int max_handles = *Threads_GetMaxFD(NULL);
// Check if this process has any handles
if( MM_GetPhysAddr( gaUserHandles ) == 0 )
NumFDs = max_handles;
// Take copies of the handles
- for( i = 0; i < NumFDs; i ++ )
+ if( FDs == NULL ) {
+ memcpy(ret, gaUserHandles, NumFDs * sizeof(tVFS_Handle));
+ }
+ else
{
- tVFS_Handle *h;
- if( FDs == NULL )
- h = &gaUserHandles[i];
- else if( FDs[i] == -1 )
- {
- Log_Warning("VFS", "VFS_SaveHandles - Slot %i error FD (-1), ignorning", i);
- memset(&ret[i], 0, sizeof(tVFS_Handle));
- continue ;
- }
- else
+ for( int i = 0; i < NumFDs; i ++ )
{
- h = VFS_GetHandle(FDs[i] & (VFS_KERNEL_FLAG - 1));
+ if( FDs[i] < -1 )
+ {
+ Log_Warning("VFS", "VFS_SaveHandles - Slot %i error FD (%i<0), ignorning",
+ i, FDs[i]);
+ memset(&ret[i], 0, sizeof(tVFS_Handle));
+ continue ;
+ }
+
+ int fd = FDs[i] & (VFS_KERNEL_FLAG - 1);
+ tVFS_Handle *h = VFS_GetHandle(fd);
if(!h) {
- Log_Warning("VFS", "VFS_SaveHandles - Invalid FD %i",
- FDs[i] & (VFS_KERNEL_FLAG - 1) );
+ Log_Warning("VFS", "VFS_SaveHandles - Invalid FD 0x%x (%i) in slot %i",
+ fd, FDs[i], i );
free(ret);
return NULL;
}
+// Log("%i: Duplicate FD %i (%p)", i, fd, h->Node);
+ memcpy( &ret[i], h, sizeof(tVFS_Handle) );
}
- memcpy( &ret[i], h, sizeof(tVFS_Handle) );
-
+ }
+
+ // Reference nodes/mounts
+ for( int i = 0; i < NumFDs; i ++ )
+ {
+ tVFS_Handle *h = &ret[i];
// Reference node
if( !h->Node )
continue ;
+// Debug("VFS_SaveHandles: %i %p", i, h->Node);
_ReferenceNode(h->Node);
h->Mount->OpenHandleCount ++;
}
void VFS_RestoreHandles(int NumFDs, void *Handles)
{
tVFS_Handle *handles = Handles;
- int i;
+ const int max_handles = *Threads_GetMaxFD(NULL);
// NULL = nothing to do
if( !Handles )
- return ;
-
- // Check if there is already a set of handles
- if( MM_GetPhysAddr( gaUserHandles ) != 0 )
return ;
-
- // Allocate user handle area
+ if( NumFDs > max_handles ) {
+ Log_Notice("VFS", "RestoreHandles: Capping from %i FDs to %i", NumFDs, max_handles);
+ NumFDs = max_handles;
+ }
+
+ // Allocate user handle area (and dereference existing handles)
+ for( int i = 0; i < NumFDs; i ++ )
{
- Uint addr, size;
- int max_handles = *Threads_GetMaxFD();
- size = max_handles * sizeof(tVFS_Handle);
- for(addr = 0; addr < size; addr += 0x1000)
+ tVFS_Handle *h = &gaUserHandles[i];
+
+ if( !MM_GetPhysAddr(h) )
{
- if( !MM_Allocate( (tVAddr)gaUserHandles + addr ) )
+ void *pg = (void*)( (tVAddr)h & ~(PAGE_SIZE-1) );
+ if( !MM_Allocate( pg ) )
{
- Warning("OOM - VFS_AllocHandle");
- Threads_Exit(0, 0xFF); // Terminate user
+ // OOM?
+ return ;
}
+ memset(pg, 0, PAGE_SIZE);
}
- memset( gaUserHandles, 0, size );
+ // Safe to dereference, as Threads_CloneTCB references handles
+ #if 1
+ else
+ {
+ if(h->Node)
+ {
+ _CloseNode(h->Node);
+ h->Mount->OpenHandleCount --;
+ }
+ }
+ #endif
}
+ // Clean up existing
// Restore handles
memcpy( gaUserHandles, handles, NumFDs * sizeof(tVFS_Handle) );
// Reference when copied
- for( i = 0; i < NumFDs; i ++ )
+ for( int i = 0; i < NumFDs; i ++ )
{
- tVFS_Handle *h = &handles[i];
+ tVFS_Handle *h = &gaUserHandles[i];
if( !h->Node )
continue ;
+// Debug("VFS_RestoreHandles: %i %p", i, h->Node);
_ReferenceNode(h->Node);
h->Mount->OpenHandleCount ++;
}
+ for( int i = NumFDs; i < max_handles; i ++ )
+ {
+ gaUserHandles[i].Node = NULL;
+ }
}
void VFS_FreeSavedHandles(int NumFDs, void *Handles)
git.ucc.asn.au / tpg / acess2.git / blobdiff
UCC git Repository :: git.ucc.asn.au