Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
emulab
emulab-devel
Commits
689de108
Commit
689de108
authored
Dec 12, 2005
by
Leigh B. Stoller
Browse files
Patch in Kevin's delaythresh changes, which warns users when trying
to use a delay value that is too low.
parent
adabb1b4
Changes
4
Hide whitespace changes
Inline
Side-by-side
configure
View file @
689de108
...
...
@@ -1370,6 +1370,7 @@ done
#
...
...
@@ -1432,6 +1433,7 @@ FRISEBEEMCASTADDR="234.5.6"
FRISEBEEMCASTPORT
=
3564
MIN_UNIX_UID
=
10000
MIN_UNIX_GID
=
6000
DELAYTHRESH
=
2
#
# Okay, I know this is improper usage of --with. Too bad.
...
...
@@ -1933,17 +1935,17 @@ for ac_hdr in ulxmlrpcpp/ulxr_config.h
do
ac_safe
=
`
echo
"
$ac_hdr
"
|
sed
'y%./+-%__p_%'
`
echo
$ac_n
"checking for
$ac_hdr
""...
$ac_c
"
1>&6
echo
"configure:193
7
: checking for
$ac_hdr
"
>
&5
echo
"configure:193
9
: checking for
$ac_hdr
"
>
&5
if
eval
"test
\"
`
echo
'$''{'
ac_cv_header_
$ac_safe
'+set}'
`
\"
= set"
;
then
echo
$ac_n
"(cached)
$ac_c
"
1>&6
else
cat
>
conftest.
$ac_ext
<<
EOF
#line 194
2
"configure"
#line 194
4
"configure"
#include "confdefs.h"
#include <
$ac_hdr
>
EOF
ac_try
=
"
$ac_cpp
conftest.
$ac_ext
>/dev/null 2>conftest.out"
{
(
eval echo
configure:194
7
:
\"
$ac_try
\"
)
1>&5
;
(
eval
$ac_try
)
2>&5
;
}
{
(
eval echo
configure:194
9
:
\"
$ac_try
\"
)
1>&5
;
(
eval
$ac_try
)
2>&5
;
}
ac_err
=
`
grep
-v
'^ *+'
conftest.out |
grep
-v
"^conftest.
${
ac_ext
}
\$
"
`
if
test
-z
"
$ac_err
"
;
then
rm
-rf
conftest
*
...
...
@@ -1982,17 +1984,17 @@ for ac_hdr in linux/videodev.h
do
ac_safe
=
`
echo
"
$ac_hdr
"
|
sed
'y%./+-%__p_%'
`
echo
$ac_n
"checking for
$ac_hdr
""...
$ac_c
"
1>&6
echo
"configure:198
6
: checking for
$ac_hdr
"
>
&5
echo
"configure:198
8
: checking for
$ac_hdr
"
>
&5
if
eval
"test
\"
`
echo
'$''{'
ac_cv_header_
$ac_safe
'+set}'
`
\"
= set"
;
then
echo
$ac_n
"(cached)
$ac_c
"
1>&6
else
cat
>
conftest.
$ac_ext
<<
EOF
#line 199
1
"configure"
#line 199
3
"configure"
#include "confdefs.h"
#include <
$ac_hdr
>
EOF
ac_try
=
"
$ac_cpp
conftest.
$ac_ext
>/dev/null 2>conftest.out"
{
(
eval echo
configure:199
6
:
\"
$ac_try
\"
)
1>&5
;
(
eval
$ac_try
)
2>&5
;
}
{
(
eval echo
configure:199
8
:
\"
$ac_try
\"
)
1>&5
;
(
eval
$ac_try
)
2>&5
;
}
ac_err
=
`
grep
-v
'^ *+'
conftest.out |
grep
-v
"^conftest.
${
ac_ext
}
\$
"
`
if
test
-z
"
$ac_err
"
;
then
rm
-rf
conftest
*
...
...
@@ -2025,7 +2027,7 @@ done
# Extract the first word of "gtk-config", so it can be a program name with args.
set
dummy gtk-config
;
ac_word
=
$2
echo
$ac_n
"checking for
$ac_word
""...
$ac_c
"
1>&6
echo
"configure:20
29
: checking for
$ac_word
"
>
&5
echo
"configure:20
31
: checking for
$ac_word
"
>
&5
if
eval
"test
\"
`
echo
'$''{'
ac_cv_prog_GTK_CONFIG
'+set}'
`
\"
= set"
;
then
echo
$ac_n
"(cached)
$ac_c
"
1>&6
else
...
...
@@ -2104,7 +2106,7 @@ fi
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh.
echo
$ac_n
"checking for a BSD compatible install""...
$ac_c
"
1>&6
echo
"configure:210
8
: checking for a BSD compatible install"
>
&5
echo
"configure:21
1
0: checking for a BSD compatible install"
>
&5
if
test
-z
"
$INSTALL
"
;
then
if
eval
"test
\"
`
echo
'$''{'
ac_cv_path_install
'+set}'
`
\"
= set"
;
then
echo
$ac_n
"(cached)
$ac_c
"
1>&6
...
...
@@ -2165,7 +2167,7 @@ esac
# Extract the first word of "rsync", so it can be a program name with args.
set
dummy rsync
;
ac_word
=
$2
echo
$ac_n
"checking for
$ac_word
""...
$ac_c
"
1>&6
echo
"configure:21
69
: checking for
$ac_word
"
>
&5
echo
"configure:21
71
: checking for
$ac_word
"
>
&5
if
eval
"test
\"
`
echo
'$''{'
ac_cv_path_RSYNC
'+set}'
`
\"
= set"
;
then
echo
$ac_n
"(cached)
$ac_c
"
1>&6
else
...
...
@@ -2621,6 +2623,7 @@ s%@CVSSUPPORT@%$CVSSUPPORT%g
s%@CHATSUPPORT@%
$CHATSUPPORT
%g
s%@MIN_UNIX_UID@%
$MIN_UNIX_UID
%g
s%@MIN_UNIX_GID@%
$MIN_UNIX_GID
%g
s%@DELAYTHRESH@%
$DELAYTHRESH
%g
s%@TBOPSEMAIL@%
$TBOPSEMAIL
%g
s%@TBOPSEMAIL_NOSLASH@%
$TBOPSEMAIL_NOSLASH
%g
s%@TBLOGSEMAIL@%
$TBLOGSEMAIL
%g
...
...
configure.in
View file @
689de108
...
...
@@ -152,6 +152,7 @@ AC_SUBST(CVSSUPPORT)
AC_SUBST(CHATSUPPORT)
AC_SUBST(MIN_UNIX_UID)
AC_SUBST(MIN_UNIX_GID)
AC_SUBST(DELAYTHRESH)
#
# Offer both versions of the email addresses that have the @ escaped
...
...
@@ -213,6 +214,7 @@ FRISEBEEMCASTADDR="234.5.6"
FRISEBEEMCASTPORT=3564
MIN_UNIX_UID=10000
MIN_UNIX_GID=6000
DELAYTHRESH=2
#
# Okay, I know this is improper usage of --with. Too bad.
...
...
tbsetup/assign_wrapper.in
View file @
689de108
...
...
@@ -119,7 +119,7 @@ use libtblog;
#
# Maximum delay in ms above which a delay node is needed.
# (Note that the DB represents delays as floating point numbers)
my
$delaythresh
=
2
;
my
$delaythresh
=
@DELAYTHRESH@
;
# Maximum number of times we run assign.
my
$maxrun
=
3
;
...
...
tbsetup/ns2ir/parse.tcl.in
View file @
689de108
...
...
@@ -523,14 +523,19 @@ proc parse_delay {dspec} {
set unit s
}
switch $unit {
s {
r
et
urn
[expr
int(
$delay*1000
)
]}
ms {
r
et
urn [expr int(
$delay
)]
}
ns {
r
et
urn
[expr
int(
$delay/1000
)
]}
s {
s
et
val
[expr $delay*1000]}
ms {
s
et
val
$delay}
ns {
s
et
val
[expr $delay/1000]}
default {
perror "Unknown delay unit $unit."
return 0
}
}
if {$val != 0 && $val < @DELAYTHRESH@} {
perror "The delay of ${val}ms is invalid, it must be either 0 or at least @DELAYTHRESH@ms."
return 0
}
return [expr int($val)]
}
# We now have all our infrastructure in place. We are ready to load
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment