Commit 73f4a675 authored by Joanne Hugé's avatar Joanne Hugé

Change software-pps name to software-pulse

parent 07ffe167
...@@ -8,7 +8,7 @@ clockres/build/clockres_arm ...@@ -8,7 +8,7 @@ clockres/build/clockres_arm
packet-exchange/build/server packet-exchange/build/server
packet-exchange/build/client packet-exchange/build/client
gettime/build/gettime gettime/build/gettime
software-pps/build/software-pps software-pulse/build/software-pulse
test-ptp/build/server test-ptp/build/server
test-ptp/build/client test-ptp/build/client
......
...@@ -5,7 +5,7 @@ script_dir=$(dirname $(realpath $0)) ...@@ -5,7 +5,7 @@ script_dir=$(dirname $(realpath $0))
usage() { usage() {
cat << ENDUSAGE cat << ENDUSAGE
Usage: $0 [-h] BOARD1_HOSTNAME BOARD2_HOSTNAME Usage: $0 [-h] BOARD1_HOSTNAME BOARD2_HOSTNAME
Kills all processes started by test-board-synchro (clients, servers, software-pps) Kills all processes started by test-board-synchro (clients, servers, software-pulse)
-h Show help -h Show help
BOARD_HOSTNAME Uses /etc/hosts to find the IP address associated to the hostname BOARD_HOSTNAME Uses /etc/hosts to find the IP address associated to the hostname
ENDUSAGE ENDUSAGE
...@@ -36,5 +36,5 @@ board2=$2 ...@@ -36,5 +36,5 @@ board2=$2
killall client; killall client;
killall run-client; killall run-client;
$script_dir/sudossh $board1 "killall server software-pps"; $script_dir/sudossh $board1 "killall server software-pulse";
$script_dir/sudossh $board2 "killall server software-pps"; $script_dir/sudossh $board2 "killall server software-pulse";
...@@ -30,13 +30,13 @@ while getopts "hi:gt:P:" opt; do ...@@ -30,13 +30,13 @@ while getopts "hi:gt:P:" opt; do
interval=${OPTARG} interval=${OPTARG}
;; ;;
g) g)
pps_opts+=" -g " pulse_opts+=" -g "
;; ;;
t ) t )
ts_offset=${OPTARG} ts_offset=${OPTARG}
;; ;;
P ) P )
pps_opts+=" -P ${OPTARG} " pulse_opts+=" -P ${OPTARG} "
;; ;;
*) *)
usage usage
...@@ -57,10 +57,10 @@ ts=$($script_dir/get-ptp-time -m $ts_offset) ...@@ -57,10 +57,10 @@ ts=$($script_dir/get-ptp-time -m $ts_offset)
echo "Timestamp: $ts"; echo "Timestamp: $ts";
ssh $board1 "cd tsn-measures/software-pps/build;make"; ssh $board1 "cd tsn-measures/software-pulse/build;make";
echo "$script_dir/exec-ssh-nohup $board1 \"tsn-measures/software-pps/build/software-pps -a1 -p97 -i $interval $pps_opts -s $ts\"" server_log; echo "$script_dir/exec-ssh-nohup $board1 \"tsn-measures/software-pulse/build/software-pulse -a1 -p97 -i $interval $pulse_opts -s $ts\"" server_log;
$script_dir/exec-ssh-nohup $board1 "tsn-measures/software-pps/build/software-pps -a1 -p97 -i $interval $pps_opts -s $ts" server_log; $script_dir/exec-ssh-nohup $board1 "tsn-measures/software-pulse/build/software-pulse -a1 -p97 -i $interval $pulse_opts -s $ts" server_log;
ssh $board2 "cd tsn-measures/software-pps/build;make"; ssh $board2 "cd tsn-measures/software-pulse/build;make";
echo "$script_dir/exec-ssh-nohup $board2 \"tsn-measures/software-pps/build/software-pps -a1 -p97 -i $interval $pps_opts -s $ts\"" server_log; echo "$script_dir/exec-ssh-nohup $board2 \"tsn-measures/software-pulse/build/software-pulse -a1 -p97 -i $interval $pulse_opts -s $ts\"" server_log;
$script_dir/exec-ssh-nohup $board2 "tsn-measures/software-pps/build/software-pps -a1 -p97 -i $interval $pps_opts -s $ts" server_log; $script_dir/exec-ssh-nohup $board2 "tsn-measures/software-pulse/build/software-pulse -a1 -p97 -i $interval $pulse_opts -s $ts" server_log;
PROG = software-pps PROG = software-pulse
SRCDIR = ../src SRCDIR = ../src
SRCS = software-pps.c SRCS = software-pulse.c
SRCS += common.c SRCS += common.c
SRCS += pulse.c SRCS += pulse.c
SRCS += gpio.c SRCS += gpio.c
......
...@@ -91,7 +91,7 @@ static void poll_wakeup(struct timespec ts, int margin) { ...@@ -91,7 +91,7 @@ static void poll_wakeup(struct timespec ts, int margin) {
/* /*
* Real-time thread: * Real-time thread:
*/ */
static void *pps_thread(void *p) { static void *pulse_thread(void *p) {
(void)p; (void)p;
struct timespec next; struct timespec next;
int ret; int ret;
...@@ -212,8 +212,8 @@ int main(int argc, char *argv[]) { ...@@ -212,8 +212,8 @@ int main(int argc, char *argv[]) {
} }
// Create the real time thread // Create the real time thread
if (pthread_create(&thread, &attr, pps_thread, NULL)) if (pthread_create(&thread, &attr, pulse_thread, NULL))
error(EXIT_FAILURE, errno, "Couldn't create pps thread"); error(EXIT_FAILURE, errno, "Couldn't create pulse thread");
// Verbose loop // Verbose loop
for (;;) { for (;;) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment