Merge pull request #1449 from tronprotocol/fix_timeout_bug

Fix timeout bug

Author: huzhenyuan

src/main/java/org/tron/common/runtime/Runtime.java

@@ -34,6 +34,7 @@
 import org.tron.common.runtime.vm.program.InternalTransaction.ExecutorType;
 import org.tron.common.runtime.vm.program.Program;
 import org.tron.common.runtime.vm.program.Program.JVMStackOverFlowException;
+import org.tron.common.runtime.vm.program.Program.OutOfResourceException;
 import org.tron.common.runtime.vm.program.ProgramPrecompile;
 import org.tron.common.runtime.vm.program.ProgramResult;
 import org.tron.common.runtime.vm.program.invoke.ProgramInvoke;
@@ -500,10 +501,12 @@ public void go() {
           long saveCodeEnergy = getLength(code) * EnergyCost.getInstance().getCREATE_DATA();
           long afterSpend = program.getEnergyLimitLeft().longValue() - saveCodeEnergy;
           if (afterSpend < 0) {
-            result.setException(
-                Program.Exception
-                    .notEnoughSpendEnergy("No energy to save just created contract code",
-                        saveCodeEnergy, program.getEnergyLimitLeft().longValue()));
+            if (null == result.getException()) {
+              result.setException(
+                  Program.Exception
+                      .notEnoughSpendEnergy("save just created contract code",
+                          saveCodeEnergy, program.getEnergyLimitLeft().longValue()));
+            }
           } else {
             result.spendEnergy(saveCodeEnergy);
             // have saveCode in create()
@@ -529,6 +532,12 @@ public void go() {
         deposit.commit();
       }
     } catch (JVMStackOverFlowException e) {
+      program.spendAllEnergy();
+      result.setException(e);
+      runtimeError = result.getException().getMessage();
+      logger.error("runtime error is :{}", result.getException().getMessage());
+    } catch (OutOfResourceException e) {
+      program.spendAllEnergy();
       result.setException(e);
       runtimeError = result.getException().getMessage();
       logger.error("runtime error is :{}", result.getException().getMessage());

src/main/java/org/tron/common/runtime/vm/VM.java

@@ -18,6 +18,7 @@
 import org.tron.common.runtime.vm.program.Program;
 import org.tron.common.runtime.vm.program.Program.JVMStackOverFlowException;
 import org.tron.common.runtime.vm.program.Program.OutOfEnergyException;
+import org.tron.common.runtime.vm.program.Program.OutOfResourceException;
 import org.tron.common.runtime.vm.program.Stack;
 
 @Slf4j(topic = "VM")
@@ -1332,7 +1333,9 @@ public void play(Program program) {
       }
 
     } catch (JVMStackOverFlowException e) {
-      throw new JVMStackOverFlowException();
+      throw e;
+    } catch (OutOfResourceException e) {
+      throw e;
     } catch (RuntimeException e) {
       if (StringUtils.isEmpty(e.getMessage())) {
         program.setRuntimeFailure(new RuntimeException("Unknown Exception"));

src/main/java/org/tron/common/runtime/vm/program/Program.java

@@ -790,6 +790,10 @@ public void checkCPUTimeLimit(String opName) {
     }
     long vmNowInUs = System.nanoTime() / 1000;
     if (vmNowInUs > getVmShouldEndInUs()) {
+      logger.error("minTimeRatio: {}", Args.getInstance().getMinTimeRatio());
+      logger.error("maxTimeRatio: {}", Args.getInstance().getMaxTimeRatio());
+      logger.error("vm should end time in us: {}", getVmShouldEndInUs());
+      logger.error("vm start time in us: {}", getVmStartInUs());
       throw Exception.notEnoughTime(opName);
     }