Merge branch 'develop' into exec/dep-upgrade

Author: zhangsoledad

script/src/lib.rs

@@ -4,7 +4,7 @@ mod error;
 mod scheduler;
 mod syscalls;
 mod type_id;
-mod types;
+pub mod types;
 mod verify;
 mod verify_env;
 

script/src/scheduler.rs

@@ -1,13 +1,13 @@
 use crate::cost_model::transferred_byte_cycles;
 use crate::syscalls::{
     EXEC_LOAD_ELF_V2_CYCLES_BASE, INVALID_FD, MAX_FDS_CREATED, MAX_VMS_SPAWNED, OTHER_END_CLOSED,
-    SPAWN_EXTRA_CYCLES_BASE, SUCCESS, WAIT_FAILURE, generator::generate_ckb_syscalls,
+    SPAWN_EXTRA_CYCLES_BASE, SUCCESS, WAIT_FAILURE,
 };
 
 use crate::types::{
-    CoreMachineType, DataLocation, DataPieceId, DebugContext, FIRST_FD_SLOT, FIRST_VM_ID, Fd,
-    FdArgs, FullSuspendedState, Machine, Message, ReadState, RunMode, SgData, VmArgs, VmContext,
-    VmId, VmState, WriteState,
+    CoreMachineType, DataLocation, DataPieceId, FIRST_FD_SLOT, FIRST_VM_ID, Fd, FdArgs,
+    FullSuspendedState, Machine, Message, ReadState, RunMode, SgData, SyscallGenerator, VmArgs,
+    VmContext, VmId, VmState, WriteState,
 };
 use ckb_traits::{CellDataProvider, ExtensionProvider, HeaderProvider};
 use ckb_types::core::Cycle;
@@ -43,15 +43,17 @@ pub const MAX_FDS: u64 = 64;
 /// A scheduler holds & manipulates a core, the scheduler also holds
 /// all CKB-VM machines, each CKB-VM machine also gets a mutable reference
 /// of the core for IO operations.
-pub struct Scheduler<DL>
+pub struct Scheduler<DL, V>
 where
     DL: CellDataProvider,
 {
     /// Immutable context data for current running transaction & script.
     pub sg_data: SgData<DL>,
 
-    /// Mutable context data used by current scheduler
-    pub debug_context: DebugContext,
+    /// Syscall generator
+    pub syscall_generator: SyscallGenerator<DL, V>,
+    /// Syscall generator context
+    pub syscall_context: V,
 
     /// Total cycles. When a scheduler executes, there are 3 variables
     /// that might all contain charged cycles: +total_cycles+,
@@ -106,15 +108,21 @@ where
     pub message_box: Arc<Mutex<Vec<Message>>>,
 }
 
-impl<DL> Scheduler<DL>
+impl<DL, V> Scheduler<DL, V>
 where
     DL: CellDataProvider + HeaderProvider + ExtensionProvider + Send + Sync + Clone + 'static,
+    V: Send + Clone,
 {
     /// Create a new scheduler from empty state
-    pub fn new(sg_data: SgData<DL>, debug_context: DebugContext) -> Self {
+    pub fn new(
+        sg_data: SgData<DL>,
+        syscall_generator: SyscallGenerator<DL, V>,
+        syscall_context: V,
+    ) -> Self {
         Self {
             sg_data,
-            debug_context,
+            syscall_generator,
+            syscall_context,
             total_cycles: Arc::new(AtomicU64::new(0)),
             iteration_cycles: 0,
             next_vm_id: FIRST_VM_ID,
@@ -149,12 +157,14 @@ where
     /// Resume a previously suspended scheduler state
     pub fn resume(
         sg_data: SgData<DL>,
-        debug_context: DebugContext,
+        syscall_generator: SyscallGenerator<DL, V>,
+        syscall_context: V,
         full: FullSuspendedState,
     ) -> Self {
         let mut scheduler = Self {
             sg_data,
-            debug_context,
+            syscall_generator,
+            syscall_context,
             total_cycles: Arc::new(AtomicU64::new(full.total_cycles)),
             iteration_cycles: 0,
             next_vm_id: full.next_vm_id,
@@ -898,7 +908,7 @@ where
         let machine_builder = DefaultMachineBuilder::new(core_machine)
             .instruction_cycle_func(Box::new(estimate_cycles));
         let machine_builder =
-            generate_ckb_syscalls(id, &self.sg_data, &vm_context, &self.debug_context)
+            (self.syscall_generator)(id, &self.sg_data, &vm_context, &self.syscall_context)
                 .into_iter()
                 .fold(machine_builder, |builder, syscall| builder.syscall(syscall));
         let default_machine = machine_builder.build();

script/src/syscalls/debugger.rs

@@ -1,5 +1,5 @@
 use crate::types::{
-    DebugContext, DebugPrinter, {SgData, SgInfo},
+    DebugPrinter, {SgData, SgInfo},
 };
 use crate::{cost_model::transferred_byte_cycles, syscalls::DEBUG_PRINT_SYSCALL_NUMBER};
 use ckb_vm::{
@@ -14,10 +14,10 @@ pub struct Debugger {
 }
 
 impl Debugger {
-    pub fn new<DL>(sg_data: &SgData<DL>, debug_context: &DebugContext) -> Debugger {
+    pub fn new<DL>(sg_data: &SgData<DL>, debug_printer: &DebugPrinter) -> Debugger {
         Debugger {
             sg_info: Arc::clone(&sg_data.sg_info),
-            printer: Arc::clone(&debug_context.debug_printer),
+            printer: Arc::clone(debug_printer),
         }
     }
 }

script/src/syscalls/generator.rs

@@ -4,7 +4,7 @@ use crate::{
         LoadCellData, LoadHeader, LoadInput, LoadScript, LoadScriptHash, LoadTx, LoadWitness, Pipe,
         ProcessID, Read, Spawn, VMVersion, Wait, Write,
     },
-    types::{CoreMachine, DebugContext, ScriptVersion, SgData, VmContext, VmId},
+    types::{CoreMachine, DebugPrinter, ScriptVersion, SgData, VmContext, VmId},
 };
 use ckb_traits::{CellDataProvider, ExtensionProvider, HeaderProvider};
 use ckb_vm::Syscalls;
@@ -14,7 +14,7 @@ pub fn generate_ckb_syscalls<DL>(
     vm_id: &VmId,
     sg_data: &SgData<DL>,
     vm_context: &VmContext<DL>,
-    debug_context: &DebugContext,
+    debug_printer: &DebugPrinter,
 ) -> Vec<Box<(dyn Syscalls<CoreMachine>)>>
 where
     DL: CellDataProvider + HeaderProvider + ExtensionProvider + Send + Sync + Clone + 'static,
@@ -28,7 +28,7 @@ where
         Box::new(LoadWitness::new(sg_data)),
         Box::new(LoadScript::new(sg_data)),
         Box::new(LoadCellData::new(vm_context)),
-        Box::new(Debugger::new(sg_data, debug_context)),
+        Box::new(Debugger::new(sg_data, debug_printer)),
     ];
     let script_version = &sg_data.sg_info.script_version;
     if script_version >= &ScriptVersion::V1 {
@@ -54,9 +54,5 @@ where
             Box::new(Close::new(vm_id, vm_context)),
         ]);
     }
-    #[cfg(test)]
-    syscalls.push(Box::new(crate::syscalls::Pause::new(
-        std::sync::Arc::clone(&debug_context.skip_pause),
-    )));
     syscalls
 }