Skip to content

Commit 81a484a

Browse files
shubham-1806bhoopesh369
shubham-1806
authored and
bhoopesh369
committed
update: runners for java and python
1 parent 5298db3 commit 81a484a

File tree

9 files changed

+72
-122
lines changed

9 files changed

+72
-122
lines changed

‎.cargo/config.example.toml

+10-10
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ JAVA_COMPILER_IMAGE="ghcr.io/delta/codecharacter-java-compiler:latest"
66
JAVA_RUNNER_IMAGE="ghcr.io/delta/codecharacter-java-runner:latest"
77
PYTHON_RUNNER_IMAGE="ghcr.io/delta/codecharacter-python-runner:latest"
88

9-
MAX_LOG_SIZE=200000
10-
COMPILATION_TIME_LIMIT=5
11-
RUNTIME_TIME_LIMIT=10
12-
COMPILATION_MEMORY_LIMIT=300m
13-
RUNTIME_MEMORY_LIMIT=100m
14-
EPOLL_WAIT_TIMEOUT=30_000
9+
MAX_LOG_SIZE="200000"
10+
COMPILATION_TIME_LIMIT="5"
11+
RUNTIME_TIME_LIMIT="10"
12+
COMPILATION_MEMORY_LIMIT="300m"
13+
RUNTIME_MEMORY_LIMIT="100m"
14+
EPOLL_WAIT_TIMEOUT="30_000"
1515
MAP_SIZE="64"
1616

17-
RABBIT_MQ_HOST=amqp://guest:guest@localhost
18-
NORMAL_GAME_REQUEST_QUEUE=gameRequestQueue
19-
PVP_GAME_REQUEST_QUEUE=gamePvpRequestQueue
20-
GAME_RESPONSE_QUEUE=gameStatusUpdateQueue
17+
RABBIT_MQ_HOST="amqp://guest:guest@localhost"
18+
NORMAL_GAME_REQUEST_QUEUE="gameRequestQueue"
19+
PVP_GAME_REQUEST_QUEUE="gamePvpRequestQueue"
20+
GAME_RESPONSE_QUEUE="gameStatusUpdateQueue"

‎run

-2.41 MB
Binary file not shown.

‎src/handlers.rs

