Skip to content
Snippets Groups Projects
Commit d0bf532e authored by Florian Fittkau's avatar Florian Fittkau
Browse files

...

parent f037035d
No related branches found
No related tags found
No related merge requests found
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication"> <launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/worker/src/explorviz/live_trace_processing/main/WorkerStarter.java"/> <listEntry value="/analysis/src/explorviz/live_trace_processing/main/WorkerStarter.java"/>
</listAttribute> </listAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="1"/> <listEntry value="1"/>
...@@ -10,6 +10,6 @@ ...@@ -10,6 +10,6 @@
<listEntry value="org.eclipse.debug.ui.launchGroup.run"/> <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
</listAttribute> </listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="explorviz.live_trace_processing.main.WorkerStarter"/> <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="explorviz.live_trace_processing.main.WorkerStarter"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="worker"/> <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="analysis"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx4G -Dexplorviz.live_trace_processing.worker_enabled=false -Dexplorviz.live_trace_processing.reader_listening_port=10134"/> <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx4G -Dexplorviz.live_trace_processing.worker_enabled=false -Dexplorviz.live_trace_processing.reader_listening_port=10135"/>
</launchConfiguration> </launchConfiguration>
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/analysis/src/explorviz/live_trace_processing/main/WorkerStarter.java"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="1"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
</listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="explorviz.live_trace_processing.main.WorkerStarter"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="analysis"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx4G -Dexplorviz.live_trace_processing.worker_enabled=true -Dexplorviz.live_trace_processing.reader_listening_port=10134 -Dexplorviz.live_trace_processing.writer_target_port=10135"/>
</launchConfiguration>
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication"> <launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/worker/src/explorviz/live_trace_processing/main/WorkerStarter.java"/> <listEntry value="/analysis/src/explorviz/live_trace_processing/main/WorkerStarter.java"/>
</listAttribute> </listAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="1"/> <listEntry value="1"/>
...@@ -10,6 +10,6 @@ ...@@ -10,6 +10,6 @@
<listEntry value="org.eclipse.debug.ui.launchGroup.run"/> <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
</listAttribute> </listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="explorviz.live_trace_processing.main.WorkerStarter"/> <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="explorviz.live_trace_processing.main.WorkerStarter"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="worker"/> <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="analysis"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx4G -Dexplorviz.live_trace_processing.worker_enabled=true -Dexplorviz.live_trace_processing.reader_listening_port=10133 -Dexplorviz.live_trace_processing.writer_target_port=10134"/> <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx4G -Dexplorviz.live_trace_processing.worker_enabled=true -Dexplorviz.live_trace_processing.reader_listening_port=10133 -Dexplorviz.live_trace_processing.writer_target_port=10134"/>
</launchConfiguration> </launchConfiguration>
...@@ -138,7 +138,6 @@ IRecordSender { ...@@ -138,7 +138,6 @@ IRecordSender {
while (buffer.hasRemaining()) { while (buffer.hasRemaining()) {
socketChannel.write(buffer); socketChannel.write(buffer);
} }
doDisconnectIfNessecary();
} catch (final IOException e) { } catch (final IOException e) {
System.out.println("WARNING: Connection was closed - possible data loss"); System.out.println("WARNING: Connection was closed - possible data loss");
try { try {
...@@ -147,6 +146,7 @@ IRecordSender { ...@@ -147,6 +146,7 @@ IRecordSender {
} }
} finally { } finally {
buffer.clear(); buffer.clear();
doDisconnectIfNessecary();
} }
} }
...@@ -163,7 +163,6 @@ IRecordSender { ...@@ -163,7 +163,6 @@ IRecordSender {
while (buffer.hasRemaining()) { while (buffer.hasRemaining()) {
socketChannel.write(buffer); socketChannel.write(buffer);
} }
doDisconnectIfNessecary();
} catch (final IOException e) { } catch (final IOException e) {
System.out System.out
.println("WARNING: Connection was closed during String sending - possible data loss"); .println("WARNING: Connection was closed during String sending - possible data loss");
...@@ -173,6 +172,7 @@ IRecordSender { ...@@ -173,6 +172,7 @@ IRecordSender {
} }
} finally { } finally {
buffer.clear(); buffer.clear();
doDisconnectIfNessecary();
} }
} }
...@@ -200,4 +200,12 @@ IRecordSender { ...@@ -200,4 +200,12 @@ IRecordSender {
shouldDisconnect = true; shouldDisconnect = true;
doDisconnectIfNessecary(); doDisconnectIfNessecary();
} }
@Override
public boolean isDisconnected() {
if (socketChannel != null) {
return !socketChannel.isConnected();
}
return true;
}
} }
...@@ -732,9 +732,11 @@ class TCPReaderOneClient implements Runnable { ...@@ -732,9 +732,11 @@ class TCPReaderOneClient implements Runnable {
final long usedRAM = buffer.getLong(); final long usedRAM = buffer.getLong();
final long absoluteRAM = buffer.getLong(); final long absoluteRAM = buffer.getLong();
if (hostApplicationMetadata != null) {
putInQueue(new SystemMonitoringRecord(cpuUtil, usedRAM, absoluteRAM, putInQueue(new SystemMonitoringRecord(cpuUtil, usedRAM, absoluteRAM,
hostApplicationMetadata)); hostApplicationMetadata));
} }
}
private final void readInBeforeConstructorEvent(final ByteBuffer buffer) { private final void readInBeforeConstructorEvent(final ByteBuffer buffer) {
final long traceId = buffer.getLong(); final long traceId = buffer.getLong();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment