Commit c0e10d10 authored by Kristof Szabados's avatar Kristof Szabados
Browse files

bugfix for: 568774


Signed-off-by: Kristof Szabados's avatarKristof Szabados <Kristof.Szabados@ericsson.com>
parent a1652a89
......@@ -673,7 +673,7 @@ public final class TTCN_Communication {
public static void send_create_req(final String componentTypeModule, final String componentTypeName,
final String componentName, final String componentLocation, final boolean is_alive,
final double testcase_start_time) {
final int seconds = (int)Math.floor(testcase_start_time);
final long seconds = (long)testcase_start_time;
final int miliseconds = (int)((testcase_start_time - seconds) * 1000);
final Text_Buf text_buf = new Text_Buf();
......@@ -683,7 +683,10 @@ public final class TTCN_Communication {
text_buf.push_string(componentName);
text_buf.push_string(componentLocation);
text_buf.push_int( is_alive ? 1 : 0);
text_buf.push_int(seconds);
final int upper_int = (int)(seconds / 0xffffffff);
final int lower_int = (int)(seconds % 0xffffffff);
text_buf.push_int(upper_int);
text_buf.push_int(lower_int);
text_buf.push_int(miliseconds);
send_message(text_buf);
......@@ -1154,7 +1157,9 @@ public final class TTCN_Communication {
final boolean is_alive = local_incoming_buf.pull_int().get_int() == 0 ? false : true;
final String testcase_module_name = local_incoming_buf.pull_string();
final String testcase_definition_name = local_incoming_buf.pull_string();
final int seconds = local_incoming_buf.pull_int().get_int();
final int upper_int = local_incoming_buf.pull_int().get_int();
final int lower_int = local_incoming_buf.pull_int().get_int();
final long seconds = upper_int * 0xffffffff + lower_int;
final int milliSeconds = local_incoming_buf.pull_int().get_int();
local_incoming_buf.cut_message();
......
......@@ -405,7 +405,7 @@ public class MainController {
private volatile boolean all_component_done_requested;
private volatile boolean any_component_killed_requested;
private volatile boolean all_component_killed_requested;
private int testcase_start_time_seconds;// testcase_start_time
private long testcase_start_time_seconds;// testcase_start_time
private int testcase_start_time_miliseconds;
private volatile boolean stop_requested;
private volatile boolean stop_after_tc;
......@@ -1808,8 +1808,9 @@ public class MainController {
final String componentName = text_buf.pull_string();
final String componentLocation = text_buf.pull_string();
final int isAlive = text_buf.pull_int().get_int();
//FIXME this needs to be updated to 64 bit too.
testcase_start_time_seconds = text_buf.pull_int().get_int();
final int upper_int = text_buf.pull_int().get_int();
final int lower_int = text_buf.pull_int().get_int();
testcase_start_time_seconds = upper_int * 0xffffffff + lower_int;
testcase_start_time_miliseconds = text_buf.pull_int().get_int();
final Host ptcLoc = choose_ptc_location(componentTypeName, componentName, componentLocation);
......@@ -1930,7 +1931,10 @@ public class MainController {
text_buf.push_int(isAlive);
text_buf.push_string(mtc.tc_fn_name.module_name);
text_buf.push_string(mtc.tc_fn_name.definition_name);
text_buf.push_int(testcase_start_time_seconds);
final int upper_int = (int)(testcase_start_time_seconds / 0xffffffff);
final int lower_int = (int)(testcase_start_time_seconds % 0xffffffff);
text_buf.push_int(upper_int);
text_buf.push_int(lower_int);
text_buf.push_int(testcase_start_time_miliseconds);
send_message(host.socket, text_buf);
......
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