+1
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ impl Handler for NormalGameRequest {
131131

132132
let game_dir_handle = game_dir_handle.unwrap();
133133
let player_dir = "player".to_string();
134+
game_dir_handle.create_sub_dir(&player_dir);
134135

135136
if let Some(resp) = copy_files(
136137
&self.game_id,

‎src/run

-2.41 MB
Binary file not shown.

‎src/runner/cpp.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ impl Runner {
2626
}
2727

2828
impl Runnable for Runner {
29-
fn run(&self, stdin: File, stdout: File, _game_type: GameType) -> Result<Child, SimulatorError> {
29+
fn run(&self, stdin: File, stdout: File, game_type: GameType) -> Result<Child, SimulatorError> {
3030
let compile = Command::new("docker")
3131
.args([
3232
"run",
@@ -92,6 +92,7 @@ impl Runnable for Runner {
9292
"-v",
9393
format!("{}/{}/run:/player_code", self.current_dir, self.player_dir).as_str(),
9494
&env::var("CPP_RUNNER_IMAGE").unwrap(),
95+
&game_type.to_string()
9596
])
9697
.current_dir(&self.current_dir)
9798
.create_pidfd(true)

‎src/runner/java.rs

+34-26
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use std::{
22
fs::File,
33
os::linux::process::CommandExt,
4-
process::{Child, Command, Stdio},
4+
process::{Child, Command, Stdio}, env,
55
};
66

77
use crate::error::SimulatorError;
@@ -11,15 +11,15 @@ use super::{GameType, Runnable};
1111
pub struct Runner {
1212
current_dir: String,
1313
game_id: String,
14-
file_name: String,
14+
player_dir: String,
1515
}
1616

1717
impl Runner {
18-
pub fn new(current_dir: String, game_id: String, file_name: String) -> Self {
18+
pub fn new(current_dir: String, game_id: String, player_dir: String) -> Self {
1919
Runner {
2020
current_dir,
2121
game_id,
22-
file_name,
22+
player_dir,
2323
}
2424
}
2525
}
@@ -29,30 +29,29 @@ impl Runnable for Runner {
2929
let compile = Command::new("docker")
3030
.args([
3131
"run",
32-
&format!("--memory={}", "300m"),
33-
&format!("--memory-swap={}", "300m"),
32+
&format!("--memory={}", env::var("COMPILATION_MEMORY_LIMIT").unwrap()),
33+
&format!(
34+
"--memory-swap={}",
35+
env::var("COMPILATION_MEMORY_LIMIT").unwrap()
36+
),
3437
"--cpus=1.5",
3538
"--ulimit",
36-
&format!("cpu={}:{}", "5", "5"),
39+
&format!(
40+
"cpu={}:{}",
41+
env::var("COMPILATION_TIME_LIMIT").unwrap(),
42+
env::var("COMPILATION_TIME_LIMIT").unwrap()
43+
),
3744
"--rm",
3845
"--name",
39-
&format!("{}_java_compiler", self.game_id),
46+
&format!("{}_{}_java_compiler", self.game_id, self.player_dir.replace("/", "_")),
4047
"-v",
4148
format!(
42-
"{}/{}.java:/player_code/Run.java",
49+
"{}/{}:/player_code",
4350
self.current_dir.as_str(),
44-
self.file_name.as_str(),
51+
self.player_dir.as_str()
4552
)
4653
.as_str(),
47-
"-v",
48-
format!(
49-
"{}/{}.jar:/player_code/run.jar",
50-
self.current_dir.as_str(),
51-
self.file_name.as_str()
52-
)
53-
.as_str(),
54-
"ghcr.io/delta/codecharacter-java-compiler:latest",
55-
&game_type.to_string(),
54+
&env::var("JAVA_COMPILER_IMAGE").unwrap(),
5655
])
5756
.current_dir(&self.current_dir)
5857
.stdout(Stdio::null())
@@ -78,23 +77,32 @@ impl Runnable for Runner {
7877
Command::new("docker")
7978
.args([
8079
"run",
81-
&format!("--memory={}", "100m"),
82-
&format!("--memory-swap={}", "100m"),
80+
&format!("--memory={}", env::var("RUNTIME_MEMORY_LIMIT").unwrap()),
81+
&format!(
82+
"--memory-swap={}",
83+
env::var("RUNTIME_MEMORY_LIMIT").unwrap()
84+
),
8385
"--cpus=1",
8486
"--ulimit",
85-
&format!("cpu={}:{}", "10", "10"),
87+
&format!(
88+
"cpu={}:{}",
89+
env::var("RUNTIME_TIME_LIMIT").unwrap(),
90+
env::var("RUNTIME_TIME_LIMIT").unwrap()
91+
),
8692
"--rm",
8793
"--name",
88-
&format!("{}_java_runner", self.game_id),
94+
&format!("{}_{}_java_runner", self.game_id, self.player_dir.replace("/", "_")),
8995
"-i",
9096
"-v",
9197
format!(
92-
"{}/{}.jar:/run.jar",
98+
"{}/{}/run.jar:/run.jar",
9399
self.current_dir.as_str(),
94-
self.file_name.as_str()
100+
self.player_dir.as_str(),
95101
)
96102
.as_str(),
97-
"ghcr.io/delta/codecharacter-java-runner:latest",
103+
&env::var("JAVA_RUNNER_IMAGE").unwrap(),
104+
"run.jar", //jar file name
105+
&game_type.to_string()
98106
])
99107
.create_pidfd(true)
100108
.current_dir(&self.current_dir)

‎src/runner/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ impl GameType {
1616
pub fn file_name(&self, language: Language) -> &str {
1717
match self {
1818
GameType::PvPGame => match language {
19-
Language::CPP | Language::PYTHON => "run",
20-
Language::JAVA => "RunPvp",
19+
Language::CPP | Language::PYTHON => "runpvp",
20+
Language::JAVA => "RunPvP",
2121
},
2222
GameType::NormalGame => match language {
2323
Language::CPP | Language::PYTHON => "run",

‎src/runner/py.rs

+23-13
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use std::{
22
fs::File,
33
os::linux::process::CommandExt,
4-
process::{Command, Stdio},
4+
process::{Command, Stdio}, env,
55
};
66

77
use crate::error::SimulatorError;
@@ -11,20 +11,21 @@ use super::{GameType, Runnable};
1111
pub struct Runner {
1212
current_dir: String,
1313
game_id: String,
14-
file_name: String,
14+
player_dir: String,
1515
}
1616

1717
impl Runner {
18-
pub fn new(current_dir: String, game_id: String, file_name: String) -> Self {
18+
pub fn new(current_dir: String, game_id: String, player_dir: String) -> Self {
1919
Runner {
2020
current_dir,
2121
game_id,
22-
file_name,
22+
player_dir,
2323
}
2424
}
2525
}
2626

2727
impl Runnable for Runner {
28+
2829
fn run(
2930
&self,
3031
stdin: File,
@@ -34,24 +35,33 @@ impl Runnable for Runner {
3435
Command::new("docker")
3536
.args([
3637
"run",
37-
&format!("--memory={}", "100m"),
38-
&format!("--memory-swap={}", "100m"),
38+
&format!("--memory={}", env::var("RUNTIME_MEMORY_LIMIT").unwrap()),
39+
&format!(
40+
"--memory-swap={}",
41+
env::var("RUNTIME_MEMORY_LIMIT").unwrap()
42+
),
3943
"--cpus=1",
4044
"--ulimit",
41-
&format!("cpu={}:{}", "10", "10"),
45+
&format!(
46+
"cpu={}:{}",
47+
env::var("RUNTIME_TIME_LIMIT").unwrap(),
48+
env::var("RUNTIME_TIME_LIMIT").unwrap()
49+
),
4250
"--rm",
4351
"--name",
44-
&format!("{}_python_runner", self.game_id),
52+
&format!("{}_{}_python_runner", self.game_id, self.player_dir.replace("/", "_")),
4553
"-i",
4654
"-v",
4755
format!(
48-
"{}/{}.py:/player_code/run.py",
49-
self.current_dir.as_str(),
50-
self.file_name.as_str()
56+
"{}/{}:/player_code",
57+
self.current_dir,
58+
self.player_dir
5159
)
5260
.as_str(),
53-
"ghcr.io/delta/codecharacter-python-runner:latest",
54-
&game_type.to_string(),
61+
&env::var("PYTHON_RUNNER_IMAGE").unwrap(),
62+
"-u",
63+
"main.py", //filename to start execution
64+
&game_type.to_string()
5565
])
5666
.create_pidfd(true)
5767
.current_dir(&self.current_dir)

‎summa.json

-70
This file was deleted.

0 commit comments

Comments
 (0)