Add kill plot request

Benjamin Renard
1 parent ea91395b
Showing 8 changed files with 121 additions and 7 deletions Show diff stats
src/InputOutput/IHMImpl/IHMInputOutputClass.php
src/InputOutput/IHMImpl/Params/PlotImpl/IHMInputOutputParamsKillPlotClass.php
src/InputOutput/IHMImpl/Params/PlotImpl/IHMInputOutputParamsPlotClass.php
src/Request/ParamsRequestImpl/ParamsRequestClass.php
src/Request/ProcessRequestImpl/Process/ProcessClass.php
src/Request/ProcessRequestImpl/Process/ProcessManagerClass.php
src/Request/ProcessRequestImpl/ProcessRequestClass.php
src/Request/ProcessRequestImpl/ProcessRequestDataClass.php
@@ -53,7 +53,11 @@ class IHMInputOutputClass implements InputOutputInterface
 					case 'statistics' :
 						//catalog generation
 						$this->inputOutput = new IHMInputOutputParamsStatisticsClass();
-						break;	
+						break;
+					case 'killplot' :
+						$requestId = "Plot";
+						$this->inputOutput = new IHMInputOutputParamsKillPlotClass();
+						break;
 					default :
 						throw new Exception('Params request type '.$input_request->nodeType.' not implemented for this client.');
 				}
@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * @class IHMInputOutputParamsKillPlotClass
+ * @brief Implementation of IHMInputOutputParamsKillPlotClass to kill plot request
+ * @details
+*/
+class IHMInputOutputParamsKillPlotClass extends IHMInputOutputParamsAbstractClass
+{
+	/*
+	 * @brief method to unmarshall a plot request
+	*/
+	protected function unmarshallRequest($input)
+	{
+		
+		$this->paramsData->setType(ProcessTypeEnumClass::KILL);
+		
+		$requestIdFilePath = $this->getWorkingPath().'process_id';
+		
+		if (!file_exists($requestIdFilePath))
+			throw new Exception('Cannot retrieve current running plot request.');
+		
+		$process_id = file_get_contents($requestIdFilePath);
+		
+		if ($process_id === false)
+			throw new Exception('Cannot retrieve current running plot request.');
+		
+		$process_id = str_replace(array("\r", "\n"), '', $process_id);
+		
+		$this->paramsData->setId($process_id);
+		
+		return $this->paramsData;
+	}
+
+	/*
+	 * @brief method to marshall the result of a kill plot request
+	*/
+	protected function marshallResult($data)
+	{
+		if (!$data->getSuccess())
+			return array(
+					'success' => false,
+					'message' => $data->getLastErrorMessage());
+		
+		return array('success' => true);
+	}
+}
+?>
 \ No newline at end of file
@@ -836,7 +836,11 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 					'id'          => $data->getId(),
 					'folder'      => $this->getWorkingDirName(),
 					'result'      => $result
-				);
+				);
+			case ProcessStatusEnumClass::KILLED :
+				return array(
+						'success'     => true,
+						'killed'      => true);
 			default :
 				return array(
 				'success' => false,
@@ -14,6 +14,9 @@ class ParamsRequestClass extends ProcessRequestClass
 		if (!isset($this->requestData))
 			return false;
  
+		if ($this->requestData->getType(ProcessTypeEnumClass::KILL))
+			return true;
+		
 		$this->requestData->setType(ProcessTypeEnumClass::RUN);
  
 		switch ($this->requestData->getRequestType())
@@ -172,7 +172,9 @@ class ProcessClass
 	*/
 	public function stop()
 	{
-		$cmd = 'kill '.$this->pID;
+		//Kill process and all child processes
+		$cmd = "pkill -TERM -P $this->pID";
+		//$cmd = 'kill '.$this->pID;
 		exec($cmd);
 		return !$this->isRunning();
 	}
@@ -33,12 +33,25 @@ class ProcessManagerClass
 			$process->stop();
 			return $res;
 		}
+		
+		//Save process id in running path
+		chdir($runningPath);
+		file_put_contents("process_id", $res['result']['id'].PHP_EOL);
  
 		$process->waitEndOfProcess(array($this,'waitEndOfProcess'),$batchEnabled);
  
 		return $this->getProcessInfo($res['result']['id'],true);
 	}
-
+	
+	/*
+	 * @brief Kill a process
+	 */
+	public function killProcess($id)
+	{
+		$res = $this->concurrentAccessProcessManagerFile(array($this,'killProcessFromId'),$id);
+		return $res;
+	}
+	
 	/*
 	 * @brief Get info about a process
 	*/
