mirrors/riiablo
1
0
Fork 0
mirror of https://github.com/collinsmith/riiablo.git synced 2025-03-13 11:30:01 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added more robust logging for item reader and writer bytes read and written

Browse Source
This commit is contained in:
Collin Smith 2020-08-16 00:27:53 -07:00
parent bebd4dc3ff
commit 52a5508167
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/src/com/riiablo/item/ItemReader.java
View File

@ -22,7 +22,7 @@ public class ItemReader {
} }
public Item readItem(ByteInput in) { public Item readItem(ByteInput in) {
final int itemOffset = in.bytesRead(); // TODO: remove when serialization implemented final int startOffset = in.bytesRead(); // TODO: remove when serialization implemented
Item item = readSingleItem(in); Item item = readSingleItem(in);
if (item.socketsFilled > 0) log.trace("Reading {} sockets...", item.socketsFilled); if (item.socketsFilled > 0) log.trace("Reading {} sockets...", item.socketsFilled);
for (int i = 0; i < item.socketsFilled; i++) { for (int i = 0; i < item.socketsFilled; i++) {
@ -34,8 +34,16 @@ public class ItemReader {
Log.remove("socket"); Log.remove("socket");
} }
} }
final int itemSize = in.bytesRead() - itemOffset; // TODO: remove when serialization implemented final int endOffset = in.bytesRead();
item.data = in.duplicate(itemOffset, itemSize); // TODO: remove when serialization implemented final int itemSize = endOffset - startOffset; // TODO: remove when serialization implemented
item.data = in.duplicate(startOffset, itemSize); // TODO: remove when serialization implemented
if (log.isTraceEnabled()) {
log.trace("size: {} (0x{}) (+{} .. +{})",
itemSize,
Integer.toHexString(itemSize),
Integer.toHexString(startOffset),
Integer.toHexString(endOffset));
}
return item; return item;
} }

16
core/src/com/riiablo/item/ItemWriter.java
View File

@ -1,5 +1,6 @@
package com.riiablo.item; package com.riiablo.item;
import io.netty.buffer.ByteBufUtil;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
@ -18,6 +19,7 @@ public class ItemWriter {
private static final byte[] SIGNATURE = {0x4A, 0x4D}; private static final byte[] SIGNATURE = {0x4A, 0x4D};
public ByteOutput writeItem(Item item, ByteOutput out) { public ByteOutput writeItem(Item item, ByteOutput out) {
final int startOffset = out.bytesWritten();
writeSingleItem(item, out); writeSingleItem(item, out);
if (item.socketsFilled > 0) log.trace("Writing {} sockets...", item.socketsFilled); if (item.socketsFilled > 0) log.trace("Writing {} sockets...", item.socketsFilled);
for (int i = 0; i < item.socketsFilled; i++) { for (int i = 0; i < item.socketsFilled; i++) {
@ -29,6 +31,20 @@ public class ItemWriter {
Log.remove("socket"); Log.remove("socket");
} }
} }
if (log.isDebugEnabled()) {
final int endOffset = out.bytesWritten();
final int itemSize = endOffset - startOffset;
log.debug("size: {} (0x{}) (+{} .. +{})",
itemSize,
Integer.toHexString(itemSize),
Integer.toHexString(startOffset),
Integer.toHexString(endOffset));
if (log.isTraceEnabled()) {
Log.tracef(log, "bytes: %n%s", ByteBufUtil.prettyHexDump(out.buffer()));
} else {
log.debug("bytes: {}", ByteBufUtil.hexDump(out.buffer()));
}
}
return out; return out;
} }