Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emulab
emulab-devel
Commits
7f567448
Commit
7f567448
authored
Oct 08, 2004
by
Timothy Stack
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use a marker to separate user output from the parser's xml output so
xmlconvert won't choke on it.
parent
74beb3f6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
0 deletions
+15
-0
db/xmlconvert.in
db/xmlconvert.in
+12
-0
tbsetup/ns2ir/sim.tcl.in
tbsetup/ns2ir/sim.tcl.in
+3
-0
No files found.
db/xmlconvert.in
View file @
7f567448
...
...
@@ -267,6 +267,18 @@ sub readXML($$$$) {
}
if
(
$fromparser
)
{
my
$line
=
<
STDIN
>
;
# Scan for the beginning marker or EOF.
while
(
$line
&&
(
$line
ne
"
#### BEGIN XML ####
\n
"))
{
print
"
$line
";
# Print it out for the user.
$line
=
<
STDIN
>
;
}
if
(
!
$line
)
{
fatal
("
NS script never reached
\"\$
ns run
\"
");
}
#
# Create a parser.
#
...
...
tbsetup/ns2ir/sim.tcl.in
View file @
7f567448
...
...
@@ -1111,6 +1111,9 @@ Simulator instproc spitxml_init {} {
var_import ::GLOBALS::pid
var_import ::GLOBALS::eid
# Add a marker so xmlconvert can tell where user output stops and
puts
"#### BEGIN XML ####"
# ... XML starts.
puts
"<?xml version=
\"
1.0
\"
encoding=
\"
ISO-8859-1
\"
?>"
puts
"<virtual_experiment pid='
$pid
' eid='
$eid
'>"
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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