@@ -149,7 +162,7 @@ class ProcessManagerClass
 		$this->updateProcessStatusToNode($dom,$processNode,"PID",$process->getPID());
 		$this->updateProcessStatusToNode($dom,$processNode,"runningpath",$process->getRunningPath());
 		$this->updateProcessStatusToNode($dom,$processNode,"runningstart",$process->getRunningStart());
-		$this->updateProcessStatusToNode($dom,$processNode,"isrunning",$process->isRunning());
+		$this->updateProcessStatusToNode($dom,$processNode,"isrunning",$process->isRunning() ? "true" : "false");
 		$this->updateProcessStatusToNode($dom,$processNode,"lastupdate",time());
 	}
  
@@ -168,7 +181,8 @@ class ProcessManagerClass
 				"PID"          => $this->getNodeValueFromNode($processNode, "PID"),
 				"runningpath"  => $this->getNodeValueFromNode($processNode, "runningpath"),
 				"runningstart" => $this->getNodeValueFromNode($processNode, "runningstart"),
-				"isrunning"    => $this->getNodeValueFromNode($processNode, "isrunning"),
+				"isrunning"    => ($this->getNodeValueFromNode($processNode, "isrunning") == "true"),
+				"iskilled"     => ($this->getNodeValueFromNode($processNode, "iskilled") == "true"),
 				"lastupdate"   => $this->getNodeValueFromNode($processNode, "lastupdate")
 		);
 	}
@@ -284,6 +298,36 @@ class ProcessManagerClass
  
 		return array('success' => false, 'message' => 'Cannot get process from id');
 	}
+	
+	/*
+	 * @brief Kill a process
+	*/
+	private function killProcessFromId($dom, $id)
+	{
+		$processNodes = $dom->documentElement->getElementsByTagName("process");
+		foreach ($processNodes as $processNode)
+		{
+			if ($processNode->getAttribute('xml:id') == $id)
+			{
+				$process = $this->getProcessFromNode($processNode);
+				if (!isset($process))
+					return array('success' => false, 'message' => 'Error to retrieve process info');
+	
+				$this->updateProcessStatusToNode($dom,$processNode,"isrunning","false");
+				$this->updateProcessStatusToNode($dom,$processNode,"iskilled","true");
+				
+				if ($process->stop())
+				{
+					$dom->save($this->processManagerFilePath);
+	
+					return array('success' => true);
+				}
+				return array('success' => false, 'message' => 'Cannot process from id');
+			}
+		}
+	
+		return array('success' => false, 'message' => 'Cannot kill process from id '.$id);
+	}
 }
  
 ?>
 \ No newline at end of file
@@ -81,7 +81,9 @@ class ProcessRequestClass extends RequestAbstractClass
 			$this->requestData->setStatus(ProcessStatusEnumClass::RUNNING);
 		else
 		{
-			if (!isset($processInfo['exitcode']) || ($processInfo['exitcode'] != 0))
+			if (isset($processInfo['iskilled']) && $processInfo['iskilled'])
+				$this->requestData->setStatus(ProcessStatusEnumClass::KILLED);
+			else if (!isset($processInfo['exitcode']) || ($processInfo['exitcode'] != 0))
 				$this->requestData->setStatus(ProcessStatusEnumClass::ERROR);
 			else
 				$this->requestData->setStatus(ProcessStatusEnumClass::DONE);
@@ -130,6 +132,11 @@ class ProcessRequestClass extends RequestAbstractClass
 				if ($result['success'])
 					$this->updateProcess($result['result']);
 				break;
+			case ProcessTypeEnumClass::KILL :
+				$result = $processMgr->killProcess($this->requestData->getId());
+				if ($result['success'])
+					$result = $result['result'];
+				break;
 			default :
 				$this->requestData->setLastErrorMessage("Process method not implemented");
 				return false;
@@ -11,6 +11,7 @@ abstract class ProcessTypeEnumClass
 	const RUN     = "run";
 	const DELETE  = "delete";
 	const INFO    = "info";
+	const KILL    = "kill";
 }
  
 /**
@@ -24,6 +25,7 @@ abstract class ProcessStatusEnumClass
 	const ERROR   = "error";
 	const RUNNING = "run";
 	const DONE    = "done";
+	const KILLED  = "killed";
 }
  
 /**