Merge branch 'v2.3.1_qc_perf_c' into 'v2.3.1_qc' (merge request !31)

v2.3.1_qc_perf_c

Merge branch 'v2.3.1_qc_perf_c' into 'v2.3.1_qc' (merge request !31)
v2.3.1_qc_perf_c
5d823605 · tianle · 254b8f9b · e67a5359 · 5d823605 · 5d823605
Commit 5d823605 authored Oct 28, 2022 by tianle
4 changed files
--- a/pb/proto/dockervm_message.proto
+++ b/pb/proto/dockervm_message.proto
@@ -2,7 +2,7 @@ syntax = "proto3";

 package proto;

-option go_package = "chainmaker.org/chainmaker/vm-engine/vm_mgr/pb/protogo";
+option go_package = "chainmaker.org/chainmaker/contract-sdk-go/pb/protogo";

 service DockerVMRpc {
    rpc DockerVMCommunicate(stream DockerVMMessage) returns(stream DockerVMMessage) {};

--- a/pb/protogo/dockervm_message.pb.go
+++ b/pb/protogo/dockervm_message.pb.go
--- a/sandbox/config.go
+++ b/sandbox/config.go
@@ -35,6 +35,7 @@ type Conf struct {
 	LogLevel             string
 	ContractEngineClient *ContractEngineClientConf
 	RuntimeClient        *RuntimeClientConf
+	DisableSlowLog       bool
 }

 type RuntimeClientConf struct {
@@ -93,6 +94,11 @@ func initConfig() error {
 	config.RuntimeClient.RuntimeRPCProtocolType = TCP
 	config.RuntimeClient.RuntimeHost = os.Args[6]
 	config.RuntimeClient.RuntimePort = strconv.Itoa(port)
+	if len(os.Args) > 7 {
+		if config.DisableSlowLog, err = strconv.ParseBool(os.Args[7]); err != nil {
+			return err
+		}
+	}
 	return nil
 }


--- a/sandbox/time_statics.go
+++ b/sandbox/time_statics.go
@@ -153,7 +153,9 @@ func (t *TxDuration) addSysCallDuration(duration *SysCallDuration) {

 // EnterNextStep enter next duration tx step
 func EnterNextStep(msg *protogo.DockerVMMessage, stepType protogo.StepType, log string) {
-
+	if config.DisableSlowLog {
+		return
+	}
 	if stepType != protogo.StepType_RUNTIME_PREPARE_TX_REQUEST {
 		endTxStep(msg)
 	}