X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FKernel%2Fdrv%2Fpty.c;h=1d1bdf35719e6ad4c5d5058e1bf3d3cc6b5f8421;hb=17ebf0cdf584b5eb63aa96149de3e4f76cb82e01;hp=3ffe82b2578c33af2a927df852674ae0d6f4c9c4;hpb=64d34a230d32813ac5874b997ae3e5fea2965b54;p=tpg%2Facess2.git diff --git a/KernelLand/Kernel/drv/pty.c b/KernelLand/Kernel/drv/pty.c index 3ffe82b2..1d1bdf35 100644 --- a/KernelLand/Kernel/drv/pty.c +++ b/KernelLand/Kernel/drv/pty.c @@ -5,7 +5,7 @@ * drv/pty.c * - Pseudo Terminals */ -#define DEBUG 1 +#define DEBUG 0 #include #include #include @@ -30,6 +30,7 @@ struct sPTY void *OutputHandle; tPTY_OutputFcn OutputFcn; tPTY_ReqResize ReqResize; + tPTY_ModeSet ModeSet; struct ptymode Mode; struct ptydims Dims; @@ -48,8 +49,8 @@ struct sPTY int OutputReadPos; char OutputData[OUTPUT_RINGBUFFER_LEN]; + tVFS_Node *ServerNode; tVFS_Node ClientNode; - tVFS_Node ServerNode; tVFS_ACL OwnerRW; // TODO: Maintain list of client PIDs @@ -59,7 +60,6 @@ struct sPTY int PTY_Install(char **Arguments); int PTY_ReadDir(tVFS_Node *Node, int Pos, char Name[FILENAME_MAX]); tVFS_Node *PTY_FindDir(tVFS_Node *Node, const char *Name, Uint Flags); -tVFS_Node *PTY_MkNod(tVFS_Node *Node, const char *Name, Uint Mode); size_t _rb_write(void *buf, size_t buflen, int *rd, int *wr, const void *data, size_t len); size_t _rb_read(void *buf, size_t buflen, int *rd, int *wr, void *data, size_t len); @@ -68,13 +68,12 @@ size_t PTY_int_SendInput(tPTY *PTY, const char *Input, size_t Length); // PTY_SendInput size_t PTY_ReadClient(tVFS_Node *Node, off_t Offset, size_t Length, void *Buffer, Uint Flags); size_t PTY_WriteClient(tVFS_Node *Node, off_t Offset, size_t Length, const void *Buffer, Uint Flags); - int PTY_IOCtlClient(tVFS_Node *Node, int ID, void *Arg); void PTY_ReferenceClient(tVFS_Node *Node); void PTY_CloseClient(tVFS_Node *Node); size_t PTY_ReadServer(tVFS_Node *Node, off_t Offset, size_t Length, void *Buffer, Uint Flags); size_t PTY_WriteServer(tVFS_Node *Node, off_t Offset, size_t Length, const void *Buffer, Uint Flags); - int PTY_IOCtlServer(tVFS_Node *Node, int ID, void *Arg); void PTY_CloseServer(tVFS_Node *Node); + int PTY_IOCtl(tVFS_Node *Node, int ID, void *Arg); // === GLOBALS === MODULE_DEFINE(0, 0x100, PTY, PTY_Install, NULL, NULL); @@ -82,13 +81,12 @@ tVFS_NodeType gPTY_NodeType_Root = { .TypeName = "PTY-Root", .ReadDir = PTY_ReadDir, .FindDir = PTY_FindDir, - .MkNod = PTY_MkNod }; tVFS_NodeType gPTY_NodeType_Client = { .TypeName = "PTY-Client", .Read = PTY_ReadClient, .Write = PTY_WriteClient, - .IOCtl = PTY_IOCtlClient, + .IOCtl = PTY_IOCtl, .Reference = PTY_ReferenceClient, .Close = PTY_CloseClient }; @@ -96,14 +94,15 @@ tVFS_NodeType gPTY_NodeType_Server = { .TypeName = "PTY-Server", .Read = PTY_ReadServer, .Write = PTY_WriteServer, - .IOCtl = PTY_IOCtlServer, + .IOCtl = PTY_IOCtl, .Close = PTY_CloseServer }; tDevFS_Driver gPTY_Driver = { .Name = "pts", .RootNode = { .Flags = VFS_FFLAG_DIRECTORY, - .Type = &gPTY_NodeType_Root + .Type = &gPTY_NodeType_Root, + .Size = -1 } }; int giPTY_NumCount; @@ -121,7 +120,7 @@ int PTY_Install(char **Arguments) } // --- Management --- -tPTY *PTY_Create(const char *Name, void *Handle, tPTY_OutputFcn Output, tPTY_ReqResize ReqResize) +tPTY *PTY_Create(const char *Name, void *Handle, tPTY_OutputFcn Output, tPTY_ReqResize ReqResize, tPTY_ModeSet ModeSet) { tPTY **prev_np = NULL; size_t namelen; @@ -165,7 +164,7 @@ tPTY *PTY_Create(const char *Name, void *Handle, tPTY_OutputFcn Output, tPTY_Req break; idx ++; } - namelen = 0; + namelen = snprintf(NULL,0, "%u", idx); } tPTY *ret = calloc(sizeof(tPTY) + namelen + 1, 1); @@ -182,20 +181,13 @@ tPTY *PTY_Create(const char *Name, void *Handle, tPTY_OutputFcn Output, tPTY_Req if(Name) strcpy(ret->Name, Name); else - ret->Name[0] = 0; + sprintf(ret->Name, "%u", idx); ret->NumericName = idx; // - Output function and handle (same again) ret->OutputHandle = Handle; ret->OutputFcn = Output; ret->ReqResize = ReqResize; - // - Server node - ret->ServerNode.ImplPtr = ret; - ret->ServerNode.Type = &gPTY_NodeType_Server; - ret->ServerNode.UID = Threads_GetUID(); - ret->ServerNode.GID = Threads_GetGID(); - ret->ServerNode.NumACLs = 1; - ret->ServerNode.ACLs = &ret->OwnerRW; - ret->ServerNode.ReferenceCount = (Output ? 1 : 0); // Prevent a userland close killing a kernel pty + ret->ModeSet = ModeSet; // - Client node ret->ClientNode.ImplPtr = ret; ret->ClientNode.Type = &gPTY_NodeType_Client; @@ -228,17 +220,31 @@ int PTY_SetAttrib(tPTY *PTY, const struct ptydims *Dims, const struct ptymode *M errno = EINVAL; return -1; } - PTY->Mode = *Mode; - if( !WasClient && !PTY->OutputFcn ) + if( WasClient ) + { + if( PTY->ModeSet && PTY->ModeSet(PTY->OutputHandle, Mode) ) + { + errno = EINVAL; + return -1; + } + else if( !PTY->OutputFcn ) + { + Log_Warning("PTY", "TODO: Need to stop client output until modeset has been ACKed"); + // Block write until acked + // ACK by server doing GETMODE + } + } + else { - Log_Warning("PTY", "TODO: Need to stop client output until modeset has been ACKed"); - // Block write until acked - // ACK by server doing GETMODE + // Should the client be informed that the server just twiddled the modes? } + LOG("PTY %p mode set to {0%o, 0%o}", PTY, Mode->InputMode, Mode->OutputMode); + PTY->Mode = *Mode; } if( Dims ) { - if( WasClient ) { + if( WasClient ) + { // Poke the server? if( PTY->ReqResize && PTY->ReqResize(PTY->OutputHandle, Dims) ) { @@ -250,9 +256,11 @@ int PTY_SetAttrib(tPTY *PTY, const struct ptydims *Dims, const struct ptymode *M // Inform server process... somehow } } - else { + else + { // SIGWINSZ to client } + LOG("PTY %p dims set to %ix%i", PTY, Dims->W, Dims->H); PTY->Dims = *Dims; } return 0; @@ -312,7 +320,7 @@ size_t PTY_int_WriteInput(tPTY *PTY, const char *Input, size_t Length) VFS_MarkAvaliable(&PTY->ClientNode, 1); if(ret < Length) - VFS_MarkFull(&PTY->ServerNode, 1); + VFS_MarkFull(PTY->ServerNode, 1); return ret; } @@ -416,37 +424,30 @@ size_t PTY_SendInput(tPTY *PTY, const char *Input, size_t Length) int PTY_ReadDir(tVFS_Node *Node, int Pos, char Name[FILENAME_MAX]) { tPTY *pty = NULL; - if( Pos < giPTY_NumCount * 2 ) + int idx = Pos; + if( idx < giPTY_NumCount ) { RWLock_AcquireRead(&glPTY_NumPTYs); - for( pty = gpPTY_FirstNumPTY; pty; pty = pty->Next ) - { - if( Pos < 2 ) - break; - Pos -= 2; - } + for( pty = gpPTY_FirstNumPTY; pty && idx; pty = pty->Next ) + idx --; RWLock_Release(&glPTY_NumPTYs); } - else if( Pos < (giPTY_NumCount + giPTY_NamedCount) * 2 ) + else if( idx < (giPTY_NumCount + giPTY_NamedCount) ) { + idx -= giPTY_NumCount; RWLock_AcquireRead(&glPTY_NamedPTYs); - for( pty = gpPTY_FirstNamedPTY; pty; pty = pty->Next ) - { - if( Pos < 2 ) - break; - Pos -= 2; - } + for( pty = gpPTY_FirstNamedPTY; pty && idx; pty = pty->Next ) + idx --; RWLock_Release(&glPTY_NamedPTYs); } - - if( !pty ) + if( !pty ) { + LOG("%i out of range", Pos); return -1; - - if( pty->Name[0] ) - snprintf(Name, FILENAME_MAX, "%s%c", pty->Name, (Pos == 0 ? 'c' : 's')); - else - snprintf(Name, FILENAME_MAX, "%i%c", pty->NumericName, (Pos == 0 ? 'c' : 's')); + } + + strncpy(Name, pty->Name, FILENAME_MAX) + LOG("Return '%s'", Name); return 0; } @@ -454,17 +455,19 @@ tVFS_Node *PTY_FindDir(tVFS_Node *Node, const char *Name, Uint Flags) { char *end; int num = strtol(Name, &end, 10); + + if( strcmp(Name, "ptmx") == 0 ) { + tVFS_Node *ret = calloc(sizeof(tVFS_Node), 1); + ret->Size = -1; + ret->Type = &gPTY_NodeType_Server; + return ret; + } - if( Name[0] == '\0' || Name[1] == '\0' ) - return NULL; - - size_t len = strlen(Name); - if( Name[len-1] != 'c' && Name[len-1] != 's' ) + if( Name[0] == '\0' ) return NULL; - int isServer = (Name[len-1] != 'c'); tPTY *ret = NULL; - if( num && (end[0] == 'c' || end[0] == 's') && end[1] == '\0' ) + if( num && end[0] == '\0' ) { // Numeric name RWLock_AcquireRead(&glPTY_NumPTYs); @@ -485,40 +488,23 @@ tVFS_Node *PTY_FindDir(tVFS_Node *Node, const char *Name, Uint Flags) RWLock_AcquireRead(&glPTY_NamedPTYs); for( tPTY *pty = gpPTY_FirstNamedPTY; pty; pty = pty->Next ) { - int cmp = strncmp(pty->Name, Name, len-1); + int cmp = strcmp(pty->Name, Name); if(cmp > 0) break; - if(cmp == 0 && pty->Name[len-1] == '\0' ) { + if(cmp == 0 ) { ret = pty; break; } } RWLock_Release(&glPTY_NamedPTYs); } - if( ret ) - return (isServer ? &ret->ServerNode : &ret->ClientNode); - else - return NULL; -} - -tVFS_Node *PTY_MkNod(tVFS_Node *Node, const char *Name, Uint Mode) -{ - // zero-length name means a numbered pty has been requested - if( Name[0] == '\0' ) - { - tPTY *ret = PTY_Create(NULL, NULL, NULL, NULL); - if( !ret ) - return NULL; - return &ret->ServerNode; + if( ret ) { + tVFS_Node *retnode = &ret->ClientNode; + retnode->ReferenceCount ++; + return retnode; } - - // Otherwise return a named PTY - // TODO: Should the request be for 's' or just '' - - tPTY *ret = PTY_Create(Name, NULL, NULL, NULL); - if(!ret) + else return NULL; - return &ret->ServerNode; } //\! Read from the client's input @@ -531,7 +517,7 @@ size_t PTY_ReadClient(tVFS_Node *Node, off_t Offset, size_t Length, void *Buffer int rv; _select: // If server has disconnected, return EIO - if( pty->ServerNode.ReferenceCount == 0 ) { + if( pty->ServerNode && pty->ServerNode->ReferenceCount == 0 ) { //Threads_PostSignal(SIGPIPE); errno = EIO; return -1; @@ -546,6 +532,8 @@ _select: Mutex_Acquire(&pty->InputMutex); Length = _rb_read(pty->InputData, INPUT_RINGBUFFER_LEN, &pty->InputReadPos, &pty->InputWritePos, Buffer, Length); + if( Length && pty->ServerNode ) + VFS_MarkFull(pty->ServerNode, 0); Mutex_Release(&pty->InputMutex); if(pty->InputReadPos == pty->InputWritePos) @@ -565,7 +553,7 @@ size_t PTY_WriteClient(tVFS_Node *Node, off_t Offset, size_t Length, const void tPTY *pty = Node->ImplPtr; // If the server has terminated, send SIGPIPE - if( pty->ServerNode.ReferenceCount == 0 ) + if( pty->ServerNode && pty->ServerNode->ReferenceCount == 0 ) { //Threads_PostSignal(SIGPIPE); errno = EIO; @@ -573,58 +561,37 @@ size_t PTY_WriteClient(tVFS_Node *Node, off_t Offset, size_t Length, const void } // Write to either FIFO or directly to output function - if( pty->OutputFcn ) - { - pty->OutputFcn(pty->OutputHandle, Buffer, Length, pty->Mode.OutputMode); - } - else - { - // Write to output ringbuffer - Length = _rb_write(pty->OutputData, OUTPUT_RINGBUFFER_LEN, - &pty->OutputReadPos, &pty->OutputWritePos, - Buffer, Length); - VFS_MarkAvaliable(&pty->ServerNode, 1); + if( pty->OutputFcn ) { + pty->OutputFcn(pty->OutputHandle, Length, Buffer); + return Length; } - return Length; -} - -int PTY_IOCtlClient(tVFS_Node *Node, int ID, void *Data) -{ - tPTY *pty = Node->ImplPtr; - struct ptymode *mode = Data; - struct ptydims *dims = Data; - switch(ID) - { - case DRV_IOCTL_TYPE: return DRV_TYPE_TERMINAL; - case DRV_IOCTL_IDENT: memcpy(Data, "PTY\0", 4); return 0; - case DRV_IOCTL_VER: return 0x100; - case DRV_IOCTL_LOOKUP: return 0; + // FIFO + tTime timeout_z, *timeout = (Flags & VFS_IOFLAG_NOBLOCK) ? &timeout_z : NULL; + int rv; - case PTY_IOCTL_GETMODE: - if( !CheckMem(Data, sizeof(*mode)) ) { errno = EINVAL; return -1; } - *mode = pty->Mode; - return 0; - case PTY_IOCTL_SETMODE: - if( !CheckMem(Data, sizeof(*mode)) ) { errno = EINVAL; return -1; } - return PTY_SetAttrib(pty, NULL, mode, 1); - case PTY_IOCTL_GETDIMS: - if( !CheckMem(Data, sizeof(*dims)) ) { errno = EINVAL; return -1; } - *dims = pty->Dims; - return 0; - case PTY_IOCTL_SETDIMS: - if( !CheckMem(Data, sizeof(*dims)) ) { errno = EINVAL; return -1; } - return PTY_SetAttrib(pty, dims, NULL, 1); + rv = VFS_SelectNode(Node, VFS_SELECT_WRITE, timeout, "PTY_WriteClient"); + if(!rv ) { + errno = (timeout ? EWOULDBLOCK : EINTR); + return -1; } - errno = ENOSYS; - return -1; + + // Write to output ringbuffer + Length = _rb_write(pty->OutputData, OUTPUT_RINGBUFFER_LEN, + &pty->OutputReadPos, &pty->OutputWritePos, + Buffer, Length); + VFS_MarkAvaliable(pty->ServerNode, 1); + if( (pty->OutputWritePos + 1) % OUTPUT_RINGBUFFER_LEN == pty->OutputReadPos ) + VFS_MarkFull(Node, 1); + + return Length; } void PTY_ReferenceClient(tVFS_Node *Node) { Node->ReferenceCount ++; // TODO: Add PID to list of client PIDs - Log_Notice("PTY", "TODO: List of client PIDs"); +// Log_Notice("PTY", "ReferenceClient: TODO - List of client PIDs"); } void PTY_CloseClient(tVFS_Node *Node) @@ -633,11 +600,15 @@ void PTY_CloseClient(tVFS_Node *Node) Node->ReferenceCount --; // Remove PID from list + // TODO: Maintain list of client processes // Free structure if this was the last open handle - if( Node->ReferenceCount == 0 && pty->ServerNode.ReferenceCount == 0 ) + if( Node->ReferenceCount > 0 ) + return ; + if( pty->ServerNode && pty->ServerNode->ReferenceCount == 0 ) { // Free the structure! (Should be off the PTY list now) + free(pty->ServerNode); free(pty); } } @@ -646,6 +617,10 @@ void PTY_CloseClient(tVFS_Node *Node) size_t PTY_ReadServer(tVFS_Node *Node, off_t Offset, size_t Length, void *Buffer, Uint Flags) { tPTY *pty = Node->ImplPtr; + if( !pty ) { + errno = EIO; + return -1; + } // TODO: Prevent two servers fighting over client's output if( pty->OutputFcn ) @@ -674,44 +649,27 @@ size_t PTY_ReadServer(tVFS_Node *Node, off_t Offset, size_t Length, void *Buffer //\! Write to the client's input size_t PTY_WriteServer(tVFS_Node *Node, off_t Offset, size_t Length, const void *Buffer, Uint Flags) -{ - return PTY_SendInput(Node->ImplPtr, Buffer, Length); -} - -int PTY_IOCtlServer(tVFS_Node *Node, int ID, void *Data) { tPTY *pty = Node->ImplPtr; - struct ptymode *mode = Data; - struct ptydims *dims = Data; - switch(ID) - { - case DRV_IOCTL_TYPE: return DRV_TYPE_TERMINAL; - case DRV_IOCTL_IDENT: memcpy(Data, "PTY\0", 4); return 0; - case DRV_IOCTL_VER: return 0x100; - case DRV_IOCTL_LOOKUP: return 0; - - case PTY_IOCTL_GETMODE: - if( !CheckMem(Data, sizeof(*mode)) ) { errno = EINVAL; return -1; } - *mode = pty->Mode; - // ACK client's SETMODE - return 0; - case PTY_IOCTL_SETMODE: - if( !CheckMem(Data, sizeof(*mode)) ) { errno = EINVAL; return -1; } - PTY_SetAttrib(pty, NULL, mode, 0); - return 0; - case PTY_IOCTL_GETDIMS: - if( !CheckMem(Data, sizeof(*dims)) ) { errno = EINVAL; return -1; } - *dims = pty->Dims; - return 0; - case PTY_IOCTL_SETDIMS: - if( !CheckMem(Data, sizeof(*dims)) ) { errno = EINVAL; return -1; } - PTY_SetAttrib(pty, dims, NULL, 0); - break; - case PTY_IOCTL_GETID: - return pty->NumericName; + if( !pty ) { + errno = EIO; + return -1; } - errno = ENOSYS; - return -1; + + tTime timeout_z = 0, *timeout = (Flags & VFS_IOFLAG_NOBLOCK) ? &timeout_z : NULL; + int rv = VFS_SelectNode(Node, VFS_SELECT_WRITE, timeout, "PTY_WriteServer"); + if(!rv) { + errno = (timeout ? EWOULDBLOCK : EINTR); + return -1; + } + size_t used = 0; + do { + used += PTY_SendInput(Node->ImplPtr, Buffer, Length); + } while( used < Length && !(Flags & VFS_IOFLAG_NOBLOCK) ); + + if( (pty->InputWritePos+1)%INPUT_RINGBUFFER_LEN == pty->InputReadPos ) + VFS_MarkFull(Node, 1); + return used; } void PTY_CloseServer(tVFS_Node *Node) @@ -725,7 +683,7 @@ void PTY_CloseServer(tVFS_Node *Node) // Locate on list and remove tPTY **prev_np; - if( pty->Name[0] ) { + if( pty->NumericName == 0 ) { RWLock_AcquireWrite(&glPTY_NamedPTYs); prev_np = &gpPTY_FirstNamedPTY; } @@ -747,7 +705,7 @@ void PTY_CloseServer(tVFS_Node *Node) } // Clean up lock - if( pty->Name[0] ) { + if( pty->NumericName == 0 ) { RWLock_Release(&glPTY_NamedPTYs); giPTY_NamedCount --; } @@ -757,7 +715,71 @@ void PTY_CloseServer(tVFS_Node *Node) } // If there are no open children, we can safely free this PTY - if( pty->ClientNode.ReferenceCount == 0 ) + if( pty->ClientNode.ReferenceCount == 0 ) { + free(Node); free(pty); + } +} + +int PTY_IOCtl(tVFS_Node *Node, int ID, void *Data) +{ + tPTY *pty = Node->ImplPtr; + struct ptymode *mode = Data; + struct ptydims *dims = Data; + + int is_server = !pty || Node == pty->ServerNode; + + switch(ID) + { + case DRV_IOCTL_TYPE: return DRV_TYPE_TERMINAL; + case DRV_IOCTL_IDENT: memcpy(Data, "PTY\0", 4); return 0; + case DRV_IOCTL_VERSION: return 0x100; + case DRV_IOCTL_LOOKUP: return 0; + + case PTY_IOCTL_GETMODE: + if( !pty ) return 0; + if( !CheckMem(Data, sizeof(*mode)) ) { errno = EINVAL; return -1; } + *mode = pty->Mode; + // TODO: ACK client's SETMODE + return 0; + case PTY_IOCTL_SETMODE: + if( !pty ) return 0; + if( !CheckMem(Data, sizeof(*mode)) ) { errno = EINVAL; return -1; } + PTY_SetAttrib(pty, NULL, mode, !is_server); + return 0; + case PTY_IOCTL_GETDIMS: + if( !pty ) return 0; + if( !CheckMem(Data, sizeof(*dims)) ) { errno = EINVAL; return -1; } + *dims = pty->Dims; + return 0; + case PTY_IOCTL_SETDIMS: + if( !pty ) return 0; + if( !CheckMem(Data, sizeof(*dims)) ) { errno = EINVAL; return -1; } + PTY_SetAttrib(pty, dims, NULL, !is_server); + return 0; + case PTY_IOCTL_GETID: + if( pty ) + { + size_t len = strlen(pty->Name)+1; + if( Data ) + { + if( !CheckMem(Data, len) ) { errno = EINVAL; return -1; } + strcpy(Data, pty->Name); + } + return len; + } + return 0; + case PTY_IOCTL_SETID: + if( Data && !CheckString(Data) ) { errno = EINVAL; return -1; } + if( pty ) return EALREADY; + pty = PTY_Create(Data, NULL, NULL,NULL, NULL); + if(pty == NULL) + return 1; + Node->ImplPtr = pty; + pty->ServerNode = Node; + return 0; + } + errno = ENOSYS; + return -1; }