Skip to content

P
proview
Commit 86602372 authored by claes's avatar claes
Browse files
Options

Memory leakage fixed

parent d657e28c
Hide whitespace changes
Inline Side-by-side
Showing with 132 additions and 106 deletions
src/exe/rt_statussrv/src/rt_statussrv.cpp
View file @ 86602372
/*
* Proview $Id: rt_statussrv.cpp,v 1.4 2007-05-25 13:38:07 claes Exp $
* Proview $Id: rt_statussrv.cpp,v 1.5 2007-06-01 11:28:33 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB.
*
* This program is free software; you can redistribute it and/or
......@@ -272,25 +272,30 @@ SOAP_FMAC5 int SOAP_FMAC6 __s0__GetStatus(struct soap *soap,
clock_gettime( CLOCK_REALTIME, &current_time);
if ( s0__GetStatus->ClientRequestHandle)
s0__GetStatusResponse->ClientRequestHandle =
new std::string( *s0__GetStatus->ClientRequestHandle);
if ( s0__GetStatus->ClientRequestHandle) {
s0__GetStatusResponse->ClientRequestHandle = soap_new_std__string( soap, -1);
s0__GetStatusResponse->ClientRequestHandle->assign( *s0__GetStatus->ClientRequestHandle);
}
if ( strcmp( statussrv->version, "") != 0)
s0__GetStatusResponse->Version = std::string( statussrv->version);
s0__GetStatusResponse->Version.assign( statussrv->version);
else
s0__GetStatusResponse->Version = std::string( pwrv_cPwrVersionStr);
s0__GetStatusResponse->Version.assign( pwrv_cPwrVersionStr);
s0__GetStatusResponse->SystemStatus = statussrv->m_node->SystemStatus;
statussrv_GetText( statussrv->m_node->SystemStatus, msg, sizeof(msg));
s0__GetStatusResponse->SystemStatusStr = std::string( msg);
s0__GetStatusResponse->Description = new std::string( statussrv->m_node->Description);
s0__GetStatusResponse->SystemStatusStr.assign( msg);
s0__GetStatusResponse->Description = soap_new_std__string( soap, -1);
s0__GetStatusResponse->Description->assign( statussrv->m_node->Description);
time_AtoAscii( &statussrv->m_node->SystemTime, time_eFormat_DateAndTime, timstr, sizeof(timstr));
s0__GetStatusResponse->SystemTime = new std::string( timstr);
s0__GetStatusResponse->SystemTime = soap_new_std__string( soap, -1);
s0__GetStatusResponse->SystemTime->assign( timstr);
time_AtoAscii( &statussrv->m_node->BootTime, time_eFormat_DateAndTime, timstr, sizeof(timstr));
s0__GetStatusResponse->BootTime = new std::string( timstr);
s0__GetStatusResponse->BootTime = soap_new_std__string( soap, -1);
s0__GetStatusResponse->BootTime->assign( timstr);
time_AtoAscii( &statussrv->m_node->RestartTime, time_eFormat_DateAndTime, timstr, sizeof(timstr));
s0__GetStatusResponse->RestartTime = new std::string( timstr);
s0__GetStatusResponse->Restarts = (int *) malloc( sizeof(s0__GetStatusResponse->Restarts));
s0__GetStatusResponse->RestartTime = soap_new_std__string( soap, -1);
s0__GetStatusResponse->RestartTime->assign( timstr);
s0__GetStatusResponse->Restarts = (int *) soap_malloc( soap, sizeof(s0__GetStatusResponse->Restarts));
*s0__GetStatusResponse->Restarts = statussrv->m_node->Restarts;
return SOAP_OK;
}
......@@ -309,202 +314,202 @@ SOAP_FMAC5 int SOAP_FMAC6 __s0__GetExtStatus(struct soap *soap,
s0__GetExtStatusResponse->ServerSts1 = statussrv->m_node->ProcStatus[0];
statussrv_GetText( statussrv->m_node->ProcStatus[0], msg, sizeof(msg));
s0__GetExtStatusResponse->ServerSts1Str = std::string( msg);
s0__GetExtStatusResponse->ServerSts1Name = std::string( "rt_ini");
s0__GetExtStatusResponse->ServerSts1Name.assign( "rt_ini");
s0__GetExtStatusResponse->ServerSts2 = statussrv->m_node->ProcStatus[1];
statussrv_GetText( statussrv->m_node->ProcStatus[1], msg, sizeof(msg));
s0__GetExtStatusResponse->ServerSts2Str = std::string( msg);
s0__GetExtStatusResponse->ServerSts2Name = std::string( "rt_qmon");
s0__GetExtStatusResponse->ServerSts2Str.assign( msg);
s0__GetExtStatusResponse->ServerSts2Name.assign( "rt_qmon");
s0__GetExtStatusResponse->ServerSts3 = statussrv->m_node->ProcStatus[2];
statussrv_GetText( statussrv->m_node->ProcStatus[2], msg, sizeof(msg));
s0__GetExtStatusResponse->ServerSts3Str = std::string( msg);
s0__GetExtStatusResponse->ServerSts3Name = std::string( "rt_neth");
s0__GetExtStatusResponse->ServerSts3Str.assign( msg);
s0__GetExtStatusResponse->ServerSts3Name.assign( "rt_neth");
s0__GetExtStatusResponse->ServerSts4 = statussrv->m_node->ProcStatus[3];
statussrv_GetText( statussrv->m_node->ProcStatus[3], msg, sizeof(msg));
s0__GetExtStatusResponse->ServerSts4Str = std::string( msg);
s0__GetExtStatusResponse->ServerSts4Name = std::string( "rt_neth_acp");
s0__GetExtStatusResponse->ServerSts4Str.assign( msg);
s0__GetExtStatusResponse->ServerSts4Name.assign( "rt_neth_acp");
s0__GetExtStatusResponse->ServerSts5 = statussrv->m_node->ProcStatus[4];
statussrv_GetText( statussrv->m_node->ProcStatus[4], msg, sizeof(msg));
s0__GetExtStatusResponse->ServerSts5Str = std::string( msg);
s0__GetExtStatusResponse->ServerSts5Name = std::string( "rt_io");
s0__GetExtStatusResponse->ServerSts5Str.assign( msg);
s0__GetExtStatusResponse->ServerSts5Name.assign( "rt_io");
s0__GetExtStatusResponse->ServerSts6 = statussrv->m_node->ProcStatus[5];
statussrv_GetText( statussrv->m_node->ProcStatus[5], msg, sizeof(msg));
s0__GetExtStatusResponse->ServerSts6Str = std::string( msg);
s0__GetExtStatusResponse->ServerSts6Name = std::string( "rt_tmon");
s0__GetExtStatusResponse->ServerSts6Str.assign( msg);
s0__GetExtStatusResponse->ServerSts6Name.assign( "rt_tmon");
s0__GetExtStatusResponse->ServerSts7 = statussrv->m_node->ProcStatus[6];
statussrv_GetText( statussrv->m_node->ProcStatus[6], msg, sizeof(msg));
s0__GetExtStatusResponse->ServerSts7Str = std::string( msg);
s0__GetExtStatusResponse->ServerSts7Name = std::string( "rt_emon");
s0__GetExtStatusResponse->ServerSts7Str.assign( msg);
s0__GetExtStatusResponse->ServerSts7Name.assign( "rt_emon");
s0__GetExtStatusResponse->ServerSts8 = statussrv->m_node->ProcStatus[7];
statussrv_GetText( statussrv->m_node->ProcStatus[7], msg, sizeof(msg));
s0__GetExtStatusResponse->ServerSts8Str = std::string( msg);
s0__GetExtStatusResponse->ServerSts8Name = std::string( "rt_alim");
s0__GetExtStatusResponse->ServerSts8Str.assign( msg);
s0__GetExtStatusResponse->ServerSts8Name.assign( "rt_alim");
s0__GetExtStatusResponse->ServerSts9 = statussrv->m_node->ProcStatus[8];
statussrv_GetText( statussrv->m_node->ProcStatus[8], msg, sizeof(msg));
s0__GetExtStatusResponse->ServerSts9Str = std::string( msg);
s0__GetExtStatusResponse->ServerSts9Name = std::string( "rt_bck");
s0__GetExtStatusResponse->ServerSts9Str.assign( msg);
s0__GetExtStatusResponse->ServerSts9Name.assign( "rt_bck");
s0__GetExtStatusResponse->ServerSts10 = statussrv->m_node->ProcStatus[9];
statussrv_GetText( statussrv->m_node->ProcStatus[9], msg, sizeof(msg));
s0__GetExtStatusResponse->ServerSts10Str = std::string( msg);
s0__GetExtStatusResponse->ServerSts10Name = std::string( "rt_linksup");
s0__GetExtStatusResponse->ServerSts10Str.assign( msg);
s0__GetExtStatusResponse->ServerSts10Name.assign( "rt_linksup");
s0__GetExtStatusResponse->ServerSts11 = statussrv->m_node->ProcStatus[10];
statussrv_GetText( statussrv->m_node->ProcStatus[10], msg, sizeof(msg));
s0__GetExtStatusResponse->ServerSts11Str = std::string( msg);
s0__GetExtStatusResponse->ServerSts11Name = std::string( "rt_trend");
s0__GetExtStatusResponse->ServerSts11Str.assign( msg);
s0__GetExtStatusResponse->ServerSts11Name.assign( "rt_trend");
s0__GetExtStatusResponse->ServerSts12 = statussrv->m_node->ProcStatus[11];
statussrv_GetText( statussrv->m_node->ProcStatus[11], msg, sizeof(msg));
s0__GetExtStatusResponse->ServerSts12Str = std::string( msg);
s0__GetExtStatusResponse->ServerSts12Name = std::string( "rt_fast");
s0__GetExtStatusResponse->ServerSts12Str.assign( msg);
s0__GetExtStatusResponse->ServerSts12Name.assign( "rt_fast");
s0__GetExtStatusResponse->ServerSts13 = statussrv->m_node->ProcStatus[12];
statussrv_GetText( statussrv->m_node->ProcStatus[12], msg, sizeof(msg));
s0__GetExtStatusResponse->ServerSts13Str = std::string( msg);
s0__GetExtStatusResponse->ServerSts13Name = std::string( "rt_elog");
s0__GetExtStatusResponse->ServerSts13Str.assign( msg);
s0__GetExtStatusResponse->ServerSts13Name.assign( "rt_elog");
s0__GetExtStatusResponse->ServerSts14 = statussrv->m_node->ProcStatus[13];
statussrv_GetText( statussrv->m_node->ProcStatus[13], msg, sizeof(msg));
s0__GetExtStatusResponse->ServerSts14Str = std::string( msg);
s0__GetExtStatusResponse->ServerSts14Name = std::string( "rt_webmon");
s0__GetExtStatusResponse->ServerSts14Str.assign( msg);
s0__GetExtStatusResponse->ServerSts14Name.assign( "rt_webmon");
s0__GetExtStatusResponse->ServerSts15 = statussrv->m_node->ProcStatus[14];
statussrv_GetText( statussrv->m_node->ProcStatus[14], msg, sizeof(msg));
s0__GetExtStatusResponse->ServerSts15Str = std::string( msg);
s0__GetExtStatusResponse->ServerSts15Name = std::string( "rt_webmonmh");
s0__GetExtStatusResponse->ServerSts15Str.assign( msg);
s0__GetExtStatusResponse->ServerSts15Name.assign( "rt_webmonmh");
s0__GetExtStatusResponse->ServerSts16 = statussrv->m_node->ProcStatus[15];
statussrv_GetText( statussrv->m_node->ProcStatus[15], msg, sizeof(msg));
s0__GetExtStatusResponse->ServerSts16Str = std::string( msg);
s0__GetExtStatusResponse->ServerSts16Name = std::string( "sysmon");
s0__GetExtStatusResponse->ServerSts16Str.assign( msg);
s0__GetExtStatusResponse->ServerSts16Name.assign( "sysmon");
s0__GetExtStatusResponse->ServerSts17 = statussrv->m_node->ProcStatus[16];
statussrv_GetText( statussrv->m_node->ProcStatus[16], msg, sizeof(msg));
s0__GetExtStatusResponse->ServerSts17Str = std::string( msg);
s0__GetExtStatusResponse->ServerSts17Name = std::string( "plc");
s0__GetExtStatusResponse->ServerSts17Str.assign( msg);
s0__GetExtStatusResponse->ServerSts17Name.assign( "plc");
s0__GetExtStatusResponse->ServerSts18 = statussrv->m_node->ProcStatus[17];
statussrv_GetText( statussrv->m_node->ProcStatus[17], msg, sizeof(msg));
s0__GetExtStatusResponse->ServerSts18Str = std::string( msg);
s0__GetExtStatusResponse->ServerSts18Name = std::string( "rs_remote");
s0__GetExtStatusResponse->ServerSts18Str.assign( msg);
s0__GetExtStatusResponse->ServerSts18Name.assign( "rs_remote");
s0__GetExtStatusResponse->ServerSts19 = statussrv->m_node->ProcStatus[18];
statussrv_GetText( statussrv->m_node->ProcStatus[18], msg, sizeof(msg));
s0__GetExtStatusResponse->ServerSts19Str = std::string( msg);
s0__GetExtStatusResponse->ServerSts19Name = std::string( "opc_server");
s0__GetExtStatusResponse->ServerSts19Str.assign( msg);
s0__GetExtStatusResponse->ServerSts19Name.assign( "opc_server");
s0__GetExtStatusResponse->ServerSts20 = statussrv->m_node->ProcStatus[19];
statussrv_GetText( statussrv->m_node->ProcStatus[19], msg, sizeof(msg));
s0__GetExtStatusResponse->ServerSts20Str = std::string( msg);
s0__GetExtStatusResponse->ServerSts20Name = std::string( "rt_statussrv");
s0__GetExtStatusResponse->ServerSts20Str.assign( msg);
s0__GetExtStatusResponse->ServerSts20Name.assign( "rt_statussrv");
s0__GetExtStatusResponse->ApplSts1 = statussrv->m_node->ProcStatus[20];
statussrv_GetText( statussrv->m_node->ProcStatus[20], msg, sizeof(msg));
s0__GetExtStatusResponse->ApplSts1Str = std::string( msg);
s0__GetExtStatusResponse->ApplSts1Name = std::string( statussrv->m_appl[0]);
s0__GetExtStatusResponse->ApplSts1Str.assign( msg);
s0__GetExtStatusResponse->ApplSts1Name.assign( statussrv->m_appl[0]);
s0__GetExtStatusResponse->ApplSts2 = statussrv->m_node->ProcStatus[21];
statussrv_GetText( statussrv->m_node->ProcStatus[21], msg, sizeof(msg));
s0__GetExtStatusResponse->ApplSts2Str = std::string( msg);
s0__GetExtStatusResponse->ApplSts2Name = std::string( statussrv->m_appl[1]);
s0__GetExtStatusResponse->ApplSts2Str.assign( msg);
s0__GetExtStatusResponse->ApplSts2Name.assign( statussrv->m_appl[1]);
s0__GetExtStatusResponse->ApplSts3 = statussrv->m_node->ProcStatus[22];
statussrv_GetText( statussrv->m_node->ProcStatus[22], msg, sizeof(msg));
s0__GetExtStatusResponse->ApplSts3Str = std::string( msg);
s0__GetExtStatusResponse->ApplSts3Name = std::string( statussrv->m_appl[2]);
s0__GetExtStatusResponse->ApplSts3Str.assign( msg);
s0__GetExtStatusResponse->ApplSts3Name.assign( statussrv->m_appl[2]);
s0__GetExtStatusResponse->ApplSts4 = statussrv->m_node->ProcStatus[23];
statussrv_GetText( statussrv->m_node->ProcStatus[23], msg, sizeof(msg));
s0__GetExtStatusResponse->ApplSts4Str = std::string( msg);
s0__GetExtStatusResponse->ApplSts4Name = std::string( statussrv->m_appl[3]);
s0__GetExtStatusResponse->ApplSts4Str.assign( msg);
s0__GetExtStatusResponse->ApplSts4Name.assign( statussrv->m_appl[3]);
s0__GetExtStatusResponse->ApplSts5 = statussrv->m_node->ProcStatus[24];
statussrv_GetText( statussrv->m_node->ProcStatus[24], msg, sizeof(msg));
s0__GetExtStatusResponse->ApplSts5Str = std::string( msg);
s0__GetExtStatusResponse->ApplSts5Name = std::string( statussrv->m_appl[4]);
s0__GetExtStatusResponse->ApplSts5Str.assign( msg);
s0__GetExtStatusResponse->ApplSts5Name.assign( statussrv->m_appl[4]);
s0__GetExtStatusResponse->ApplSts6 = statussrv->m_node->ProcStatus[25];
statussrv_GetText( statussrv->m_node->ProcStatus[25], msg, sizeof(msg));
s0__GetExtStatusResponse->ApplSts6Str = std::string( msg);
s0__GetExtStatusResponse->ApplSts6Name = std::string( statussrv->m_appl[5]);
s0__GetExtStatusResponse->ApplSts6Str.assign( msg);
s0__GetExtStatusResponse->ApplSts6Name.assign( statussrv->m_appl[5]);
s0__GetExtStatusResponse->ApplSts7 = statussrv->m_node->ProcStatus[26];
statussrv_GetText( statussrv->m_node->ProcStatus[26], msg, sizeof(msg));
s0__GetExtStatusResponse->ApplSts7Str = std::string( msg);
s0__GetExtStatusResponse->ApplSts7Name = std::string( statussrv->m_appl[6]);
s0__GetExtStatusResponse->ApplSts7Str.assign( msg);
s0__GetExtStatusResponse->ApplSts7Name.assign( statussrv->m_appl[6]);
s0__GetExtStatusResponse->ApplSts8 = statussrv->m_node->ProcStatus[27];
statussrv_GetText( statussrv->m_node->ProcStatus[27], msg, sizeof(msg));
s0__GetExtStatusResponse->ApplSts8Str = std::string( msg);
s0__GetExtStatusResponse->ApplSts8Name = std::string( statussrv->m_appl[7]);
s0__GetExtStatusResponse->ApplSts8Str.assign( msg);
s0__GetExtStatusResponse->ApplSts8Name.assign( statussrv->m_appl[7]);
s0__GetExtStatusResponse->ApplSts9 = statussrv->m_node->ProcStatus[28];
statussrv_GetText( statussrv->m_node->ProcStatus[28], msg, sizeof(msg));
s0__GetExtStatusResponse->ApplSts9Str = std::string( msg);
s0__GetExtStatusResponse->ApplSts9Name = std::string( statussrv->m_appl[8]);
s0__GetExtStatusResponse->ApplSts9Str.assign( msg);
s0__GetExtStatusResponse->ApplSts9Name.assign( statussrv->m_appl[8]);
s0__GetExtStatusResponse->ApplSts10 = statussrv->m_node->ProcStatus[29];
statussrv_GetText( statussrv->m_node->ProcStatus[29], msg, sizeof(msg));
s0__GetExtStatusResponse->ApplSts10Str = std::string( msg);
s0__GetExtStatusResponse->ApplSts10Name = std::string( statussrv->m_appl[9]);
s0__GetExtStatusResponse->ApplSts10Str.assign( msg);
s0__GetExtStatusResponse->ApplSts10Name.assign( statussrv->m_appl[9]);
s0__GetExtStatusResponse->ApplSts11 = statussrv->m_node->ProcStatus[30];
statussrv_GetText( statussrv->m_node->ProcStatus[30], msg, sizeof(msg));
s0__GetExtStatusResponse->ApplSts11Str = std::string( msg);
s0__GetExtStatusResponse->ApplSts11Name = std::string( statussrv->m_appl[10]);
s0__GetExtStatusResponse->ApplSts11Str.assign( msg);
s0__GetExtStatusResponse->ApplSts11Name.assign( statussrv->m_appl[10]);
s0__GetExtStatusResponse->ApplSts12 = statussrv->m_node->ProcStatus[31];
statussrv_GetText( statussrv->m_node->ProcStatus[31], msg, sizeof(msg));
s0__GetExtStatusResponse->ApplSts12Str = std::string( msg);
s0__GetExtStatusResponse->ApplSts12Name = std::string( statussrv->m_appl[11]);
s0__GetExtStatusResponse->ApplSts12Str.assign( msg);
s0__GetExtStatusResponse->ApplSts12Name.assign( statussrv->m_appl[11]);
s0__GetExtStatusResponse->ApplSts13 = statussrv->m_node->ProcStatus[32];
statussrv_GetText( statussrv->m_node->ProcStatus[32], msg, sizeof(msg));
s0__GetExtStatusResponse->ApplSts13Str = std::string( msg);
s0__GetExtStatusResponse->ApplSts13Name = std::string( statussrv->m_appl[12]);
s0__GetExtStatusResponse->ApplSts13Str.assign( msg);
s0__GetExtStatusResponse->ApplSts13Name.assign( statussrv->m_appl[12]);
s0__GetExtStatusResponse->ApplSts14 = statussrv->m_node->ProcStatus[33];
statussrv_GetText( statussrv->m_node->ProcStatus[33], msg, sizeof(msg));
s0__GetExtStatusResponse->ApplSts14Str = std::string( msg);
s0__GetExtStatusResponse->ApplSts14Name = std::string( statussrv->m_appl[13]);
s0__GetExtStatusResponse->ApplSts14Str.assign( msg);
s0__GetExtStatusResponse->ApplSts14Name.assign( statussrv->m_appl[13]);
s0__GetExtStatusResponse->ApplSts15 = statussrv->m_node->ProcStatus[34];
statussrv_GetText( statussrv->m_node->ProcStatus[34], msg, sizeof(msg));
s0__GetExtStatusResponse->ApplSts15Str = std::string( msg);
s0__GetExtStatusResponse->ApplSts15Name = std::string( statussrv->m_appl[14]);
s0__GetExtStatusResponse->ApplSts15Str.assign( msg);
s0__GetExtStatusResponse->ApplSts15Name.assign( statussrv->m_appl[14]);
s0__GetExtStatusResponse->ApplSts16 = statussrv->m_node->ProcStatus[35];
statussrv_GetText( statussrv->m_node->ProcStatus[35], msg, sizeof(msg));
s0__GetExtStatusResponse->ApplSts16Str = std::string( msg);
s0__GetExtStatusResponse->ApplSts16Name = std::string( statussrv->m_appl[15]);
s0__GetExtStatusResponse->ApplSts16Str.assign( msg);
s0__GetExtStatusResponse->ApplSts16Name.assign( statussrv->m_appl[15]);
s0__GetExtStatusResponse->ApplSts17 = statussrv->m_node->ProcStatus[36];
statussrv_GetText( statussrv->m_node->ProcStatus[36], msg, sizeof(msg));
s0__GetExtStatusResponse->ApplSts17Str = std::string( msg);
s0__GetExtStatusResponse->ApplSts17Name = std::string( statussrv->m_appl[16]);
s0__GetExtStatusResponse->ApplSts17Str.assign( msg);
s0__GetExtStatusResponse->ApplSts17Name.assign( statussrv->m_appl[16]);
s0__GetExtStatusResponse->ApplSts18 = statussrv->m_node->ProcStatus[37];
statussrv_GetText( statussrv->m_node->ProcStatus[37], msg, sizeof(msg));
s0__GetExtStatusResponse->ApplSts18Str = std::string( msg);
s0__GetExtStatusResponse->ApplSts18Name = std::string( statussrv->m_appl[17]);
s0__GetExtStatusResponse->ApplSts18Str.assign( msg);
s0__GetExtStatusResponse->ApplSts18Name.assign( statussrv->m_appl[17]);
s0__GetExtStatusResponse->ApplSts19 = statussrv->m_node->ProcStatus[38];
statussrv_GetText( statussrv->m_node->ProcStatus[38], msg, sizeof(msg));
s0__GetExtStatusResponse->ApplSts19Str = std::string( msg);
s0__GetExtStatusResponse->ApplSts19Name = std::string( statussrv->m_appl[18]);
s0__GetExtStatusResponse->ApplSts19Str.assign( msg);
s0__GetExtStatusResponse->ApplSts19Name.assign( statussrv->m_appl[18]);
s0__GetExtStatusResponse->ApplSts20 = statussrv->m_node->ProcStatus[39];
statussrv_GetText( statussrv->m_node->ProcStatus[39], msg, sizeof(msg));
s0__GetExtStatusResponse->ApplSts20Str = std::string( msg);
s0__GetExtStatusResponse->ApplSts20Name = std::string( statussrv->m_appl[19]);
s0__GetExtStatusResponse->ApplSts20Str.assign( msg);
s0__GetExtStatusResponse->ApplSts20Name.assign( statussrv->m_appl[19]);
return SOAP_OK;
}
......@@ -515,10 +520,10 @@ SOAP_FMAC5 int SOAP_FMAC6 __s0__Restart(struct soap *soap,
{
pwr_tCmd cmd = "rt_ini -r &";
if ( s0__Restart->ClientRequestHandle)
s0__RestartResponse->ClientRequestHandle =
new std::string( *s0__Restart->ClientRequestHandle);
if ( s0__Restart->ClientRequestHandle) {
s0__RestartResponse->ClientRequestHandle = soap_new_std__string( soap, -1);
s0__RestartResponse->ClientRequestHandle->assign( *s0__Restart->ClientRequestHandle);
}
system( cmd);
return SOAP_OK;
}
......@@ -530,16 +535,18 @@ SOAP_FMAC5 int SOAP_FMAC6 __s0__XttStart(struct soap *soap,
char lang[40] = "";
pwr_tOName opplace = "";
char display[80] = "";
char *argv[] = {"rt_xtt", 0, 0, 0, 0, 0, 0, 0, 0, 0};
char gui[40] = "";
char *argv[] = {"rt_xtt", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
char sw_l[] = "-l";
char sw_d[] = "--display";
char sw_q[] = "-q";
char sw_c[] = "-c";
char sw_f[] = "-f";
if ( s0__XttStart->ClientRequestHandle)
s0__XttStartResponse->ClientRequestHandle =
new std::string( *s0__XttStart->ClientRequestHandle);
if ( s0__XttStart->ClientRequestHandle) {
s0__XttStartResponse->ClientRequestHandle = soap_new_std__string( soap, -1);
s0__XttStartResponse->ClientRequestHandle->assign( *s0__XttStart->ClientRequestHandle);
}
if ( s0__XttStart->Language)
strncpy( lang, s0__XttStart->Language->c_str(), sizeof(lang));
......@@ -549,6 +556,12 @@ SOAP_FMAC5 int SOAP_FMAC6 __s0__XttStart(struct soap *soap,
if ( s0__XttStart->Display)
strncpy( display, s0__XttStart->Display->c_str(), sizeof(display));
if ( s0__XttStart->GUI)
strncpy( gui, s0__XttStart->GUI->c_str(), sizeof(gui));
if ( strcmp( gui, "motif") == 0)
strcpy( sw_d, "-d");
int i = 1;
if ( strcmp( opplace, "") != 0)
argv[i++] = opplace;
......@@ -562,6 +575,10 @@ SOAP_FMAC5 int SOAP_FMAC6 __s0__XttStart(struct soap *soap,
argv[i++] = sw_l;
argv[i++] = lang;
}
if ( strcmp( gui, "") != 0) {
argv[i++] = sw_f;
argv[i++] = gui;
}
pid_t pid = fork();
switch ( pid) {
......@@ -588,20 +605,25 @@ SOAP_FMAC5 int SOAP_FMAC6 __s0__RtMonStart(struct soap *soap,
{
char lang[40] = "";
char display[80] = "";
char *argv[] = {"pwr_rtmon", "--display", 0, 0, 0};
char gui[40] = "";
char *argv[] = {"pwr_rtmon", "--display", 0, 0, 0, 0, 0};
char sw_l[] = "-l";
char sw_d[] = "--display";
char sw_f[] = "-f";
if ( s0__RtMonStart->ClientRequestHandle)
s0__RtMonStartResponse->ClientRequestHandle =
new std::string( *s0__RtMonStart->ClientRequestHandle);
if ( s0__RtMonStart->ClientRequestHandle) {
s0__RtMonStartResponse->ClientRequestHandle = soap_new_std__string( soap, -1);
s0__RtMonStartResponse->ClientRequestHandle->assign( *s0__RtMonStart->ClientRequestHandle);
}
if ( s0__RtMonStart->Language)
strncpy( lang, s0__RtMonStart->Language->c_str(), sizeof(lang));
if ( s0__RtMonStart->Display)
strncpy( display, s0__RtMonStart->Display->c_str(), sizeof(display));
if ( s0__RtMonStart->GUI)
strncpy( gui, s0__RtMonStart->GUI->c_str(), sizeof(gui));
int i = 1;
if ( strcmp( display, "") != 0) {
......@@ -612,6 +634,10 @@ SOAP_FMAC5 int SOAP_FMAC6 __s0__RtMonStart(struct soap *soap,
argv[i++] = sw_l;
argv[i++] = lang;
}
if ( strcmp( gui, "") != 0) {
argv[i++] = sw_f;
argv[i++] = gui;
}
pid_t pid = fork();
switch ( pid) {
......
src/exe/rt_statussrv/src/statussrv_Server.cpp
View file @ 86602372
......@@ -6,7 +6,7 @@
*/
#include "statussrv_H.h"
SOAP_SOURCE_STAMP("@(#) statussrv_Server.cpp ver 2.7.9d 2007-05-25 06:59:31 GMT")
SOAP_SOURCE_STAMP("@(#) statussrv_Server.cpp ver 2.7.9d 2007-05-30 13:46:12 GMT")
SOAP_FMAC5 int SOAP_FMAC6 soap_serve(struct soap *soap)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7