Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2024-11-24 03:05:28 +01:00
Code Issues Projects Releases Wiki Activity

Shift remaining storage access call off of server thread

Browse Source
This commit is contained in:
Mike Primm 2020-05-26 22:34:00 -05:00
parent 366d3e5a5d
commit a67f50350a
3 changed files with 154 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
DynmapCore/src/main/java/org/dynmap/JsonFileClientUpdateComponent.java
View File

@ -265,6 +265,8 @@ public class JsonFileClientUpdateComponent extends ClientUpdateComponent {
sb.append("'\n }\n};\n"); sb.append("'\n }\n};\n");
byte[] outputBytes = sb.toString().getBytes(cs_utf8); byte[] outputBytes = sb.toString().getBytes(cs_utf8);
MapManager.scheduleDelayedJob(new Runnable() {
public void run() {
File f = new File(baseStandaloneDir, "config.js"); File f = new File(baseStandaloneDir, "config.js");
FileOutputStream fos = null; FileOutputStream fos = null;
try { try {
@ -281,6 +283,8 @@ public class JsonFileClientUpdateComponent extends ClientUpdateComponent {
} }
} }
} }
}, 0);
}
protected void writeConfiguration() { protected void writeConfiguration() {
JSONObject clientConfiguration = new JSONObject(); JSONObject clientConfiguration = new JSONObject();
@ -369,30 +373,7 @@ public class JsonFileClientUpdateComponent extends ClientUpdateComponent {
} }
} }
protected void handleWebChat() { private void processWebChat(JSONArray jsonMsgs) {
BufferInputStream bis = storage.getStandaloneFile("dynmap_webchat.json");
if (bis != null && lastTimestamp != 0) {
JSONArray jsonMsgs = null;
Reader inputFileReader = null;
try {
inputFileReader = new InputStreamReader(bis, cs_utf8);
jsonMsgs = (JSONArray) parser.parse(inputFileReader);
} catch (IOException ex) {
Log.severe("Exception while reading JSON-file.", ex);
} catch (ParseException ex) {
Log.severe("Exception while parsing JSON-file.", ex);
} finally {
if(inputFileReader != null) {
try {
inputFileReader.close();
} catch (IOException iox) {
}
inputFileReader = null;
}
}
if (jsonMsgs != null) {
Iterator<?> iter = jsonMsgs.iterator(); Iterator<?> iter = jsonMsgs.iterator();
boolean init_skip = (lastChatTimestamp == 0); boolean init_skip = (lastChatTimestamp == 0);
while (iter.hasNext()) { while (iter.hasNext()) {
@ -478,7 +459,44 @@ public class JsonFileClientUpdateComponent extends ClientUpdateComponent {
} }
} }
} }
protected void handleWebChat() {
MapManager.scheduleDelayedJob(new Runnable() {
public void run() {
BufferInputStream bis = storage.getStandaloneFile("dynmap_webchat.json");
if (bis != null && lastTimestamp != 0) {
JSONArray jsonMsgs = null;
Reader inputFileReader = null;
try {
inputFileReader = new InputStreamReader(bis, cs_utf8);
jsonMsgs = (JSONArray) parser.parse(inputFileReader);
} catch (IOException ex) {
Log.severe("Exception while reading JSON-file.", ex);
} catch (ParseException ex) {
Log.severe("Exception while parsing JSON-file.", ex);
} finally {
if(inputFileReader != null) {
try {
inputFileReader.close();
} catch (IOException iox) {
} }
inputFileReader = null;
}
}
if (jsonMsgs != null) {
final JSONArray json = jsonMsgs;
// Process content on server thread
core.getServer().scheduleServerTask(new Runnable() {
@Override
public void run() {
processWebChat(json);
}
}, 0);
}
}
}
}, 0);
} }
protected void handleRegister() { protected void handleRegister() {
if(core.pendingRegisters() == false) if(core.pendingRegisters() == false)

4
DynmapCore/src/main/java/org/dynmap/markers/impl/MarkerAPIImpl.java
View File

@ -395,6 +395,8 @@ public class MarkerAPIImpl implements MarkerAPI, Event.Listener<DynmapWorld> {
Log.severe("Error creating markers directory - " + api.markerdir.getPath()); Log.severe("Error creating markers directory - " + api.markerdir.getPath());
} }
} }
MapManager.scheduleDelayedJob(new Runnable() {
public void run() {
/* Now publish marker files to the tiles directory */ /* Now publish marker files to the tiles directory */
for(MarkerIcon ico : api.getMarkerIcons()) { for(MarkerIcon ico : api.getMarkerIcons()) {
api.publishMarkerIcon(ico); api.publishMarkerIcon(ico);
@ -405,6 +407,8 @@ public class MarkerAPIImpl implements MarkerAPI, Event.Listener<DynmapWorld> {
core.events.addListener("worldactivated", api); core.events.addListener("worldactivated", api);
api.scheduleWriteJob(); /* Start write job */ api.scheduleWriteJob(); /* Start write job */
}
}, 0);
return api; return api;
} }

2
bukkit-helper/.settings/org.eclipse.buildship.core.prefs
View File

@ -2,7 +2,7 @@ arguments=
auto.sync=false auto.sync=false
build.scans.enabled=false build.scans.enabled=false
connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(6.3)) connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(6.3))
connection.project.dir= connection.project.dir=..
eclipse.preferences.version=1 eclipse.preferences.version=1
gradle.user.home= gradle.user.home=
java.home=/Library/Java/JavaVirtualMachines/jdk1.8.0_251.jdk/Contents/Home java.home=/Library/Java/JavaVirtualMachines/jdk1.8.0_251.jdk/Contents/Home