Attention is currently required from: neels.
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/27037 )
Change subject: net: run.sh: fix infinite "q Enter to close" msgs
......................................................................
Patch Set 2:
(1 comment)
Patchset:
PS1:
> I've never seen this. […]
https://media.ccc.de/v/osmodevcall-20211210-osmith-osmo-dev-ttcn3#t=801
After further analyzing I figured that stdin is not connected at this point - found a proper fix and updated the patch.
--
To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27037
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: Iebb799493f76fd57f24b15c998ded2bd8e284e6b
Gerrit-Change-Number: 27037
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-CC: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Comment-Date: Mon, 21 Feb 2022 10:38:14 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: neels.
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/27035 )
Change subject: net: run.sh: write launcher command to shell script
......................................................................
Patch Set 2:
(1 comment)
File net/templates/run.sh:
https://gerrit.osmocom.org/c/osmo-dev/+/27035/comment/7609b7a5_38dd9d69
PS1, Line 43: wrapperdir="wrappers"
> i'd prefer a single 'run' dir and keep both the launcher scripts as well as pids in it. […]
Done
--
To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27035
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: I15760d706b20628421c10a16514120f442d5477f
Gerrit-Change-Number: 27035
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Comment-Date: Mon, 21 Feb 2022 10:37:58 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: neels.
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/27033 )
Change subject: net: require terminal to be configured
......................................................................
Patch Set 1:
(1 comment)
Patchset:
PS1:
> how about we keep only the 'TERMINAL=myterm' config and drop all of the confusing autmatic choices? […]
Done
--
To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27033
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: I0afb6b0242c399334a2c37f18a5d26d5beeabedc
Gerrit-Change-Number: 27033
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Comment-Date: Mon, 21 Feb 2022 10:37:46 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de>
Gerrit-MessageType: comment
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/27267 )
Change subject: net/templates/run.sh: put log name in trace.pcap
......................................................................
net/templates/run.sh: put log name in trace.pcap
It's hard to distinguish multiple wireshark windows with trace.pcap
files, as only the file name and not the path is shown in the title.
Make it easier to distinguish them by adding the log name to the file
name.
Change-Id: I7007d7c1e74aef46f1942f4f6f675adebb890955
---
M net/templates/run.sh
1 file changed, 3 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/67/27267/1
diff --git a/net/templates/run.sh b/net/templates/run.sh
index 64419a6..0a8cfb1 100755
--- a/net/templates/run.sh
+++ b/net/templates/run.sh
@@ -298,11 +298,13 @@
newlogdir="log/$log_name"
#scp "bts:/tmp/{bts,pcu}.log" "bts:neels/osmo-{bts,pcu}.cfg" "$logdir"
else
- newlogdir="autolog/log_$(date +%Y-%m-%d_%H-%M-%S)"
+ log_name="log_$(date +%Y-%m-%d_%H-%M-%S)"
+ newlogdir="autolog/$log_name"
fi
mkdir -p "$(dirname "$newlogdir")"
mergecap -w "$logdir/trace.pcap" "$logdir/"*.single.pcap && rm -f "$logdir/"*.single.pcap
+mv "$logdir/trace.pcap" "$logdir/trace-$log_name.pcap"
if [ -x "$newlogdir" ]; then
echo "already exists, move it manually: $newlogdir"
--
To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27267
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: I7007d7c1e74aef46f1942f4f6f675adebb890955
Gerrit-Change-Number: 27267
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newchange
Attention is currently required from: osmith.
Hello neels,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-dev/+/27033
to look at the new patch set (#2).
Change subject: net: require terminal to be configured
......................................................................
net: require terminal to be configured
Prepare to add "tmux" as new terminal. As discussed in code review, we
decided to drop support for auto-detection.
Change-Id: I0afb6b0242c399334a2c37f18a5d26d5beeabedc
---
M net/config_2g3g
M net/templates/run.sh
2 files changed, 24 insertions(+), 7 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/33/27033/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27033
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: I0afb6b0242c399334a2c37f18a5d26d5beeabedc
Gerrit-Change-Number: 27033
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newpatchset
Attention is currently required from: osmith.
Hello neels,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-dev/+/27034
to look at the new patch set (#2).
Change subject: net: run.sh: store all spawned pids in files
......................................................................
net: run.sh: store all spawned pids in files
Replace the previous approach of only storing the PIDs of the spawned
terminals, and then attempting to kill all other processes (the ones
running inside the spawned terminals and tcpdump) with "killall".
Instead, store PIDs of all spawned programs:
* Terminals
* Osmocom programs (new)
* Tcpdump (new)
Kill old processes at the start of run.sh as well, so even if run.sh was
killed before it could clean up, the Osmocom programs don't fail to
start anymore (as it was the case before).
Change-Id: I379ef71de2f1ab0ac4a28064e5cf9e275c4c61e9
---
M net/templates/run.sh
1 file changed, 79 insertions(+), 57 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/34/27034/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27034
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: I379ef71de2f1ab0ac4a28064e5cf9e275c4c61e9
Gerrit-Change-Number: 27034
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newpatchset
Attention is currently required from: osmith, neels.
Hello neels,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-dev/+/27036
to look at the new patch set (#2).
Change subject: net: run.sh: support tmux as terminal
......................................................................
net: run.sh: support tmux as terminal
Create one tmux session, with each Osmocom program in one window, if
tmux is chosen as "terminal". This allows using osmo-dev's run.sh over
ssh without X forwarding. Also the existing supported terminals
automatically scroll to the bottom as soon as there is new output,
making it hard to read logs.
Change-Id: Iaef08fb3cb3c6f58cd8490a631e177a03af9c974
---
M net/config_2g3g
M net/templates/run.sh
2 files changed, 22 insertions(+), 7 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/36/27036/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27036
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: Iaef08fb3cb3c6f58cd8490a631e177a03af9c974
Gerrit-Change-Number: 27036
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-MessageType: newpatchset
Attention is currently required from: osmith.
osmith has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-dev/+/27037 )
Change subject: net: run.sh: fix infinite "q Enter to close" msgs
......................................................................
net: run.sh: fix infinite "q Enter to close" msgs
Fix the logic that is supposed to display a "q Enter to close" message
once and wait for user input, in case one of the Osmocom programs
crashed.
Explicitly read from /dev/tty, as it may not be connected as default
stdin anymore at this point. This happens when using the new code paths
with tmux as terminal, but also happened before recent refactorings for
me with all terminals.
Related: https://media.ccc.de/v/osmodevcall-20211210-osmith-osmo-dev-ttcn3#t=801
Change-Id: Iebb799493f76fd57f24b15c998ded2bd8e284e6b
---
M net/templates/run.sh
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/37/27037/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27037
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: Iebb799493f76fd57f24b15c998ded2bd8e284e6b
Gerrit-Change-Number: 27037
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-CC: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newpatchset
Attention is currently required from: osmith.
Hello neels,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-dev/+/27035
to look at the new patch set (#2).
Change subject: net: run.sh: write launcher command to shell script
......................................................................
net: run.sh: write launcher command to shell script
Instead of passing a whole script to the terminal via command-line
argument, write it to a file. This is in preparation to use the same
script with tmux, see next patch.
Change-Id: I15760d706b20628421c10a16514120f442d5477f
---
M net/templates/run.sh
1 file changed, 27 insertions(+), 13 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/35/27035/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27035
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: I15760d706b20628421c10a16514120f442d5477f
Gerrit-Change-Number: 27035
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newpatchset