diff --git a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/TTCN3/types/PortGenerator.java b/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/TTCN3/types/PortGenerator.java index 93bdf8bc88ee03c8897a26d80d9bdf4d4f9b52cf..a562e2069a3bd5d9ba98e9b5bf6e419c50e63173 100644 --- a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/TTCN3/types/PortGenerator.java +++ b/org.eclipse.titan.designer/src/org/eclipse/titan/designer/AST/TTCN3/types/PortGenerator.java @@ -448,8 +448,8 @@ public class PortGenerator { source.append("private LinkedList procedure_queue = new LinkedList();\n"); source.append("private void remove_proc_queue_head() {\n"); source.append("procedure_queue.removeFirst();\n"); - //FIXME:put 0 as first parameter until TitanLoggerApiSimple::Port__Queue_operations not implemented - source.append("TtcnLogger.log_port_queue(0, portName, 0 , ++proc_head_count, new TitanCharString(), new TitanCharString());"); + //FIXME: Temporary implement + source.append("TtcnLogger.log_port_queue(TtcnLogger.Port_Queue_operation.EXTRACT_MSG, portName, 0 , ++proc_head_count, new TitanCharString(), new TitanCharString());"); source.append("}\n\n"); } diff --git a/org.eclipse.titan.runtime/src/org/eclipse/titan/runtime/core/TtcnLogger.java b/org.eclipse.titan.runtime/src/org/eclipse/titan/runtime/core/TtcnLogger.java index 1ee1f5d7e69bb2cffbf1eb6e55836c68d8aa4df9..d15d3b0d64b28213cdb461f211253c1d9ec588a2 100644 --- a/org.eclipse.titan.runtime/src/org/eclipse/titan/runtime/core/TtcnLogger.java +++ b/org.eclipse.titan.runtime/src/org/eclipse/titan/runtime/core/TtcnLogger.java @@ -138,6 +138,18 @@ public final class TtcnLogger { Severity severity; //event_destination, etc... } + + //temporary enum, original: TitanLoggerApi::Port_Queue.operation + public static enum Port_Queue_operation { + ENQUEUE_MSG, + ENQUEUE_CALL, + ENQUEUE_REPLY, + ENQUEUE_EXCEPTION, + EXTRACT_MSG, + EXTRACT_OP + } + + static StringBuilder logMatchBuffer = new StringBuilder(); static boolean logMatchPrinted = false; @@ -423,11 +435,37 @@ public final class TtcnLogger { log_event_str(MessageFormat.format("Sent on {0} to {1}{2}", portname, dest, parameter.getValue())); } - public static void log_port_queue(int operation, final String port_name, int componentReference, int id, final TitanCharString address, final TitanCharString parameter) { + public static void log_port_queue(final Port_Queue_operation operation, final String port_name, int componentReference, int id, final TitanCharString address, final TitanCharString parameter) { final String dest = TitanComponent.get_component_string(componentReference); - //FIXME:implement LegacyLogger::portevent_str() to fix the logging - final String portq_operation = Integer.toString(operation); - log_event_str(MessageFormat.format("{4} enqueued/was extracted on {0} from {1}{2} id {3}", dest, address.toString(), parameter.toString(), id, portq_operation)); + String ret_val = ""; + switch (operation) { + case ENQUEUE_MSG: + ret_val = "Message"; + log_event_str(MessageFormat.format("{0} enqueued on {1} from {2}{3}{4} id {5}", ret_val, port_name , dest, address, parameter, id)); + break; + case ENQUEUE_CALL: + ret_val = "Call"; + log_event_str(MessageFormat.format("{0} enqueued on {1} from {2}{3}{4} id {5}", ret_val, port_name , dest, address, parameter, id)); + break; + case ENQUEUE_REPLY: + ret_val = "Reply"; + log_event_str(MessageFormat.format("{0} enqueued on {1} from {2}{3}{4} id {5}", ret_val, port_name , dest, address, parameter, id)); + break; + case ENQUEUE_EXCEPTION: + ret_val = "Exception"; + log_event_str(MessageFormat.format("{0} enqueued on {1} from {2}{3}{4} id {5}", ret_val, port_name , dest, address, parameter, id)); + break; + case EXTRACT_MSG: + ret_val = "Message"; + log_event_str(MessageFormat.format("{0} with id {1} was extracted from the queue of {2}.", ret_val, id, port_name)); + break; + case EXTRACT_OP: + ret_val = "Operation"; + log_event_str(MessageFormat.format("{0} with id {1} was extracted from the queue of {2}.", ret_val, id, port_name)); + break; + default: + return; + } } public static void log_controlpart_start_stop(final String moduleName, final boolean finished) {