Commit 41647933 authored by Lukáš Marek's avatar Lukáš Marek

Project rename

Warning fixes
Builds with default java options again
Minor comment cleanup
parent bf724fd2
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<projectDescription> <projectDescription>
<name>DiSL-1.0.x</name> <name>DiSL-RE</name>
<comment></comment> <comment></comment>
<projects> <projects>
</projects> </projects>
......
...@@ -19,6 +19,3 @@ build.afterbootstrap=build-abs ...@@ -19,6 +19,3 @@ build.afterbootstrap=build-abs
extendedthread.path=${build}/extendedthread.jar extendedthread.path=${build}/extendedthread.jar
instr.jar.name=disl-instr.jar instr.jar.name=disl-instr.jar
ant.build.javac.source=1.6
ant.build.javac.target=1.6
...@@ -763,14 +763,13 @@ static void analysis_end(struct tldata * tld) { ...@@ -763,14 +763,13 @@ static void analysis_end(struct tldata * tld) {
// sending of half-full buffer is done in thread end hook // sending of half-full buffer is done in thread end hook
// add number of completed requests // increment the number of completed requests
tld->analysis_count++; tld->analysis_count++;
// buffer has to be updated each time because thread could end and buffer // buffer has to be updated each time - the thread can end any time
// has to be up-to date
buff_put_int(tld->analysis_buff, tld->analysis_count_pos, tld->analysis_count); buff_put_int(tld->analysis_buff, tld->analysis_count_pos, tld->analysis_count);
// send only when the method count is reached // send only after the proper count is reached
if(tld->analysis_count >= ANALYSIS_COUNT) { if(tld->analysis_count >= ANALYSIS_COUNT) {
// invalidate buffer pointers // invalidate buffer pointers
tld->analysis_buff = NULL; tld->analysis_buff = NULL;
...@@ -1216,6 +1215,7 @@ static void send_all_to_buffers() { ...@@ -1216,6 +1215,7 @@ static void send_all_to_buffers() {
} }
static void send_thread_buffers(struct tldata * tld) { static void send_thread_buffers(struct tldata * tld) {
// thread is marked -> worked with buffers // thread is marked -> worked with buffers
jlong thread_id = tld->id; jlong thread_id = tld->id;
if(thread_id != INVALID_THREAD_ID) { if(thread_id != INVALID_THREAD_ID) {
......
...@@ -6,7 +6,6 @@ import java.util.List; ...@@ -6,7 +6,6 @@ import java.util.List;
import java.util.Set; import java.util.Set;
import org.objectweb.asm.tree.AbstractInsnNode; import org.objectweb.asm.tree.AbstractInsnNode;
import org.objectweb.asm.tree.InsnList;
import org.objectweb.asm.tree.MethodNode; import org.objectweb.asm.tree.MethodNode;
import ch.usi.dag.disl.exception.MarkerException; import ch.usi.dag.disl.exception.MarkerException;
......
...@@ -5,7 +5,6 @@ import java.util.List; ...@@ -5,7 +5,6 @@ import java.util.List;
import org.objectweb.asm.Opcodes; import org.objectweb.asm.Opcodes;
import org.objectweb.asm.tree.AbstractInsnNode; import org.objectweb.asm.tree.AbstractInsnNode;
import org.objectweb.asm.tree.InsnList;
import org.objectweb.asm.tree.MethodInsnNode; import org.objectweb.asm.tree.MethodInsnNode;
import org.objectweb.asm.tree.MethodNode; import org.objectweb.asm.tree.MethodNode;
......
...@@ -296,7 +296,6 @@ public class WeavingCode { ...@@ -296,7 +296,6 @@ public class WeavingCode {
} }
} else { } else {
int sopcode = t.getOpcode(Opcodes.ISTORE);
int lopcode = t.getOpcode(Opcodes.ILOAD); int lopcode = t.getOpcode(Opcodes.ILOAD);
// index should be less than the stack height // index should be less than the stack height
......
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