Now with Atomicity

This commit is contained in:
2018-05-23 20:35:16 +02:00
parent 9f7f9598db
commit 1384971d4e
5 changed files with 12 additions and 17 deletions

View File

@@ -1,7 +1,6 @@
extern crate rustijvm;
use std::rc::Rc;
use std::sync::Mutex;
use std::sync::{Arc, Mutex};
use std::io::{Cursor, Seek, SeekFrom, Read};
fn steps(machine: &mut rustijvm::Machine, num: usize) {
@@ -12,7 +11,7 @@ fn steps(machine: &mut rustijvm::Machine, num: usize) {
#[test]
fn advanced1() {
let output: Rc<Mutex<Cursor<Vec<u8>>>> = Rc::new(Mutex::new(Cursor::new(Vec::new())));
let output: Arc<Mutex<Cursor<Vec<u8>>>> = Arc::new(Mutex::new(Cursor::new(Vec::new())));
let input = Box::new("A".as_bytes());
let mut machine = rustijvm::Machine::new_from_file("files/task5/all_regular.ijvm").unwrap();
machine.set_input(input);

View File

@@ -1,12 +1,11 @@
extern crate rustijvm;
use std::rc::Rc;
use std::sync::Mutex;
use std::sync::{Arc, Mutex};
use std::io::{Cursor, Seek, SeekFrom, Read};
#[test]
fn advanced4_tanenbaum() {
let rc = Rc::new(Mutex::new(Cursor::new(Vec::new())));
let rc = Arc::new(Mutex::new(Cursor::new(Vec::new())));
let mut machine = rustijvm::Machine::new_from_file("files/advanced/Tanenbaum.ijvm").unwrap();
machine.set_output(rc.clone());
machine.run().unwrap();

View File

@@ -1,13 +1,12 @@
extern crate rustijvm;
use std::fs::File;
use std::rc::Rc;
use std::sync::Mutex;
use std::sync::{Arc, Mutex};
use std::io::{Cursor, Seek, SeekFrom, Read};
fn run_bfi(file: &str) -> String {
let file = File::open(file).expect("Missing bf file");
let rc = Rc::new(Mutex::new(Cursor::new(Vec::new())));
let rc = Arc::new(Mutex::new(Cursor::new(Vec::new())));
let mut machine = rustijvm::Machine::new_from_file("files/bonus/bfi.ijvm").unwrap();
machine.set_output(rc.clone());
machine.set_input(Box::new(file));

View File

@@ -1,8 +1,7 @@
extern crate rustijvm;
use std::io::{Cursor, Read, Seek, SeekFrom};
use std::rc::Rc;
use std::sync::Mutex;
use std::sync::{Arc, Mutex};
fn steps(machine: &mut rustijvm::Machine, num: usize) {
for _ in 0..num {
@@ -84,7 +83,7 @@ fn task4_complex_load() {
#[test]
fn task4_iteration_load() {
let rc = Rc::new(Mutex::new(Cursor::new(Vec::new())));
let rc = Arc::new(Mutex::new(Cursor::new(Vec::new())));
let mut machine = rustijvm::Machine::new_from_file("files/task4/LoadTest4.ijvm").unwrap();
machine.set_output(rc.clone());