Skip to content

GXDebugStream was being closed instantly after creating it #785

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gusbro merged 2 commits into from
Oct 17, 2023
Merged

GXDebugStream was being closed instantly after creating it #785

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad199aa
GXDebugStream was being closed too instantly after creating it
gusbro Oct 14, 2023
464a789
fix lint warnings
gusbro Oct 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
161 changes: 80 additions & 81 deletions common/src/main/java/com/genexus/diagnostics/GXDebugManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@
import com.genexus.ModelContext;

import java.io.*;
import java.nio.channels.FileChannel;
import java.util.Date;
import java.util.HashSet;
import java.util.UUID;
import java.util.Date;
import java.util.concurrent.*;
import java.util.concurrent.atomic.AtomicInteger;

Expand Down Expand Up @@ -37,7 +36,7 @@ public static GXDebugManager getInstance()
return instance;
}

private static int BUFFER_INITIAL_SIZE = 16383;
private static final int BUFFER_INITIAL_SIZE = 16383;
private static final long TICKS_NOT_SET = Long.MAX_VALUE;
private static final long TICKS_NOT_NEEDED = 0;
private static String fileName = "gxperf.gxd";
Expand All @@ -54,7 +53,7 @@ private GXDebugManager()
}
sessionGuid = UUID.randomUUID();
lastSId = new AtomicInteger();
executorService = new ThreadPoolExecutor(0, 1, 5, TimeUnit.MINUTES, new SynchronousQueue<Runnable>());
executorService = new ThreadPoolExecutor(0, 1, 5, TimeUnit.MINUTES, new SynchronousQueue<>(), Executors.defaultThreadFactory(), new ThreadPoolExecutor.CallerRunsPolicy());
pushSystem(GXDebugMsgCode.INITIALIZE.toByteInt(), new Date());
}

Expand Down Expand Up @@ -88,11 +87,11 @@ private int newSId()

private GXDebugItem [] current, next, toSave;
private boolean saving = false;
private int dbgIndex = 0;
private volatile int dbgIndex = 0;
private final Object saveLock = new Object();
private final Object mSaveLock = new Object();
private final ConcurrentHashMap<String, GXDebugInfo> parentTable = new ConcurrentHashMap<String, GXDebugInfo>();
private final HashSet<IntPair> pgmInfoTable = new HashSet<IntPair>();
private final ConcurrentHashMap<String, GXDebugInfo> parentTable = new ConcurrentHashMap<>();
private final HashSet<IntPair> pgmInfoTable = new HashSet<>();

private static ExecutorService executorService;

Expand All @@ -119,13 +118,13 @@ protected GXDebugItem pushRange(GXDebugInfo dbgInfo, int lineNro, int colNro, in
else return mPush(dbgInfo, GXDebugMsgType.PGM_TRACE_RANGE, lineNro, lineNro2, null);
}

