X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FKernel%2Fdrv%2Fpty.c;h=d1f74c58d8fe47eab82114efa7c951b6f58119fe;hb=5f4d39ad0059ceec48c59d5ed87457a6bcb1c5f1;hp=496f2647f514625a37f834f42db734a21ccac8be;hpb=7479bf405c5173ab0b403ee4e6dd859580ed27d2;p=tpg%2Facess2.git diff --git a/KernelLand/Kernel/drv/pty.c b/KernelLand/Kernel/drv/pty.c index 496f2647..d1f74c58 100644 --- a/KernelLand/Kernel/drv/pty.c +++ b/KernelLand/Kernel/drv/pty.c @@ -5,6 +5,7 @@ * drv/pty.c * - Pseudo Terminals */ +#define DEBUG 0 #include #include #include @@ -12,6 +13,7 @@ #include #include #include +#include // === CONSTANTS === #define OUTPUT_RINGBUFFER_LEN 1024 // Number of bytes in output queue before client blocks @@ -29,6 +31,7 @@ struct sPTY void *OutputHandle; tPTY_OutputFcn OutputFcn; tPTY_ReqResize ReqResize; + tPTY_ModeSet ModeSet; struct ptymode Mode; struct ptydims Dims; @@ -47,18 +50,17 @@ 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 + + tPGID ControllingProcGroup; }; // === PROTOTYPES === 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); @@ -67,13 +69,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); @@ -81,28 +82,30 @@ 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", + .Flags = VFS_NODETYPEFLAG_STREAM, .Read = PTY_ReadClient, .Write = PTY_WriteClient, - .IOCtl = PTY_IOCtlClient, + .IOCtl = PTY_IOCtl, .Reference = PTY_ReferenceClient, .Close = PTY_CloseClient }; tVFS_NodeType gPTY_NodeType_Server = { .TypeName = "PTY-Server", + .Flags = VFS_NODETYPEFLAG_STREAM, .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; @@ -115,16 +118,68 @@ tPTY *gpPTY_FirstNamedPTY; // === CODE === int PTY_Install(char **Arguments) { + DevFS_AddDevice(&gPTY_Driver); return MODULE_ERR_OK; } // --- 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, const struct ptydims *InitialDims, const struct ptymode *InitialMode) { tPTY **prev_np = NULL; size_t namelen; int idx = 1; - if( Name && Name[0] ) + + if( !Name ) + Name = ""; + + if( Name[0] == '\0' ) + { + RWLock_AcquireWrite(&glPTY_NumPTYs); + // Get a pty ID if Name==NULL + prev_np = &gpPTY_FirstNumPTY; + for( tPTY *pty = gpPTY_FirstNumPTY; pty; prev_np = &pty->Next, pty = pty->Next ) + { + if( pty->NumericName > idx ) + break; + idx ++; + } + namelen = snprintf(NULL,0, "%u", idx); + } + else if( Name[strlen(Name)-1] == '#' ) + { + // Sequenced PTYs + // - "gui#" would translate to "gui0", "gui1", "gui2", ... + // whichever is free + prev_np = &gpPTY_FirstNamedPTY; + + RWLock_AcquireWrite(&glPTY_NamedPTYs); + idx = 0; + namelen = strlen(Name)-1; + for( tPTY *pty = gpPTY_FirstNamedPTY; pty; prev_np = &pty->Next, pty = pty->Next ) + { + int cmp = strncmp(pty->Name, Name, namelen); + if( cmp < 0 ) + continue ; + if( cmp > 0 ) + break; + + // Skip non-numbered + if( pty->Name[namelen] == '\0' ) + continue ; + + // Find an unused index + char *name_end; + int this_idx = strtol(pty->Name+namelen, &name_end, 10); + if( *name_end != '\0' ) + continue; + if( this_idx > idx ) + break; + idx ++; + } + + namelen += snprintf(NULL, 0, "%u", idx); + } + else { prev_np = &gpPTY_FirstNamedPTY; @@ -134,7 +189,7 @@ tPTY *PTY_Create(const char *Name, void *Handle, tPTY_OutputFcn Output, tPTY_Req errno = EINVAL; return NULL; } - + RWLock_AcquireWrite(&glPTY_NamedPTYs); // Detect duplicates for( tPTY *pty = gpPTY_FirstNamedPTY; pty; prev_np = &pty->Next, pty = pty->Next ) @@ -152,19 +207,6 @@ tPTY *PTY_Create(const char *Name, void *Handle, tPTY_OutputFcn Output, tPTY_Req namelen = strlen(Name); idx = -1; } - else - { - RWLock_AcquireWrite(&glPTY_NumPTYs); - // Get a pty ID if Name==NULL - prev_np = &gpPTY_FirstNumPTY; - for( tPTY *pty = gpPTY_FirstNumPTY; pty; prev_np = &pty->Next, pty = pty->Next ) - { - if( pty->NumericName > idx ) - break; - idx ++; - } - namelen = 0; - } tPTY *ret = calloc(sizeof(tPTY) + namelen + 1, 1); if(!ret) { @@ -177,24 +219,25 @@ tPTY *PTY_Create(const char *Name, void *Handle, tPTY_OutputFcn Output, tPTY_Req *prev_np = ret; // - PTY Name (Used by VT) ret->Name = (char*)(ret + 1); - if(Name) + if( idx == -1 ) strcpy(ret->Name, Name); + else if( Name[0] ) + sprintf(ret->Name, "%.*s%u", strlen(Name)-1, Name, idx); 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; + // - Initialise modes + if( InitialDims ) + ret->Dims = *InitialDims; + if( InitialMode ) + ret->Mode = *InitialMode; // - Client node + ret->ClientNode.Size = -1; ret->ClientNode.ImplPtr = ret; ret->ClientNode.Type = &gPTY_NodeType_Client; ret->ClientNode.UID = Threads_GetUID(); @@ -205,7 +248,7 @@ tPTY *PTY_Create(const char *Name, void *Handle, tPTY_OutputFcn Output, tPTY_Req ret->OwnerRW.Ent.ID = Threads_GetUID(); ret->OwnerRW.Perm.Perms = -1; - if( Name && Name[0] ) { + if( Name[0] ) { giPTY_NamedCount ++; RWLock_Release(&glPTY_NamedPTYs); } @@ -222,21 +265,37 @@ int PTY_SetAttrib(tPTY *PTY, const struct ptydims *Dims, const struct ptymode *M if( Mode ) { // (for now) userland terminals can't be put into framebuffer mode + // - Userland PTYs are streams, framebuffer is a block if( !PTY->OutputFcn && (Mode->OutputMode & PTYOMODE_BUFFMT) == PTYBUFFMT_FB ) { errno = EINVAL; return -1; } - PTY->Mode = *Mode; - if( !WasClient && !PTY->OutputFcn ) + if( WasClient ) { - Log_Warning("PTY", "TODO: Need to stop client output until modeset has been ACKed"); - // Block write until acked - // ACK by server doing GETMODE + if( PTY->ModeSet && PTY->ModeSet(PTY->OutputHandle, Mode) ) + { + errno = EINVAL; + return -1; + } + else if( !PTY->OutputFcn ) + { + Log_Warning("PTY", "TODO: Inform server of client SETMODE, halt output"); + // Block slave write until master ACKs + // 0-length read on master indicates need to GETMODE + } } + else + { + // Should the client be informed that the server just twiddled the modes? + Log_Warning("PTY", "Server changed mode, TODO: inform client?"); + } + 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) ) { @@ -246,11 +305,16 @@ int PTY_SetAttrib(tPTY *PTY, const struct ptydims *Dims, const struct ptymode *M else if( !PTY->OutputFcn ) { // Inform server process... somehow + Log_Warning("PTY", "TODO: Inform server of client resize request"); } } - else { + else + { // SIGWINSZ to client + if( PTY->ControllingProcGroup > 0 ) + Threads_SignalGroup(PTY->ControllingProcGroup, SIGWINCH); } + LOG("PTY %p dims set to %ix%i", PTY, Dims->W, Dims->H); PTY->Dims = *Dims; } return 0; @@ -263,7 +327,7 @@ void PTY_Close(tPTY *PTY) size_t _rb_write(void *buf, size_t buflen, int *rd, int *wr, const void *data, size_t len) { - size_t space = (*rd - *wr + buflen) % buflen - 1; + size_t space = (*rd - *wr + buflen - 1) % buflen; len = MIN(space, len); if(*wr + len >= buflen) { size_t prelen = buflen - *wr; @@ -306,8 +370,8 @@ size_t PTY_int_WriteInput(tPTY *PTY, const char *Input, size_t Length) Mutex_Release(&PTY->InputMutex); VFS_MarkAvaliable(&PTY->ClientNode, 1); - if(ret < Length) - VFS_MarkFull(&PTY->ServerNode, 1); + if(ret < Length && PTY->ServerNode) + VFS_MarkFull(PTY->ServerNode, 1); return ret; } @@ -316,21 +380,23 @@ size_t PTY_int_SendInput(tPTY *PTY, const char *Input, size_t Length) { size_t ret = 1, print = 1; - // Only counts for text input modes - if( (PTY->Mode.OutputMode & PTYOMODE_BUFFMT) == PTYBUFFMT_TEXT ) + // Input mode stuff only counts for text output mode + // - Any other mode sends Uint32 keypresses + if( (PTY->Mode.OutputMode & PTYOMODE_BUFFMT) != PTYBUFFMT_TEXT ) return PTY_int_WriteInput(PTY, Input, Length); - // If in raw mode, flush directlr + // If in raw mode, flush directly if( (PTY->Mode.InputMode & PTYIMODE_RAW) ) return PTY_int_WriteInput(PTY, Input, Length); if( PTY->Mode.InputMode & PTYIMODE_CANON ) { - const char char_bs = '\b'; + switch(Input[0]) { case 3: // INTR - ^C - // TODO: Send SIGINT - // Threads_PostSignalExt(PTY->ClientThreads, SIGINT); + // Send SIGINT + if( PTY->ControllingProcGroup > 0 ) + Threads_SignalGroup(PTY->ControllingProcGroup, SIGINT); print = 0; break; case 4: // EOF - ^D @@ -340,17 +406,21 @@ size_t PTY_int_SendInput(tPTY *PTY, const char *Input, size_t Length) print = 0; break; case 8: // Backspace - if(PTY->LineLength != 0) + if(PTY->LineLength != 0) { PTY->LineLength --; + PTY_WriteClient(&PTY->ClientNode, 0, 3, "\b \b", 0); + } + print = 0; break; case 'w'-'a': // Word erase while(PTY->LineLength != 0 && isalnum(PTY->LineData[--PTY->LineLength])) - PTY_WriteClient(&PTY->ClientNode, 0, 1, &char_bs, 0); + PTY_WriteClient(&PTY->ClientNode, 0, 1, "\b", 0); + PTY_WriteClient(&PTY->ClientNode, 0, 3, "\x1b[K", 0); print = 0; break; case 'u'-'a': // Kill - while(PTY->LineLength > 0) - PTY_WriteClient(&PTY->ClientNode, 0, 1, &char_bs, 0); + PTY_WriteClient(&PTY->ClientNode, 0, 8, "\x1b[2K\x1b[0G", 0); + PTY->LineLength = 0; print = 0; break; case 'v'-'a': @@ -383,7 +453,24 @@ size_t PTY_int_SendInput(tPTY *PTY, const char *Input, size_t Length) } else { - ret = PTY_int_WriteInput(PTY, Input, Length); + #if 0 + if( PTY->Mode.InputMode & PTYIMODE_NLCR ) + { + if( Input[0] == '\n' ) { + char ch = '\r'; + ret = PTY_int_WriteInput(PTY, &ch, 1); + } + else { + int i; + for( i = 0; i < Length && Input[i] != '\n'; i ++ ) + ; + ret = PTY_int_WriteInput(PTY, Input, i); + } + } + // TODO: CRNL mode? + else + #endif + ret = PTY_int_WriteInput(PTY, Input, Length); } // Echo if requested @@ -410,37 +497,28 @@ 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 ) { return -1; - - if( pty->Name[0] ) - snprintf(Name, 255, "%s%c", pty->Name, (Pos == 0 ? 'c' : 's')); - else - snprintf(Name, 255, "%i%c", pty->NumericName, (Pos == 0 ? 'c' : 's')); + } + + strncpy(Name, pty->Name, FILENAME_MAX); return 0; } @@ -448,17 +526,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); @@ -479,40 +559,24 @@ 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; +// Debug("PTY_FindDir('%s') returned %p", Name, &ret->ClientNode); + 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 @@ -525,7 +589,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; @@ -540,6 +604,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) @@ -559,66 +625,53 @@ 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); + LOG("SIGPIPE, server has terminated"); + Threads_PostSignal(SIGPIPE); errno = EIO; return -1; } // Write to either FIFO or directly to output function - if( pty->OutputFcn ) - { - pty->OutputFcn(pty->OutputHandle, Buffer, Length, pty->Mode.OutputMode); + LOG("pty->OutputFcn = %p", pty->OutputFcn); + if( pty->OutputFcn ) { + pty->OutputFcn(pty->OutputHandle, Length, Buffer); + return Length; } - else + + // FIFO + size_t remaining = Length; + do { + tTime timeout_z, *timeout = (Flags & VFS_IOFLAG_NOBLOCK) ? &timeout_z : NULL; + int rv; + + rv = VFS_SelectNode(Node, VFS_SELECT_WRITE, timeout, "PTY_WriteClient"); + if(!rv) { + errno = (timeout ? EWOULDBLOCK : EINTR); + return -1; + } + // Write to output ringbuffer - Length = _rb_write(pty->OutputData, OUTPUT_RINGBUFFER_LEN, + size_t written = _rb_write(pty->OutputData, OUTPUT_RINGBUFFER_LEN, &pty->OutputReadPos, &pty->OutputWritePos, - Buffer, Length); - VFS_MarkAvaliable(&pty->ServerNode, 1); - } - - 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; + Buffer, remaining); + LOG("Wrote %i of %i : '%.*s'", written, remaining, written, Buffer); + VFS_MarkAvaliable(pty->ServerNode, 1); + if( (pty->OutputWritePos + 1) % OUTPUT_RINGBUFFER_LEN == pty->OutputReadPos ) + VFS_MarkFull(Node, 1); + + remaining -= written; + Buffer = (const char*)Buffer + written; + } while( remaining > 0 || (Flags & VFS_IOFLAG_NOBLOCK) ); - 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); - } - errno = ENOSYS; - return -1; + return Length - remaining; } void PTY_ReferenceClient(tVFS_Node *Node) { Node->ReferenceCount ++; - // TODO: Add PID to list of client PIDs - Log_Notice("PTY", "TODO: List of client PIDs"); } void PTY_CloseClient(tVFS_Node *Node) @@ -627,11 +680,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); } } @@ -640,6 +697,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 ) @@ -659,6 +720,7 @@ size_t PTY_ReadServer(tVFS_Node *Node, off_t Offset, size_t Length, void *Buffer Length = _rb_read(pty->OutputData, OUTPUT_RINGBUFFER_LEN, &pty->OutputReadPos, &pty->OutputWritePos, Buffer, Length); + LOG("Read %i '%.*s'", Length, Length, Buffer); if( pty->OutputReadPos == pty->OutputWritePos ) VFS_MarkAvaliable(Node, 0); VFS_MarkFull(&pty->ClientNode, 0); @@ -668,46 +730,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) -{ - // Write to current line buffer, flushing on unknown character or newline - // - or line wrap? - // Echo back if instructed - PTY_SendInput(Node->ImplPtr, Buffer, Length); - return -1; -} - -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; + 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) @@ -721,7 +764,7 @@ void PTY_CloseServer(tVFS_Node *Node) // Locate on list and remove tPTY **prev_np; - if( pty->Name[0] ) { + if( pty->NumericName == -1 ) { RWLock_AcquireWrite(&glPTY_NamedPTYs); prev_np = &gpPTY_FirstNamedPTY; } @@ -743,7 +786,7 @@ void PTY_CloseServer(tVFS_Node *Node) } // Clean up lock - if( pty->Name[0] ) { + if( pty->NumericName == -1 ) { RWLock_Release(&glPTY_NamedPTYs); giPTY_NamedCount --; } @@ -752,8 +795,88 @@ void PTY_CloseServer(tVFS_Node *Node) giPTY_NumCount --; } + // Send SIGHUP to controling PGID + if( pty->ControllingProcGroup > 0 ) { + Threads_SignalGroup(pty->ControllingProcGroup, SIGHUP); + } + // 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; + + LOG("(%i,%p) %s", ID, Data, (is_server?"Server":"Client")); + + 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, NULL,NULL); + if(pty == NULL) + return 1; + Node->ImplPtr = pty; + pty->ServerNode = Node; + return 0; + case PTY_IOCTL_SETPGRP: + // TODO: Should this only be done by client? + if( Data ) + { + if( !CheckMem(Data, sizeof(tPGID)) ) { errno = EINVAL; return -1; } + pty->ControllingProcGroup = *(tPGID*)Data; + Log_Debug("PTY", "Set controlling PGID to %i", pty->ControllingProcGroup); + } + return pty->ControllingProcGroup; + } + errno = ENOSYS; + return -1; }