diff --git a/PIPEasp_CNL113334.tpd b/PIPEasp_CNL113334.tpd
index a32b7cee4f9b83f644b10cf24427534d10e950ba..f93f65d3e18484623a85f35780e2add8d1870f1b 100644
--- a/PIPEasp_CNL113334.tpd
+++ b/PIPEasp_CNL113334.tpd
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2014 Ericsson
+ Copyright (c) 2015 Ericsson
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
@@ -10,10 +10,8 @@
File: PIPEasp_CNL113334.tpd
Description: tpd project file
- Rev: R7A
+ Rev: R7C
Prodnr: CNL 113 334
- Updated: 2014-09-24
- Contact: http://ttcn.ericsson.se
-->
<TITAN_Project_File_Information version="1.0">
@@ -47,6 +45,7 @@
<NamingCoventions>
<enableProjectSpecificSettings>true</enableProjectSpecificSettings>
<externalFunction>[e]?f_.*</externalFunction>
+ <formalParameter>.*</formalParameter>
</NamingCoventions>
</ProjectProperties>
<FileProperties>
diff --git a/doc/PIPEasp_CNL113334_1551.pdf b/doc/PIPEasp_CNL113334_1551.pdf
deleted file mode 100644
index 035bafa02b09665019889678440fe338226c3ba8..0000000000000000000000000000000000000000
Binary files a/doc/PIPEasp_CNL113334_1551.pdf and /dev/null differ
diff --git a/doc/PIPEasp_CNL113334_PRI.doc b/doc/PIPEasp_CNL113334_PRI.doc
new file mode 100644
index 0000000000000000000000000000000000000000..8d160e6a75cebfef67e57deda5a0ef1a22107202
Binary files /dev/null and b/doc/PIPEasp_CNL113334_PRI.doc differ
diff --git a/src/PIPE.grp b/src/PIPE.grp
index 67456da0f3fbd481287519d472db68b2fcc74afc..a25dac6ae91a11e68c23f4221f191be99238be7c 100644
--- a/src/PIPE.grp
+++ b/src/PIPE.grp
@@ -19,7 +19,7 @@
//
// File: PIPE.grp
// Description: Group file of PIPE testport implementation
-// Rev: R7A
+// Rev: R7C
// Prodnr: CNL 113 334
//
-->
diff --git a/src/PIPEasp_PT.cc b/src/PIPEasp_PT.cc
index c3f00023cafb3872ff222d4598ef26ed64aaa6a5..d71b13987d5be42fd13c83d0a04a84281e3039a4 100644
--- a/src/PIPEasp_PT.cc
+++ b/src/PIPEasp_PT.cc
@@ -18,7 +18,7 @@
//
// File: PIPEasp_PT.cc
// Description: Source code of PIPE testport implementation
-// Rev: R7A
+// Rev: R7C
// Prodnr: CNL 113 334
//
@@ -50,7 +50,6 @@
#include <sys/stream.h>
#include <sys/stropts.h>
/////////////////////////////////////
-
int forkpty_solaris (int *amaster, char *name, struct termios
*termp, struct winsize *winp)
{
@@ -281,8 +280,9 @@ void PIPEasp__PT::Handle_Fd_Event_Readable(int /*fd*/)
}
}
-void PIPEasp__PT::user_map(const char */*system_port*/)
+void PIPEasp__PT::user_map(const char *system_port)
{
+ log("%s mapping, child pid: %d",system_port, processServerPid);
Handler_Add_Fd_Read(processServerUp);
pipedata_len=1;
pipedata_used=1;
@@ -329,8 +329,8 @@ void PIPEasp__PT::send_p_id_to_thread(const int p_id){
void PIPEasp__PT::user_unmap(const char *system_port)
{
- log("user_unmap started *s",system_port);
-
+ log("user_unmap started %s",system_port);
+//printf("****user_unmap started %s",system_port);
Uninstall_Handler();
log("Sending unmap to processServer");
TTCN_Buffer out_buff;
@@ -338,7 +338,9 @@ void PIPEasp__PT::user_unmap(const char *system_port)
process_buffer.clear();
int write_len=put_msg(out_buff,9,0,NULL,-1); // Sending unmap to processServer
- write(processServerDown,out_buff.get_data(),write_len);
+ log("Sending unmap message to the fork server %d",write_len);
+ int res=write(processServerDown,out_buff.get_data(),write_len);
+ log("Message sent %d",res);
if(main_data){
for(int i=0;i<pipedata_len;i++) {
@@ -352,8 +354,12 @@ void PIPEasp__PT::user_unmap(const char *system_port)
log("user_unmap finsihed");
}
-
void PIPEasp__PT::user_start()
+{
+start_child();
+}
+
+void PIPEasp__PT::start_child()
{
if(processServerPid != -1) return;
int pipefd[2];
@@ -387,6 +393,20 @@ void PIPEasp__PT::user_start()
// close the parent end of the pipes
processServerUp=pipefd2[1];
processServerDown=pipefd[0];
+
+// This is a hack
+// All fds (except the pipe) should be closed in order to avoid some "funny" communication lost between the mctr and PTC
+// There is no easy way to get the list of the open fds
+// The start_child called when the test port is started first time
+// which is right after the component initialization/first test case start
+// fd 0-3 are the standard io fds
+// there are only 2 or 3 fd opened by the TITAN run time (they should be closed)
+// So it is assummed the max value of the fd below 42
+for(int i=4;i<42;i++){
+ if((i!=processServerUp) && (i!=processServerDown)){
+ close(i);
+ }
+}
close(pipefd[1]);
close(pipefd2[0]);
processHandler();
@@ -400,7 +420,7 @@ void PIPEasp__PT::user_start()
// Parent process
//
- TTCN_warning("Process started with pid: %d\r\n", processServerPid);
+// TTCN_warning("Process started with pid: %d\r\n", processServerPid);
// close child end of the pipes
processServerUp=pipefd2[0];
processServerDown=pipefd[1];
@@ -1319,7 +1339,7 @@ void PIPEasp__PT::processHandler(){
fd_set select_set;
FD_ZERO(&working_set);
FD_ZERO(&select_set);
-//printf("PIPEasp__PT::processHandler() started\r\n");
+//printf("PIPEasp__PT::processHandler() started %d\r\n",getpid());
FD_SET(processServerDown, &working_set);
max_fd=processServerDown;
while(executing){
@@ -1369,7 +1389,7 @@ void PIPEasp__PT::processHandler(){
int p_id;
while((msg_len=get_len(process_buffer))!=-1){
const unsigned char* msg=process_buffer.get_data();
- //printf("messages from ttcn, %d, %d,%d,%d\n", msg[0], msg_len, msg[1], msg[2]);
+//printf("messages from ttcn, %d, %d,%d,%d\n", msg[0], msg_len, msg[1], msg[2]);
switch(msg[0]){
case 1: // kill the server
close(processServerDown);
@@ -1497,7 +1517,7 @@ void PIPEasp__PT::processHandler(){
close_and_remove_fd(thread_data[p_id].processStderr);
thread_data[p_id].processStderr=-1;
if(thread_data[p_id].processStdout==-1) handle_childDeath_inprocess(p_id);
- //printf("handle_childDeath_inprocess end, \r\n");
+// printf("handle_childDeath_inprocess end, \r\n");
}
}
if(thread_data[p_id].processPty!=-1 && FD_ISSET(thread_data[p_id].processPty,&select_set)){
@@ -1515,7 +1535,7 @@ void PIPEasp__PT::processHandler(){
close_and_remove_fd(thread_data[p_id].processPty);
thread_data[p_id].processPty=-1;
handle_childDeath_inprocess(p_id);
- //printf("handle_childDeath_inprocess end, %d \r\n", executing);
+// printf("handle_childDeath_inprocess end, %d \r\n", executing);
}
}
}
diff --git a/src/PIPEasp_PT.hh b/src/PIPEasp_PT.hh
index dcae1f8a087607426c981ed35bb044116afce58a..9fbae9812dc6f6f47f963ec77010cc0e03439f5e 100644
--- a/src/PIPEasp_PT.hh
+++ b/src/PIPEasp_PT.hh
@@ -18,7 +18,7 @@
//
// File: PIPEasp_PT.hh
// Description: Header file of PIPE testport implementation
-// Rev: R7A
+// Rev: R7C
// Prodnr: CNL 113 334
//
@@ -78,6 +78,8 @@ protected:
void user_map(const char *system_port);
void user_unmap(const char *system_port);
+ void start_child();
+
void user_start();
void user_stop();
diff --git a/src/PIPEasp_PortType.ttcn b/src/PIPEasp_PortType.ttcn
index f431ea699e8bbed626a9d9cc2ba78e7b0e8eef02..4692eba0b9c0b9e530cc36b279cdf7388a46a175 100644
--- a/src/PIPEasp_PortType.ttcn
+++ b/src/PIPEasp_PortType.ttcn
@@ -17,7 +17,7 @@
******************************************************************************/
//
// File: PIPEasp_PortType.ttcn
-// Rev: R7A
+// Rev: R7C
// Prodnr: CNL 113 334
module PIPEasp_PortType
diff --git a/src/PIPEasp_Types.ttcn b/src/PIPEasp_Types.ttcn
index 4e6fcba243cbcde6f02d0c27c358c5f609f825af..8f02a737f02fcc22eed2daed774d27bbf5e58520 100644
--- a/src/PIPEasp_Types.ttcn
+++ b/src/PIPEasp_Types.ttcn
@@ -18,7 +18,7 @@
//
// File: PIPEasp_Types.ttcn
// Description: PIPE (ASP) definitions
-// Rev: R7A
+// Rev: R7C
// Prodnr: CNL 113 334
//