From 15e503215055710df281222c5c8e03a6e1d57733 Mon Sep 17 00:00:00 2001 From: jooyoul_lee Date: Mon, 4 Nov 2013 19:57:43 +0900 Subject: [PATCH] [Title] Fix bugs [Desc.] Failed view view source fixed, gl error code added. [Issue] --- .../dynamicanalyzer/common/AnalyzerConstants.java | 21 +- .../tizen/dynamicanalyzer/error/DAErrorCode.java | 10 +- .../listeners/TableTooltipListener.java | 4 +- .../tizen/dynamicanalyzer/nl/ConfigureLabels.java | 2 +- .../dynamicanalyzer/nl/ConfigureLabels.properties | 1 + .../swap/logparser/SWAPLogParser.java | 3 +- .../ui/summary/failed/FailedApiTable.java | 16 +- .../ui/summary/failed/FailedChecker.java | 2 +- .../ui/toolbar/ConfigureManager.java | 118 +++--- .../configuration/ConfigurationDialogValues.java | 422 +++++++-------------- 10 files changed, 225 insertions(+), 374 deletions(-) diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerConstants.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerConstants.java index 1c32f6a..b9403be 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerConstants.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerConstants.java @@ -176,7 +176,9 @@ public class AnalyzerConstants { public static final int RESERVED_2 = 0x0002; // public static final int FEATURE_CPU = 0x0001; // public static final int FEATURE_MEMORY = 0x0002; - public static final int FEATURE_FUNCTION_PROFILING = 0x0004; + public static final int FEATURE_FUNCTION_SAMPLING = 0x80000; + public static final int FEATURE_FUNCTION_PROFILING = 0x0004 | FEATURE_FUNCTION_SAMPLING; + public static final int FEATURE_ALLOCATION = 0x0008; public static final int FEATURE_FILE_API = 0x0010; public static final int FEATURE_THREAD_API = 0x0020; @@ -184,25 +186,32 @@ public class AnalyzerConstants { public static final int FEATURE_SCREENSHOT = 0x0080; public static final int FEATURE_USER_EVENT = 0x0100; public static final int FEATURE_RECORDING = 0x0200; - public static final int FEATURE_SYSCALL = 0x0400; + public static final int FEATURE_SYSCALL_FILE = 0x0400; public static final int FEATURE_SYSCALL_IPC = 0x0800; public static final int FEATURE_SYSCALL_PROCESS = 0x1000; public static final int FEATURE_SYSCALL_SIGNAL = 0x2000; public static final int FEATURE_SYSCALL_NETWORK = 0x4000; public static final int FEATURE_SYSCALL_DESC = 0x8000; + public static final int FEATURE_SYSCALL = FEATURE_SYSCALL_FILE + | FEATURE_SYSCALL_IPC | FEATURE_SYSCALL_PROCESS + | FEATURE_SYSCALL_SIGNAL | FEATURE_SYSCALL_NETWORK + | FEATURE_SYSCALL_DESC; + public static final int FEATURE_CONTEXT_SWITCHING = 0x10000; public static final int FEATURE_NETWORK_API = 0x20000; public static final int FEATURE_OPENGL_API = 0x40000; - public static final int FEATURE_FUNCTION_SAMPLING = 0x80000; - public static final int SYSTEM = 0x100000; + public static final int SYSTEM_CPU = 0x100000; public static final int SYSTEM_PROCESSES = 0x200000; public static final int SYSTEM_MEMORY = 0x400000; public static final int SYSTEM_DISK = 0x800000; public static final int SYSTEM_NETWORK = 0x1000000; - public static final int SYSTEM_DEVICE = 0x2000000; + public static final int SYSTEM_DEVICE = 0x2000000; public static final int SYSTEM_RESERVED = 0x8000000; + public static final int SYSTEM = SYSTEM_CPU | SYSTEM_PROCESSES + | SYSTEM_MEMORY | SYSTEM_DISK | SYSTEM_NETWORK | SYSTEM_DEVICE; + public static final int SYSTEM_ENERGY = 0x4000000; /* Message Type */ @@ -312,7 +321,7 @@ public class AnalyzerConstants { public final static int MSG_SWAP_INST_ADD_ACK = 0x1008; public final static int MSG_SWAP_INST_REMOVE_ACK = 0x1009; public final static int MSG_WAIT_ACK = 0x1010; - + public final static int TYPE_TABLE_CALLSTACK = 0x0001; public final static int TYPE_TABLE_FAILED = 0x0002; public final static int TYPE_TABLE_LEAK = 0x0004; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/error/DAErrorCode.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/error/DAErrorCode.java index 2e08ff8..61741ea 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/error/DAErrorCode.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/error/DAErrorCode.java @@ -364,11 +364,19 @@ public enum DAErrorCode { /** --- V --- **/ /** --- W --- **/ - E_WOULD_BLOCK(getERR_SRC_FRAMEWORK() + SET_E_CAUSE(3300), ErrorLabels.E_WOULD_BLOCK); + E_WOULD_BLOCK(getERR_SRC_FRAMEWORK() + SET_E_CAUSE(3300), ErrorLabels.E_WOULD_BLOCK), /** --- X --- **/ /** --- Y --- **/ /** --- Z --- **/ + + /** --- Open GL Errors ---*/ + GL_INVALID_ENUM(1280, "An unacceptable value is specified for an enumerated argument. The offending command is ignored and has no other side effect than to set the error flag."), + GL_INVALID_VALUE(1281,"A numeric argument is out of range. The offending command is ignored and has no other side effect than to set the error flag."), + GL_INVALID_OPERATION(1282,"The specified operation is not allowed in the current state. The offending command is ignored and has no other side effect than to set the error flag."), + GL_INVALID_MEMORY(1283,"There is not enough memory left to execute the command. The state of the GL is undefined, except for the state of the error flags, after this error is recorded."), + GL_INVALID_FRAMEBUFFER_OPERATION(1284,"The command is trying to render to or read from the framebuffer while the currently bound framebuffer is not framebuffer complete (i.e. the return value from glCheckFramebufferStatus is not GL_FRAMEBUFFER_COMPLETE). The offending command is ignored and has no other side effect than to set the error flag."); + private final long errno; private final String message; private static final int E_SEVERITY_POS = 31; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/listeners/TableTooltipListener.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/listeners/TableTooltipListener.java index c79cce3..000c5b4 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/listeners/TableTooltipListener.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/listeners/TableTooltipListener.java @@ -368,8 +368,8 @@ public class TableTooltipListener implements Listener { break; case AnalyzerConstants.TYPE_TABLE_FAILED: List failedData = tableData.getData(); - addr = Long.parseLong(failedData.get(6)); - pid = Integer.parseInt(failedData.get(3)); + addr = Long.parseLong(failedData.get(8)); + pid = Integer.parseInt(failedData.get(7)); time = Long.parseLong(failedData.get(1)); break; case AnalyzerConstants.TYPE_TABLE_LEAK: diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/ConfigureLabels.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/ConfigureLabels.java index 6d6e263..f058dbf 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/ConfigureLabels.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/ConfigureLabels.java @@ -46,6 +46,7 @@ public class ConfigureLabels extends NLS { // features name public static String FEATURE_FUNCTION_PROFILING; + public static String FEATURE_FUNCTION_SAMPLING; // 3.0 only public static String FEATURE_MEMORY_ALLOCATION; public static String FEATURE_FILE; public static String FEATURE_THREAD; @@ -63,7 +64,6 @@ public class ConfigureLabels extends NLS { public static String FEATURE_CONTEXT_SWITCH; // 3.0 only public static String FEATURE_NETWORK; // 3.0 only public static String FEATURE_OPENGL; // 3.0 only - //public static String FEATURE_FUNCTION_SAMPLING; // 3.0 only public static String FEATURE_SYSTEM; // 3.0 only public static String FEATURE_SYSTEM_CPU; // 3.0 only public static String FEATURE_SYSTEM_PROCESSES; // 3.0 only diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/ConfigureLabels.properties b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/ConfigureLabels.properties index bf29023..c72fab5 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/ConfigureLabels.properties +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/ConfigureLabels.properties @@ -11,6 +11,7 @@ SETTING_CONFIGURATION_TITLE=Configuration Settings WELCONE_ASK_USE_AGAIN=Use this as the default and do not ask again. FEATURE_FUNCTION_PROFILING=Function_Profiling +FEATURE_FUNCTION_SAMPLING=Function Sampling FEATURE_MEMORY_ALLOCATION=Memory_Allocation FEATURE_FILE=File Analysis FEATURE_THREAD=Thread Analysis diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/SWAPLogParser.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/SWAPLogParser.java index 75b7265..4701c74 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/SWAPLogParser.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/SWAPLogParser.java @@ -268,8 +268,7 @@ public class SWAPLogParser implements Runnable { AnalyzerManager.getLeakDetector().runLeakDectect(log); } - AnalyzerManager.getFailedChecker().check(log, - AnalyzerManager.getCallstackManager()); + AnalyzerManager.getFailedChecker().check(log); } // set last log number diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/failed/FailedApiTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/failed/FailedApiTable.java index 6ca24f0..d1860df 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/failed/FailedApiTable.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/failed/FailedApiTable.java @@ -104,25 +104,30 @@ public class FailedApiTable extends DATableComposite { String time = Formatter.toTimeFormat(failedData.getTime()); text.add(time); // 1 data.add(Long.toString(failedData.getTime())); + text.add(failedData.getName()); // 2 data.add(failedData.getName()); text.add(failedData.getArgs()); // 3 data.add(failedData.getArgs()); + text.add(failedData.getHexReturn()); // 4 data.add(Long.toString(failedData.getReturn())); - data.add(Long.toString(failedData.getCallerPc())); // 5 - + try{ String errCode = ErrorCodeManager.getInatance() .getErrorCode(failedData.getErrorCode()).name(); if (null == errCode) { // FIXME : for debug errCode = "undefined error number"; //$NON-NLS-1$ } - text.add(errCode); // 6 + text.add(errCode); // 5 data.add(Long.toString(failedData.getErrorCode())); - + }catch(NullPointerException e) + { + System.out.println("debug"); + continue; + } String errMsg = ErrorCodeManager.getInatance().getErrorDescription( failedData.getErrorCode()); if (null == errMsg) { @@ -134,6 +139,9 @@ public class FailedApiTable extends DATableComposite { text.add(Integer.toString(failedData.getPid())); // 7 data.add(Integer.toString(failedData.getPid())); + + data.add(Long.toString(failedData.getCallerPc())); // 8 + // create images // create DATableDataFormat diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/failed/FailedChecker.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/failed/FailedChecker.java index e933a4c..19c166a 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/failed/FailedChecker.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/failed/FailedChecker.java @@ -38,7 +38,7 @@ public class FailedChecker { List failedList; - public void check(LogData log, BaseCallstackManager cm) { + public void check(LogData log) { if (log instanceof ProbeCommonData) { ProbeCommonData probeData = (ProbeCommonData) log; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/ConfigureManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/ConfigureManager.java index b673f74..7d4a2cf 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/ConfigureManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/ConfigureManager.java @@ -131,7 +131,10 @@ public class ConfigureManager { if (null == data.get(ConfigureLabels.FEATURE_FUNCTION_PROFILING)) { data.put(ConfigureLabels.FEATURE_FUNCTION_PROFILING, Integer .toString(AnalyzerConstants.FEATURE_FUNCTION_PROFILING)); + data.put(ConfigureLabels.FEATURE_FUNCTION_SAMPLING, Integer + .toString(AnalyzerConstants.FEATURE_FUNCTION_SAMPLING)); } + if (null == data.get(ConfigureLabels.FEATURE_MEMORY_ALLOCATION)) { data.put(ConfigureLabels.FEATURE_MEMORY_ALLOCATION, Integer.toString(AnalyzerConstants.FEATURE_ALLOCATION)); @@ -164,38 +167,25 @@ public class ConfigureManager { if (null == data.get(ConfigureLabels.FEATURE_SYSCALL)) { data.put(ConfigureLabels.FEATURE_SYSCALL, Integer.toString(AnalyzerConstants.FEATURE_SYSCALL)); - } - -// if (null == data.get(ConfigureLabels.FEATURE_SYSCALL_FILE)) { -// data.put(ConfigureLabels.FEATURE_SYSCALL_FILE, -// Integer.toString(AnalyzerConstants.FEATURE_SYSCALL_FILE)); -// } -// -// if (null == data.get(ConfigureLabels.FEATURE_SYSCALL_IPC)) { -// data.put(ConfigureLabels.FEATURE_SYSCALL_IPC, -// Integer.toString(AnalyzerConstants.FEATURE_SYSCALL_IPC)); -// } -// -// if (null == data.get(ConfigureLabels.FEATURE_SYSCALL_PROCESS)) { -// data.put(ConfigureLabels.FEATURE_SYSCALL_PROCESS, -// Integer.toString(AnalyzerConstants.FEATURE_SYSCALL_PROCESS)); -// } -// -// if (null == data.get(ConfigureLabels.FEATURE_SYSCALL_SIGNAL)) { -// data.put(ConfigureLabels.FEATURE_SYSCALL_SIGNAL, -// Integer.toString(AnalyzerConstants.FEATURE_SYSCALL_SIGNAL)); -// } -// -// if (null == data.get(ConfigureLabels.FEATURE_SYSCALL_NETWORK)) { -// data.put(ConfigureLabels.FEATURE_SYSCALL_NETWORK, -// Integer.toString(AnalyzerConstants.FEATURE_SYSCALL_NETWORK)); -// } -// -// if (null == data.get(ConfigureLabels.FEATURE_SYSCALL_DESC)) { -// data.put(ConfigureLabels.FEATURE_SYSCALL_DESC, -// Integer.toString(AnalyzerConstants.FEATURE_SYSCALL_DESC)); -// } + // data.put(ConfigureLabels.FEATURE_SYSCALL_FILE, + // Integer.toString(AnalyzerConstants.FEATURE_SYSCALL_FILE)); + + data.put(ConfigureLabels.FEATURE_SYSCALL_IPC, + Integer.toString(AnalyzerConstants.FEATURE_SYSCALL_IPC)); + + data.put(ConfigureLabels.FEATURE_SYSCALL_PROCESS, + Integer.toString(AnalyzerConstants.FEATURE_SYSCALL_PROCESS)); + + data.put(ConfigureLabels.FEATURE_SYSCALL_SIGNAL, + Integer.toString(AnalyzerConstants.FEATURE_SYSCALL_SIGNAL)); + + data.put(ConfigureLabels.FEATURE_SYSCALL_NETWORK, + Integer.toString(AnalyzerConstants.FEATURE_SYSCALL_NETWORK)); + + data.put(ConfigureLabels.FEATURE_SYSCALL_DESC, + Integer.toString(AnalyzerConstants.FEATURE_SYSCALL_DESC)); + } if (null == data.get(ConfigureLabels.FEATURE_CONTEXT_SWITCH)) { data.put(ConfigureLabels.FEATURE_CONTEXT_SWITCH, Integer .toString(AnalyzerConstants.FEATURE_CONTEXT_SWITCHING)); @@ -211,49 +201,30 @@ public class ConfigureManager { Integer.toString(AnalyzerConstants.FEATURE_OPENGL_API)); } -// if (null == data.get(ConfigureLabels.FEATURE_FUNCTION_SAMPLING)) { -// data.put(ConfigureLabels.FEATURE_FUNCTION_SAMPLING, Integer -// .toString(AnalyzerConstants.FEATURE_FUNCTION_SAMPLING)); -// } - if (null == data.get(ConfigureLabels.FEATURE_SYSTEM)) { data.put(ConfigureLabels.FEATURE_SYSTEM, Integer.toString(AnalyzerConstants.SYSTEM)); - } - -// if (null == data.get(ConfigureLabels.FEATURE_SYSTEM_CPU)) { -// data.put(ConfigureLabels.FEATURE_SYSTEM_CPU, -// Integer.toString(AnalyzerConstants.SYSTEM_CPU)); -// } -// if (null == data.get(ConfigureLabels.FEATURE_SYSTEM_CPU)) { -// data.put(ConfigureLabels.FEATURE_SYSTEM_CPU, -// Integer.toString(AnalyzerConstants.SYSTEM_CPU)); -// } -// if (null == data.get(ConfigureLabels.FEATURE_SYSTEM_PROCESSES)) { -// data.put(ConfigureLabels.FEATURE_SYSTEM_PROCESSES, -// Integer.toString(AnalyzerConstants.SYSTEM_PROCESSES)); -// } -// if (null == data.get(ConfigureLabels.FEATURE_SYSTEM_MEMORY)) { -// data.put(ConfigureLabels.FEATURE_SYSTEM_MEMORY, -// Integer.toString(AnalyzerConstants.SYSTEM_MEMORY)); -// } -// if (null == data.get(ConfigureLabels.FEATURE_SYSTEM_DISK)) { -// data.put(ConfigureLabels.FEATURE_SYSTEM_DISK, -// Integer.toString(AnalyzerConstants.SYSTEM_DISK)); -// } -// if (null == data.get(ConfigureLabels.FEATURE_SYSTEM_NETWORK)) { -// data.put(ConfigureLabels.FEATURE_SYSTEM_NETWORK, -// Integer.toString(AnalyzerConstants.SYSTEM_NETWORK)); -// } -// if (null == data.get(ConfigureLabels.FEATURE_SYSTEM_DEVICE)) { -// data.put(ConfigureLabels.FEATURE_SYSTEM_DEVICE, -// Integer.toString(AnalyzerConstants.SYSTEM_DEVICE)); -// } -// if (null == data.get(ConfigureLabels.FEATURE_SYSTEM_ENERGY)) { -// data.put(ConfigureLabels.FEATURE_SYSTEM_ENERGY, -// Integer.toString(AnalyzerConstants.SYSTEM_ENERGY)); -// } + // data.put(ConfigureLabels.FEATURE_SYSTEM_CPU, + // Integer.toString(AnalyzerConstants.SYSTEM_CPU)); + data.put(ConfigureLabels.FEATURE_SYSTEM_CPU, + Integer.toString(AnalyzerConstants.SYSTEM_CPU)); + data.put(ConfigureLabels.FEATURE_SYSTEM_PROCESSES, + Integer.toString(AnalyzerConstants.SYSTEM_PROCESSES)); + data.put(ConfigureLabels.FEATURE_SYSTEM_MEMORY, + Integer.toString(AnalyzerConstants.SYSTEM_MEMORY)); + data.put(ConfigureLabels.FEATURE_SYSTEM_DISK, + Integer.toString(AnalyzerConstants.SYSTEM_DISK)); + data.put(ConfigureLabels.FEATURE_SYSTEM_NETWORK, + Integer.toString(AnalyzerConstants.SYSTEM_NETWORK)); + data.put(ConfigureLabels.FEATURE_SYSTEM_DEVICE, + Integer.toString(AnalyzerConstants.SYSTEM_DEVICE)); + } + + if (null == data.get(ConfigureLabels.FEATURE_SYSTEM_ENERGY)) { + data.put(ConfigureLabels.FEATURE_SYSTEM_ENERGY, + Integer.toString(AnalyzerConstants.SYSTEM_ENERGY)); + } if (null == data.get(ConfigureLabels.THEME)) { data.put(ConfigureLabels.THEME, DEFAULT_THEME); } @@ -369,7 +340,8 @@ public class ConfigureManager { ret = 0; } - System.out.println("configuration key: " + key + " value: " + ret); + System.out.println("configuration key: " + key + " value: " + + AnalyzerUtil.toHexdecimal(ret)); return ret; } @@ -400,7 +372,7 @@ public class ConfigureManager { if (DACommunicator.isSWAPVersion(devInfo)) { state |= getValueInt(ConfigureLabels.FEATURE_SYSCALL); -// state |= getValueInt(ConfigureLabels.FEATURE_SYSCALL_FILE); + // state |= getValueInt(ConfigureLabels.FEATURE_SYSCALL_FILE); // state |= getValueInt(ConfigureLabels.FEATURE_SYSCALL_IPC); // state |= getValueInt(ConfigureLabels.FEATURE_SYSCALL_PROCESS); // state |= getValueInt(ConfigureLabels.FEATURE_SYSCALL_SIGNAL); @@ -411,7 +383,7 @@ public class ConfigureManager { state |= getValueInt(ConfigureLabels.FEATURE_OPENGL); // state |= getValueInt(ConfigureLabels.FEATURE_FUNCTION_SAMPLING); state |= getValueInt(ConfigureLabels.FEATURE_SYSTEM); -// state |= getValueInt(ConfigureLabels.FEATURE_SYSTEM_CPU); + // state |= getValueInt(ConfigureLabels.FEATURE_SYSTEM_CPU); // state |= getValueInt(ConfigureLabels.FEATURE_SYSTEM_PROCESSES); // state |= getValueInt(ConfigureLabels.FEATURE_SYSTEM_MEMORY); // state |= getValueInt(ConfigureLabels.FEATURE_SYSTEM_DISK); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogValues.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogValues.java index 53f6252..a732734 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogValues.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogValues.java @@ -90,6 +90,7 @@ public class ConfigurationDialogValues { featuresName = new String[] { ConfigureLabels.FEATURE_SYSTEM, ConfigureLabels.FEATURE_FUNCTION_PROFILING, + // ConfigureLabels.FEATURE_FUNCTION_SAMPLING, ConfigureLabels.FEATURE_MEMORY_ALLOCATION, ConfigureLabels.FEATURE_FILE, ConfigureLabels.FEATURE_THREAD, @@ -98,13 +99,14 @@ public class ConfigurationDialogValues { ConfigureLabels.FEATURE_OPENGL, ConfigureLabels.FEATURE_RECORDING, ConfigureLabels.FEATURE_SYSCALL, -// ConfigureLabels.FEATURE_SYSCALL_FILE, -// ConfigureLabels.FEATURE_SYSCALL_IPC, -// ConfigureLabels.FEATURE_SYSCALL_PROCESS, -// ConfigureLabels.FEATURE_SYSCALL_SIGNAL, -// ConfigureLabels.FEATURE_SYSCALL_NETWORK, -// ConfigureLabels.FEATURE_SYSCALL_DESC, + // ConfigureLabels.FEATURE_SYSCALL_FILE, + // ConfigureLabels.FEATURE_SYSCALL_IPC, + // ConfigureLabels.FEATURE_SYSCALL_PROCESS, + // ConfigureLabels.FEATURE_SYSCALL_SIGNAL, + // ConfigureLabels.FEATURE_SYSCALL_NETWORK, + // ConfigureLabels.FEATURE_SYSCALL_DESC, ConfigureLabels.FEATURE_CONTEXT_SWITCH, +<<<<<<< Updated upstream // ConfigureLabels.FEATURE_SYSTEM_CPU, // ConfigureLabels.FEATURE_SYSTEM_PROCESSES, // ConfigureLabels.FEATURE_SYSTEM_MEMORY, @@ -113,6 +115,15 @@ public class ConfigurationDialogValues { // ConfigureLabels.FEATURE_SYSTEM_DEVICE, ConfigureLabels.FEATURE_SCREENSHOT, ConfigureLabels.FEATURE_USER_EVENT, +======= + ConfigureLabels.FEATURE_SYSTEM, + // ConfigureLabels.FEATURE_SYSTEM_CPU, + // ConfigureLabels.FEATURE_SYSTEM_PROCESSES, + // ConfigureLabels.FEATURE_SYSTEM_MEMORY, + // ConfigureLabels.FEATURE_SYSTEM_DISK, + // ConfigureLabels.FEATURE_SYSTEM_NETWORK, + // ConfigureLabels.FEATURE_SYSTEM_DEVICE, +>>>>>>> Stashed changes ConfigureLabels.FEATURE_SYSTEM_ENERGY }; mConfig = ConfigureManager.getInstance(); } @@ -150,11 +161,9 @@ public class ConfigurationDialogValues { } else if (featureName .equals(ConfigureLabels.FEATURE_RECORDING)) { return getRecording(); - }else if (featureName - .equals(ConfigureLabels.FEATURE_SYSCALL)) { + } else if (featureName.equals(ConfigureLabels.FEATURE_SYSCALL)) { return getSyscall(); - } - else if (featureName + } else if (featureName .equals(ConfigureLabels.FEATURE_SYSCALL_FILE)) { return getSyscallFile(); } else if (featureName @@ -172,24 +181,19 @@ public class ConfigurationDialogValues { } else if (featureName .equals(ConfigureLabels.FEATURE_SYSCALL_DESC)) { return getSyscallDesc(); - } - else if (featureName + } else if (featureName .equals(ConfigureLabels.FEATURE_CONTEXT_SWITCH)) { return getContextSwitch(); } else if (featureName.equals(ConfigureLabels.FEATURE_NETWORK)) { return getNetwork(); } else if (featureName.equals(ConfigureLabels.FEATURE_OPENGL)) { return getOpenGL(); - } -// else if (featureName -// .equals(ConfigureLabels.FEATURE_FUNCTION_SAMPLING)) { -// return getSampling(); -// } - else if (featureName - .equals(ConfigureLabels.FEATURE_SYSTEM)) { + } else if (featureName + .equals(ConfigureLabels.FEATURE_FUNCTION_SAMPLING)) { + return getSampling(); + } else if (featureName.equals(ConfigureLabels.FEATURE_SYSTEM)) { return getSystem(); - } - else if (featureName + } else if (featureName .equals(ConfigureLabels.FEATURE_SYSTEM_CPU)) { return getSystemCpu(); } else if (featureName @@ -207,8 +211,7 @@ public class ConfigurationDialogValues { } else if (featureName .equals(ConfigureLabels.FEATURE_SYSTEM_DEVICE)) { return getSystemDevice(); - } - else if (featureName + } else if (featureName .equals(ConfigureLabels.FEATURE_SYSTEM_ENERGY)) { return getSystemEnergy(); } else { @@ -269,53 +272,13 @@ public class ConfigurationDialogValues { value = AnalyzerConstants.FEATURE_RECORDING; } setRecording(value); - } - else if (featueName - .equals(ConfigureLabels.FEATURE_SYSCALL)) { - if (status) { - value = AnalyzerConstants.FEATURE_SYSCALL; - } - setSyscall(value); - } - - else if (featueName - .equals(ConfigureLabels.FEATURE_SYSCALL_FILE)) { - if (status) { - value = AnalyzerConstants.FEATURE_SYSCALL_FILE; - } - setSyscallFile(value); - } else if (featueName - .equals(ConfigureLabels.FEATURE_SYSCALL_IPC)) { - if (status) { - value = AnalyzerConstants.FEATURE_SYSCALL_IPC; - } - setSyscallIPC(value); - } else if (featueName - .equals(ConfigureLabels.FEATURE_SYSCALL_PROCESS)) { - if (status) { - value = AnalyzerConstants.FEATURE_SYSCALL_PROCESS; - } - setSyscallProcess(value); - } else if (featueName - .equals(ConfigureLabels.FEATURE_SYSCALL_SIGNAL)) { - if (status) { - value = AnalyzerConstants.FEATURE_SYSCALL_SIGNAL; - } - setSyscallSignal(value); - } else if (featueName - .equals(ConfigureLabels.FEATURE_SYSCALL_NETWORK)) { + + } else if (featueName.equals(ConfigureLabels.FEATURE_SYSCALL)) { if (status) { - value = AnalyzerConstants.FEATURE_SYSCALL_NETWORK; + value = AnalyzerConstants.FEATURE_SYSCALL; } - setSyscallNetwork(value); + setSyscall(value); } else if (featueName - .equals(ConfigureLabels.FEATURE_SYSCALL_DESC)) { - if (status) { - value = AnalyzerConstants.FEATURE_SYSCALL_DESC; - } - setSyscallDesc(value); - } - else if (featueName .equals(ConfigureLabels.FEATURE_CONTEXT_SWITCH)) { if (status) { value = AnalyzerConstants.FEATURE_CONTEXT_SWITCHING; @@ -331,60 +294,13 @@ public class ConfigurationDialogValues { value = AnalyzerConstants.FEATURE_OPENGL_API; } setOpenGL(value); - } -// else if (featueName -// .equals(ConfigureLabels.FEATURE_FUNCTION_SAMPLING)) { -// if (status) { -// value = AnalyzerConstants.FEATURE_FUNCTION_SAMPLING; -// } -// setSampling(value); -// } - else if (featueName - .equals(ConfigureLabels.FEATURE_SYSTEM)) { + + } else if (featueName.equals(ConfigureLabels.FEATURE_SYSTEM)) { if (status) { value = AnalyzerConstants.SYSTEM; } setSystem(value); - } - else if (featueName - .equals(ConfigureLabels.FEATURE_SYSTEM_CPU)) { - if (status) { - value = AnalyzerConstants.SYSTEM_CPU; - } - setSystemCpu(value); - } - else if (featueName - .equals(ConfigureLabels.FEATURE_SYSTEM_PROCESSES)) { - if (status) { - value = AnalyzerConstants.SYSTEM_PROCESSES; - } - setSystemProcesses(value); - } else if (featueName - .equals(ConfigureLabels.FEATURE_SYSTEM_MEMORY)) { - if (status) { - value = AnalyzerConstants.SYSTEM_MEMORY; - } - setSystemMemory(value); } else if (featueName - .equals(ConfigureLabels.FEATURE_SYSTEM_DISK)) { - if (status) { - value = AnalyzerConstants.SYSTEM_DISK; - } - setSystemDisk(value); - } else if (featueName - .equals(ConfigureLabels.FEATURE_SYSTEM_NETWORK)) { - if (status) { - value = AnalyzerConstants.SYSTEM_NETWORK; - } - setSystemNetwork(value); - } else if (featueName - .equals(ConfigureLabels.FEATURE_SYSTEM_DEVICE)) { - if (status) { - value = AnalyzerConstants.SYSTEM_DEVICE; - } - setSystemDevice(value); - } - else if (featueName .equals(ConfigureLabels.FEATURE_SYSTEM_ENERGY)) { if (status) { value = AnalyzerConstants.SYSTEM_ENERGY; @@ -428,60 +344,19 @@ public class ConfigurationDialogValues { setUserEvent(featuresStatus); } else if (featureName.equals(ConfigureLabels.FEATURE_RECORDING)) { setRecording(featuresStatus); - } - else if (featureName.equals(ConfigureLabels.FEATURE_SYSCALL)) { + } else if (featureName.equals(ConfigureLabels.FEATURE_SYSCALL)) { setSyscall(featuresStatus); - } - else if (featureName.equals(ConfigureLabels.FEATURE_SYSCALL_FILE)) { - setSyscallFile(featuresStatus); - } else if (featureName.equals(ConfigureLabels.FEATURE_SYSCALL_IPC)) { - setSyscallIPC(featuresStatus); - } else if (featureName - .equals(ConfigureLabels.FEATURE_SYSCALL_PROCESS)) { - setSyscallProcess(featuresStatus); - } else if (featureName - .equals(ConfigureLabels.FEATURE_SYSCALL_SIGNAL)) { - setSyscallSignal(featuresStatus); } else if (featureName - .equals(ConfigureLabels.FEATURE_SYSCALL_NETWORK)) { - setSyscallNetwork(featuresStatus); - } else if (featureName.equals(ConfigureLabels.FEATURE_SYSCALL_DESC)) { - setSyscallDesc(featuresStatus); - } - else if (featureName .equals(ConfigureLabels.FEATURE_CONTEXT_SWITCH)) { setContextSwitch(featuresStatus); } else if (featureName.equals(ConfigureLabels.FEATURE_NETWORK)) { setNetwork(featuresStatus); } else if (featureName.equals(ConfigureLabels.FEATURE_OPENGL)) { setOpenGL(featuresStatus); - } -// else if (featureName -// .equals(ConfigureLabels.FEATURE_FUNCTION_SAMPLING)) { -// setSampling(featuresStatus); -// } - else if (featureName.equals(ConfigureLabels.FEATURE_SYSTEM)) { + + } else if (featureName.equals(ConfigureLabels.FEATURE_SYSTEM)) { setSystem(featuresStatus); - } - else if (featureName.equals(ConfigureLabels.FEATURE_SYSTEM_CPU)) { - setSystemCpu(featuresStatus); - } - else if (featureName - .equals(ConfigureLabels.FEATURE_SYSTEM_PROCESSES)) { - setSystemProcesses(featuresStatus); - } else if (featureName - .equals(ConfigureLabels.FEATURE_SYSTEM_MEMORY)) { - setSystemMemory(featuresStatus); - } else if (featureName.equals(ConfigureLabels.FEATURE_SYSTEM_DISK)) { - setSystemDisk(featuresStatus); - } else if (featureName - .equals(ConfigureLabels.FEATURE_SYSTEM_NETWORK)) { - setSystemNetwork(featuresStatus); } else if (featureName - .equals(ConfigureLabels.FEATURE_SYSTEM_DEVICE)) { - setSystemDevice(featuresStatus); - } - else if (featureName .equals(ConfigureLabels.FEATURE_SYSTEM_ENERGY)) { setSystemEnergy(featuresStatus); } else { @@ -543,89 +418,63 @@ public class ConfigurationDialogValues { setConfig(getUserInterface(), featueName); } else if (featueName.equals(ConfigureLabels.FEATURE_SCREENSHOT)) { setConfig(getScreenshot(), featueName); - - if(getScreenshot() != 0) { - TimelineChartManager chartManager = TimelineChartManager.getInstance(); - StringBuffer strSaveSelectedChartNameList = new StringBuffer(""); //$NON-NLS-1$ + + if (getScreenshot() != 0) { + TimelineChartManager chartManager = TimelineChartManager + .getInstance(); + StringBuffer strSaveSelectedChartNameList = new StringBuffer( + ""); //$NON-NLS-1$ List chartList = chartManager.getChartList(); - List selectedChartList = chartManager.getSelectedChartList(); + List selectedChartList = chartManager + .getSelectedChartList(); List newSelectedChartList = new ArrayList(); ArrayList showInfo = new ArrayList(); - - for(TimelineChart chart : chartList) { - if(selectedChartList.contains(chart) || - chart instanceof ScreenshotChart) { + + for (TimelineChart chart : chartList) { + if (selectedChartList.contains(chart) + || chart instanceof ScreenshotChart) { newSelectedChartList.add(chart); - strSaveSelectedChartNameList.append(chart.getChartName()); + strSaveSelectedChartNameList.append(chart + .getChartName()); strSaveSelectedChartNameList.append(","); //$NON-NLS-1$ - + showInfo.add(true); } else { showInfo.add(false); } } - + chartManager.setSelectedChartList(newSelectedChartList); - AnalyzerUtil.getTimelineComposite().reArrangeChart(null, showInfo); - - ConfigureManager.getInstance().setValue( - ConfigureLabels.CONFIGUREMANAGER_CHART_SELECTED_ITEM_LIST, - strSaveSelectedChartNameList.toString()); + AnalyzerUtil.getTimelineComposite().reArrangeChart(null, + showInfo); + + ConfigureManager + .getInstance() + .setValue( + ConfigureLabels.CONFIGUREMANAGER_CHART_SELECTED_ITEM_LIST, + strSaveSelectedChartNameList.toString()); } } else if (featueName.equals(ConfigureLabels.FEATURE_USER_EVENT)) { setConfig(getUserEvent(), featueName); } else if (featueName.equals(ConfigureLabels.FEATURE_RECORDING)) { setConfig(getRecording(), featueName); + } else if (featueName.equals(ConfigureLabels.FEATURE_SYSCALL)) { setConfig(getSyscall(), featueName); - } - else if (featueName.equals(ConfigureLabels.FEATURE_SYSCALL_FILE)) { - setConfig(getSyscallFile(), featueName); - } else if (featueName.equals(ConfigureLabels.FEATURE_SYSCALL_IPC)) { - setConfig(getSyscallIPC(), featueName); - } else if (featueName - .equals(ConfigureLabels.FEATURE_SYSCALL_PROCESS)) { - setConfig(getSyscallProcess(), featueName); } else if (featueName - .equals(ConfigureLabels.FEATURE_SYSCALL_SIGNAL)) { - setConfig(getSyscallSignal(), featueName); - } else if (featueName - .equals(ConfigureLabels.FEATURE_SYSCALL_NETWORK)) { - setConfig(getSyscallNetwork(), featueName); - } else if (featueName.equals(ConfigureLabels.FEATURE_SYSCALL_DESC)) { - setConfig(getSyscallDesc(), featueName); - } - else if (featueName .equals(ConfigureLabels.FEATURE_CONTEXT_SWITCH)) { setConfig(getContextSwitch(), featueName); } else if (featueName.equals(ConfigureLabels.FEATURE_NETWORK)) { setConfig(getNetwork(), featueName); } else if (featueName.equals(ConfigureLabels.FEATURE_OPENGL)) { setConfig(getOpenGL(), featueName); - } -// else if (featueName -// .equals(ConfigureLabels.FEATURE_FUNCTION_SAMPLING)) { -// setConfig(getSampling(), featueName); -// } - else if (featueName.equals(ConfigureLabels.FEATURE_SYSTEM)) { + + } else if (featueName.equals(ConfigureLabels.FEATURE_SYSTEM)) { setConfig(getSystem(), featueName); - } - else if (featueName.equals(ConfigureLabels.FEATURE_SYSTEM_CPU)) { - setConfig(getSystemCpu(), featueName); - } else if (featueName - .equals(ConfigureLabels.FEATURE_SYSTEM_PROCESSES)) { - setConfig(getSystemProcesses(), featueName); - } else if (featueName.equals(ConfigureLabels.FEATURE_SYSTEM_MEMORY)) { - setConfig(getSystemMemory(), featueName); - } else if (featueName.equals(ConfigureLabels.FEATURE_SYSTEM_DISK)) { - setConfig(getSystemDisk(), featueName); } else if (featueName .equals(ConfigureLabels.FEATURE_SYSTEM_NETWORK)) { setConfig(getSystemNetwork(), featueName); - } else if (featueName.equals(ConfigureLabels.FEATURE_SYSTEM_DEVICE)) { - setConfig(getSystemDevice(), featueName); - } - else if (featueName.equals(ConfigureLabels.FEATURE_SYSTEM_ENERGY)) { + } else if (featueName.equals(ConfigureLabels.FEATURE_SYSTEM_ENERGY)) { setConfig(getSystemEnergy(), featueName); } else { System.out.println("failed undefine features"); @@ -701,41 +550,41 @@ public class ConfigurationDialogValues { System.out.println("change values RECORDING :" + prev + " to " + getRecording()); } - } - else if (featueName.equals(ConfigureLabels.FEATURE_SYSCALL)) { + } else if (featueName.equals(ConfigureLabels.FEATURE_SYSCALL)) { if (isChangeFeatuesValues(getSyscall(), featueName)) { System.out.println("change values syscall"); } - } - else if (featueName.equals(ConfigureLabels.FEATURE_SYSCALL_FILE)) { - if (isChangeFeatuesValues(getSyscallFile(), featueName)) { - System.out.println("change values syscall file"); - } - } else if (featueName.equals(ConfigureLabels.FEATURE_SYSCALL_IPC)) { - if (isChangeFeatuesValues(getSyscallIPC(), featueName)) { - System.out.println("change values syscall ipc"); - } - } else if (featueName - .equals(ConfigureLabels.FEATURE_SYSCALL_PROCESS)) { - if (isChangeFeatuesValues(getSyscallProcess(), featueName)) { - System.out.println("change values syscall process"); - } - } else if (featueName - .equals(ConfigureLabels.FEATURE_SYSCALL_SIGNAL)) { - if (isChangeFeatuesValues(getSyscallSignal(), featueName)) { - System.out.println("change values syscall signal"); - } + // } else if + // (featueName.equals(ConfigureLabels.FEATURE_SYSCALL_FILE)) { + // if (isChangeFeatuesValues(getSyscallFile(), featueName)) { + // System.out.println("change values syscall file"); + // } + // } else if + // (featueName.equals(ConfigureLabels.FEATURE_SYSCALL_IPC)) { + // if (isChangeFeatuesValues(getSyscallIPC(), featueName)) { + // System.out.println("change values syscall ipc"); + // } + // } else if (featueName + // .equals(ConfigureLabels.FEATURE_SYSCALL_PROCESS)) { + // if (isChangeFeatuesValues(getSyscallProcess(), featueName)) { + // System.out.println("change values syscall process"); + // } + // } else if (featueName + // .equals(ConfigureLabels.FEATURE_SYSCALL_SIGNAL)) { + // if (isChangeFeatuesValues(getSyscallSignal(), featueName)) { + // System.out.println("change values syscall signal"); + // } + // } else if (featueName + // .equals(ConfigureLabels.FEATURE_SYSCALL_NETWORK)) { + // if (isChangeFeatuesValues(getSyscallNetwork(), featueName)) { + // System.out.println("change values syscall network"); + // } + // } else if + // (featueName.equals(ConfigureLabels.FEATURE_SYSCALL_DESC)) { + // if (isChangeFeatuesValues(getSyscallDesc(), featueName)) { + // System.out.println("change values syscall desc"); + // } } else if (featueName - .equals(ConfigureLabels.FEATURE_SYSCALL_NETWORK)) { - if (isChangeFeatuesValues(getSyscallNetwork(), featueName)) { - System.out.println("change values syscall network"); - } - } else if (featueName.equals(ConfigureLabels.FEATURE_SYSCALL_DESC)) { - if (isChangeFeatuesValues(getSyscallDesc(), featueName)) { - System.out.println("change values syscall desc"); - } - } - else if (featueName .equals(ConfigureLabels.FEATURE_CONTEXT_SWITCH)) { if (isChangeFeatuesValues(getContextSwitch(), featueName)) { System.out.println("change values context switch"); @@ -748,46 +597,49 @@ public class ConfigurationDialogValues { if (isChangeFeatuesValues(getOpenGL(), featueName)) { System.out.println("change values open GL"); } - } -// else if (featueName -// .equals(ConfigureLabels.FEATURE_FUNCTION_SAMPLING)) { -// if (isChangeFeatuesValues(getSampling(), featueName)) { -// System.out.println("change values sampling"); -// } -// } + } + // else if (featueName + // .equals(ConfigureLabels.FEATURE_FUNCTION_SAMPLING)) { + // if (isChangeFeatuesValues(getSampling(), featueName)) { + // System.out.println("change values sampling"); + // } + // } else if (featueName.equals(ConfigureLabels.FEATURE_SYSTEM)) { if (isChangeFeatuesValues(getSystem(), featueName)) { System.out.println("change values system"); } - } - else if (featueName.equals(ConfigureLabels.FEATURE_SYSTEM_CPU)) { - if (isChangeFeatuesValues(getSystemCpu(), featueName)) { - System.out.println("change values system cpu"); - } - } else if (featueName - .equals(ConfigureLabels.FEATURE_SYSTEM_PROCESSES)) { - if (isChangeFeatuesValues(getSystemProcesses(), featueName)) { - System.out.println("change values system processes"); - } - } else if (featueName.equals(ConfigureLabels.FEATURE_SYSTEM_MEMORY)) { - if (isChangeFeatuesValues(getSystemMemory(), featueName)) { - System.out.println("change values system memory"); - } - } else if (featueName.equals(ConfigureLabels.FEATURE_SYSTEM_DISK)) { - if (isChangeFeatuesValues(getSystemDisk(), featueName)) { - System.out.println("change values system disk"); - } - } else if (featueName - .equals(ConfigureLabels.FEATURE_SYSTEM_NETWORK)) { - if (isChangeFeatuesValues(getSystemNetwork(), featueName)) { - System.out.println("change values system network"); - } - } else if (featueName.equals(ConfigureLabels.FEATURE_SYSTEM_DEVICE)) { - if (isChangeFeatuesValues(getSystemDevice(), featueName)) { - System.out.println("change values system device"); - } - } - else if (featueName.equals(ConfigureLabels.FEATURE_SYSTEM_ENERGY)) { + // } else if + // (featueName.equals(ConfigureLabels.FEATURE_SYSTEM_CPU)) { + // if (isChangeFeatuesValues(getSystemCpu(), featueName)) { + // System.out.println("change values system cpu"); + // } + // } else if (featueName + // .equals(ConfigureLabels.FEATURE_SYSTEM_PROCESSES)) { + // if (isChangeFeatuesValues(getSystemProcesses(), featueName)) + // { + // System.out.println("change values system processes"); + // } + // } else if + // (featueName.equals(ConfigureLabels.FEATURE_SYSTEM_MEMORY)) { + // if (isChangeFeatuesValues(getSystemMemory(), featueName)) { + // System.out.println("change values system memory"); + // } + // } else if + // (featueName.equals(ConfigureLabels.FEATURE_SYSTEM_DISK)) { + // if (isChangeFeatuesValues(getSystemDisk(), featueName)) { + // System.out.println("change values system disk"); + // } + // } else if (featueName + // .equals(ConfigureLabels.FEATURE_SYSTEM_NETWORK)) { + // if (isChangeFeatuesValues(getSystemNetwork(), featueName)) { + // System.out.println("change values system network"); + // } + // } else if + // (featueName.equals(ConfigureLabels.FEATURE_SYSTEM_DEVICE)) { + // if (isChangeFeatuesValues(getSystemDevice(), featueName)) { + // System.out.println("change values system device"); + // } + } else if (featueName.equals(ConfigureLabels.FEATURE_SYSTEM_ENERGY)) { if (isChangeFeatuesValues(getSystemEnergy(), featueName)) { System.out.println("change values system energy"); } @@ -820,13 +672,15 @@ public class ConfigurationDialogValues { public void setAutoStop(boolean autoStop) { this.autoStop = autoStop; } + public int getSyscall() { return syscall; } + public void setSyscall(int syscall) { this.syscall = syscall; } - + public int getSyscallFile() { return syscallFile; } @@ -978,7 +832,7 @@ public class ConfigurationDialogValues { public void setSystem(int system) { this.system = system; } - + public int getSystemCpu() { return systemCpu; } @@ -986,7 +840,7 @@ public class ConfigurationDialogValues { public void setSystemCpu(int systemCpu) { this.systemCpu = systemCpu; } - + public int getSystemProcesses() { return systemProcesses; } -- 2.7.4