--- ansh/src/proc.c 2012/01/23 10:34:13 1.3 +++ ansh/src/proc.c 2012/05/23 15:41:38 1.3.2.2 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ - * $Id: proc.c,v 1.3 2012/01/23 10:34:13 misho Exp $ + * $Id: proc.c,v 1.3.2.2 2012/05/23 15:41:38 misho Exp $ * ************************************************************************* The ELWIX and AITNET software is distributed under the following @@ -12,7 +12,7 @@ terms: All of the documentation and software included in the ELWIX and AITNET Releases is copyrighted by ELWIX - Sofia/Bulgaria -Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -55,7 +55,7 @@ InitProc(int h, io_sockaddr_t *sa, u_short id, int len FTRACE(5); - proc = malloc(sizeof(struct tagProc)); + proc = io_malloc(sizeof(struct tagProc)); if (!proc) { ERR("Not enough memory #%d - %s", errno, strerror(errno)); return NULL; @@ -67,15 +67,15 @@ InitProc(int h, io_sockaddr_t *sa, u_short id, int len memcpy(&proc->proc_cli, sa, sizeof(io_sockaddr_t)); proc->proc_blen = len; - proc->proc_buf_[0] = malloc(proc->proc_blen); + proc->proc_buf_[0] = io_malloc(proc->proc_blen); if (!proc->proc_buf_[0]) { - free(proc); + io_free(proc); proc = NULL; } - proc->proc_buf_[1] = malloc(proc->proc_blen); + proc->proc_buf_[1] = io_malloc(proc->proc_blen); if (!proc->proc_buf_[1]) { - free(proc->proc_buf_[0]); - free(proc); + io_free(proc->proc_buf_[0]); + io_free(proc); proc = NULL; } @@ -105,10 +105,10 @@ FreeProc(struct tagProc ** __restrict proc) return; if ((*proc)->proc_buf_[1]) - free((*proc)->proc_buf_[1]); + io_free((*proc)->proc_buf_[1]); if ((*proc)->proc_buf_[0]) - free((*proc)->proc_buf_[0]); - free(*proc); + io_free((*proc)->proc_buf_[0]); + io_free(*proc); *proc = NULL; } @@ -121,4 +121,34 @@ DestroyProc() SLIST_REMOVE_HEAD(&pH, proc_next); FreeProc(&proc); } +} + + +int +stopProcess(sched_root_task_t * __restrict root, proc_head_t * __restrict h, pid_t pid, sched_task_func_t func) +{ + struct tagProc *p; + + FTRACE(3); + + SLIST_FOREACH(p, h, proc_next) + if (p->proc_pid == pid) { + break; + } + VERB(3) LOG("pid=%d found=%p\n", pid, p); + if (!p) + return 1; + + ioFreePTY(p->proc_pty, p->proc_ttyname); + if (p->proc_pty) + schedCancelby(root, taskMAX, CRITERIA_FD, (void*) ((intptr_t) p->proc_pty), NULL); + + p->proc_pty = 0; + p->proc_pid = 0; + p->proc_seq = 0; + p->proc_flg = ANSH_FLG_EOF; + p->proc_rlen_[FD2NET] = 0; + + schedCallOnce(root, func, p, p->proc_sock, NULL, 0); + return 0; }