Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removed logs, corrected spelling mistake and changed docker run cmd format #25

Merged
merged 3 commits into from
Apr 6, 2024
Merged

Removed logs, corrected spelling mistake and changed docker run cmd format #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eb8f608
Spelling mistake causing one file not to generate pcaps
charliebarber Apr 6, 2024
8af17d9
Changed docker to not require argument, removed most logs/all from NS3
charliebarber Apr 6, 2024
bf596ee
Merge branch 'main' into cmdline
YousefEZ Apr 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ rm -rf traces/
mkdir traces

cp user_src/* scratch/
export NS_LOG=FRRQueue=level_all
# export NS_LOG=FRRQueue=level_all

cp ./run_ns3.sh ./.

Expand All @@ -15,9 +15,9 @@ if [ $? -ne 0 ]; then
exit 1
fi

if [ -z "$1" ]; then
exit 0
fi
# if [ -z "$1" ]; then
# exit 0
# fi

# ./ns3 run 'scratch/combined-frr.cc --delay_bottleneck=1ms'
./run_ns3.sh
Expand Down
8 changes: 4 additions & 4 deletions run_ns3.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ run_experiment() {
mkdir -p "$dir/baseline-udp/"
mkdir -p "$dir/baseline-no-udp/"

./ns3 run "scratch/combined-frr.cc --$test_variable=$test_value --policy_threshold=$policy_threshold --dir=$dir/frr/"
./ns3 run "scratch/combined-frr-no-udp.cc --$test_variable=$test_value --policy_threshold=$policy_threshold --dir=$dir/frr-no-udp/"
./ns3 run "scratch/combined-baseline-udp.cc --$test_vaiable=$test_value --policy_threshold=$policy_threshold --dir=$dir/baseline-udp/"
./ns3 run "scratch/combined-baseline-no-udp.cc --$test_variable=$test_value --policy_threshold=$policy_threshold --dir=$dir/baseline-no-udp/"
NS_LOG="" ./ns3 run "scratch/combined-frr.cc --$test_variable=$test_value --policy_threshold=$policy_threshold --dir=$dir/frr/"
NS_LOG="" ./ns3 run "scratch/combined-frr-no-udp.cc --$test_variable=$test_value --policy_threshold=$policy_threshold --dir=$dir/frr-no-udp/"
NS_LOG="" ./ns3 run "scratch/combined-baseline-udp.cc --$test_variable=$test_value --policy_threshold=$policy_threshold --dir=$dir/baseline-udp/"
NS_LOG="" ./ns3 run "scratch/combined-baseline-no-udp.cc --$test_variable=$test_value --policy_threshold=$policy_threshold --dir=$dir/baseline-no-udp/"
}

# Delay primary experiments
Expand Down
5 changes: 2 additions & 3 deletions src/combined-baseline-no-udp.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,11 +144,10 @@ int main(int argc, char* argv[])
cmd.AddValue("dir", "Traces directory", dir);
cmd.Parse(argc, argv);

std::cout << "Congestion policy threshold: " << cong_threshold << std::endl;
BasicCongestionPolicy::usage_percentage = cong_threshold;

// LogComponentEnable("FRRQueue", LOG_LEVEL_ERROR);
// LogComponentEnableAll(LOG_LEVEL_ERROR);
// LogComponentEnable("FRRQueue", LOG_LEVEL_LOGIC);
LogComponentEnableAll(LOG_LEVEL_ERROR);
/*
* +----------+ +-----------+
* |Congestion| | Traffic |
Expand Down
6 changes: 2 additions & 4 deletions src/combined-baseline-udp.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,12 +143,10 @@ int main(int argc, char* argv[])
cmd.AddValue("dir", "Traces directory", dir);
cmd.Parse(argc, argv);

std::cout << "Congestion policy threshold: " << cong_threshold << std::endl;
BasicCongestionPolicy::usage_percentage = cong_threshold;

// LogComponentEnable("FRRQueue", LOG_LEVEL_ERROR);
// LogComponentEnableAll(LOG_LEVEL_ERROR);

// LogComponentEnable("FRRQueue", LOG_LEVEL_LOGIC);
LogComponentEnableAll(LOG_LEVEL_ERROR);
/*
* +----------+ +-----------+
* |Congestion| | Traffic |
Expand Down
4 changes: 2 additions & 2 deletions src/combined-frr-no-udp.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,10 @@ int main(int argc, char* argv[])
cmd.AddValue("dir", "Traces directory", dir);
cmd.Parse(argc, argv);

std::cout << "Congestion policy threshold: " << cong_threshold << std::endl;
BasicCongestionPolicy::usage_percentage = cong_threshold;

LogComponentEnable("FRRQueue", LOG_LEVEL_LOGIC);
// LogComponentEnable("FRRQueue", LOG_LEVEL_LOGIC);
LogComponentEnableAll(LOG_LEVEL_ERROR);
/*
* +----------+ +-----------+
* |Congestion| | Traffic |
Expand Down
3 changes: 1 addition & 2 deletions src/combined-frr.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,11 +118,10 @@ int main(int argc, char* argv[])
cmd.AddValue("dir", "Traces directory", dir);
cmd.Parse(argc, argv);

std::cout << "Congestion policy threshold: " << cong_threshold << std::endl;
BasicCongestionPolicy::usage_percentage = cong_threshold;

// LogComponentEnable("FRRQueue", LOG_LEVEL_ERROR);
// LogComponentEnableAll(LOG_LEVEL_ERROR);
LogComponentEnableAll(LOG_LEVEL_ERROR);
/*
* +----------+ +-----------+
* |Congestion| | Traffic |
Expand Down
Loading