private GXDebugItem mPush(GXDebugInfo dbgInfo, GXDebugMsgType msgType, int arg1, int arg2, Object argObj)
private GXDebugItem mPush(GXDebugInfo dbgInfo, GXDebugMsgType msgType, int arg1, int arg2, Object argObj)
{
synchronized (saveLock)
{
if (toSave != null)
{
save(toSave);
save(toSave, -1, true);
toSave = null;
}
GXDebugItem currentItem = current[dbgIndex];
Expand Down Expand Up @@ -183,13 +182,9 @@ private GXDebugItem mPush(GXDebugInfo dbgInfo, GXDebugMsgType msgType, int arg1,

}

private void save(GXDebugItem[] toSave)
{
save(toSave, -1, true);
}

private void save(GXDebugItem[] toSave, int saveTop, boolean saveInThread)
{
// This method always runs inside the critical section defined by saveLock
int saveCount = 0;
if (saveTop == -1)
{
Expand Down Expand Up @@ -237,15 +232,16 @@ else if(saveTop == 0)
final GXDebugItem[] mToSave = toSave;
final int mSaveTop = saveTop;
final int mSaveCount = saveCount;
executorService.execute(new Runnable(){public void run(){mSave(mToSave, mSaveTop, mSaveCount);}});
executorService.execute(() -> mSave(mToSave, mSaveTop, mSaveCount));
}
else mSave(toSave, saveTop, saveCount );
}
}

protected void onExit(GXDebugInfo dbgInfo)
{
pushSystem(GXDebugMsgCode.EXIT.toByteInt());
save();
executorService.shutdown();
}

protected void onCleanup(GXDebugInfo dbgInfo)
Expand All @@ -270,7 +266,7 @@ private void save()
{
if (toSave != null)
{
save(toSave);
save(toSave, -1, true);
toSave = null;
}
save(current, dbgIndex, false);
Expand All @@ -288,7 +284,7 @@ private void clearDebugItem(GXDebugItem dbgItem)

private void mSave(GXDebugItem [] data, int saveTop, int saveCount)
{
synchronized(mSaveLock)
synchronized(mSaveLock)
{
// Obtengo chunk a grabar
int idx = 0;
Expand All @@ -302,65 +298,66 @@ private void mSave(GXDebugItem [] data, int saveTop, int saveCount)
for (; idx < saveTop; idx++)
{
GXDebugItem dbgItem = data[idx];
switch (dbgItem.msgType)
{
case SYSTEM:
{
stream.writeByte((dbgItem.msgType.toByteInt() | (GXDebugMsgCode.valueOf(dbgItem.arg1).toByteInt())));
switch (GXDebugMsgCode.valueOf(dbgItem.arg1))
{
case INITIALIZE:
stream.writeLong(ToTicks((Date) dbgItem.argObj));
break;
case OBJ_CLEANUP:
stream.writeVLUInt((Integer) dbgItem.argObj);
break;
case EXIT:
switch (dbgItem.msgType)
{
case SYSTEM:
{
stream.writeByte((dbgItem.msgType.toByteInt() | (GXDebugMsgCode.valueOf(dbgItem.arg1).toByteInt())));
switch (GXDebugMsgCode.valueOf(dbgItem.arg1))
{
case INITIALIZE:
stream.writeLong(ToTicks((Date) dbgItem.argObj));
break;
case OBJ_CLEANUP:
stream.writeVLUInt((Integer) dbgItem.argObj);
break;
case EXIT:
break;
case PGM_INFO:
Object [] info = (Object[])dbgItem.argObj;
stream.writeVLUInt(((IntPair)info[0]).left);
stream.writeVLUInt(((IntPair)info[0]).right);
stream.writeVLUInt(((PgmInfo)info[1]).dbgLines);
stream.writeInt(((PgmInfo)info[1]).hash);
break;
default:
throw new IllegalArgumentException(String.format("Invalid DbgItem: %s", dbgItem));
}
}
break;
case PGM_TRACE:
{
stream.writePgmTrace(dbgItem.dbgInfo.sId, dbgItem.arg1, dbgItem.arg2, dbgItem.ticks);
}
break;
Object[] info = (Object[]) dbgItem.argObj;
stream.writeVLUInt(((IntPair) info[0]).left);
stream.writeVLUInt(((IntPair) info[0]).right);
stream.writeVLUInt(((PgmInfo) info[1]).dbgLines);
stream.writeInt(((PgmInfo) info[1]).hash);
break;
default:
throw new IllegalArgumentException(String.format("Invalid DbgItem: %s", dbgItem));
}
}
break;
case PGM_TRACE:
{
stream.writePgmTrace(dbgItem.dbgInfo.sId, dbgItem.arg1, dbgItem.arg2, dbgItem.ticks);
}
break;
case PGM_TRACE_RANGE:
case PGM_TRACE_RANGE_WITH_COLS:
{
stream.writeByte(dbgItem.msgType.toByteInt());
stream.writeVLUInt(dbgItem.dbgInfo.sId);
stream.writeVLUInt(dbgItem.arg1);
stream.writeVLUInt(dbgItem.arg2);
if(dbgItem.msgType == GXDebugMsgType.PGM_TRACE_RANGE_WITH_COLS)
if (dbgItem.msgType == GXDebugMsgType.PGM_TRACE_RANGE_WITH_COLS)
{
stream.writeVLUInt(((IntPair)dbgItem.argObj).left);
stream.writeVLUInt(((IntPair)dbgItem.argObj).right);
stream.writeVLUInt(((IntPair) dbgItem.argObj).left);
stream.writeVLUInt(((IntPair) dbgItem.argObj).right);
}
}
break;
case REGISTER_PGM:
{
stream.writeByte(dbgItem.msgType.toByteInt());
stream.writeVLUInt(dbgItem.dbgInfo.sId);
stream.writeVLUInt(dbgItem.arg1);
stream.writeVLUInt(((IntPair) dbgItem.argObj).left);
stream.writeVLUInt(((IntPair) dbgItem.argObj).right);
}
break;
case SKIP:
continue;
}
clearDebugItem(dbgItem);
}
case REGISTER_PGM:
{
stream.writeByte(dbgItem.msgType.toByteInt());
stream.writeVLUInt(dbgItem.dbgInfo.sId);
stream.writeVLUInt(dbgItem.arg1);
stream.writeVLUInt(((IntPair) dbgItem.argObj).left);
stream.writeVLUInt(((IntPair) dbgItem.argObj).right);
}
break;
case SKIP:
continue;
}
clearDebugItem(dbgItem);
}
} finally
{
if (stream != null)
Expand Down Expand Up @@ -460,7 +457,7 @@ private int toByteInt()
}


class GXDebugItem
static class GXDebugItem
{
GXDebugInfo dbgInfo;
int arg1;
Expand All @@ -478,7 +475,7 @@ public String toString()
private String toStringTicks(){ return (msgType == GXDebugMsgType.PGM_TRACE ? String.format(" elapsed:%d", ticks) : ""); }
}

class IntPair
static class IntPair
{
final int left;
final int right;
Expand All @@ -505,7 +502,7 @@ public boolean equals(Object o)

}

class PgmInfo
static class PgmInfo
{
final int dbgLines;
final long hash;
Expand Down Expand Up @@ -552,7 +549,7 @@ public final void restart()

static class GXDebugStream extends FilterOutputStream
{
class ESCAPE
static class ESCAPE
{
static final byte PROLOG = 0;
static final byte EPILOG = 1;
Expand All @@ -565,15 +562,12 @@ class ESCAPE

static GXDebugStream getStream(String fileName) throws IOException
{
try (FileOutputStream stream = new FileOutputStream(fileName, true)){
return new GXDebugStream(new BufferedOutputStream(stream), stream.getChannel());
}
return new GXDebugStream(fileName);
}

private GXDebugStream(OutputStream stream, FileChannel channel) throws IOException
private GXDebugStream(String fileName) throws IOException
{
this(stream);
channel.lock();
this(new BufferedOutputStream(new FileOutputStream(fileName, true)));
}

GXDebugStream(OutputStream stream)
Expand All @@ -588,8 +582,8 @@ private GXDebugStream(OutputStream stream, FileChannel channel) throws IOExcepti
public void close() throws IOException
{
writeEpilog();
super.close();
}
super.close();
}

private void writeProlog(short version) throws IOException
{
Expand All @@ -610,7 +604,11 @@ public void write(byte[] data) throws IOException

void writeRaw(byte[] data, int from, int length) throws IOException
{
super.write(data, from, length);
if ((from | length | (data.length - (length + from)) | (from + length)) < 0)
throw new IndexOutOfBoundsException();

while (length-- > 0)
writeRaw(data[from++]);
}

void writeRaw(byte value) throws IOException
Expand All @@ -625,16 +623,17 @@ public void write(byte[] data, int offset, int count) throws IOException
writeByte(data[offset++]);
}

private int last, lastLast;
private volatile int last, lastLast;

@Override
public void write(int value)throws IOException
public void write(int value) throws IOException
{
writeByte(value);
}

void writeByte(int value) throws IOException
{
value &= 0xFF;
super.write(value);
if (value == 0xFF &&
value == last &&
Expand Down Expand Up @@ -703,7 +702,7 @@ void writeInt(long value) throws IOException
}
}

private int LastSId, LastLine1;
private volatile int LastSId, LastLine1;

void writePgmTrace(int SId, int line1, int col, long ticks) throws IOException
{
Expand Down