Simupedia tuning

[simantics/platform.git] / bundles / org.simantics.document.server / src / org / simantics / document / server / request / NodeRequest.java

diff --git a/bundles/org.simantics.document.server/src/org/simantics/document/server/request/NodeRequest.java b/bundles/org.simantics.document.server/src/org/simantics/document/server/request/NodeRequest.java
index 8d96c4798cb59e0947bda57879f9019915afae39..82b190544ef43e7da9bd8ebb12dd0f79f6128d38 100644 (file)
--- a/bundles/org.simantics.document.server/src/org/simantics/document/server/request/NodeRequest.java
+++ b/bundles/org.simantics.document.server/src/org/simantics/document/server/request/NodeRequest.java
@@ -5,6 +5,8 @@ import org.simantics.db.exception.DatabaseException;
 import org.simantics.db.layer0.request.VariableRead;
 import org.simantics.db.layer0.variable.Variable;
 import org.simantics.document.server.DocumentServerUtils.AttributesRequest;
+import org.simantics.utils.threads.logger.ITask;
+import org.simantics.utils.threads.logger.ThreadLogger;
 import org.simantics.document.server.JSONObject;
 
 public class NodeRequest extends VariableRead<JSONObject> {
@@ -18,17 +20,13 @@ public class NodeRequest extends VariableRead<JSONObject> {
 
     @Override
     public JSONObject perform(ReadGraph graph) throws DatabaseException {
-        long s = DocumentRequest.PROFILE ? System.nanoTime() : 0L;
 
-        JSONObject staticContent = graph.syncRequest(new AttributesRequest(variable));
+        ITask task = DocumentRequest.PROFILE ? ThreadLogger.task(this) : null;
 
-        if (DocumentRequest.PROFILE) {
-            long dura = System.nanoTime()-s;
-            if (dura > DocumentRequest.PROFILE_THRESHOLD_NODEREQUEST * 1e3) {
-                System.err.println("NodeRequest " + System.identityHashCode(this) + " in " + 1e-6*dura + "ms. " + variable.getURI(graph));
-            }
-        }
+        JSONObject staticContent = graph.syncRequest(new AttributesRequest(variable));
 
+        if(DocumentRequest.PROFILE) task.finish();
+        
         return staticContent;
     }