Commit 9406c93f authored by Leigh B Stoller's avatar Leigh B Stoller
Browse files

Merge branch 'master' into rspec

parents cc64d243 23b013d8
...@@ -41,7 +41,7 @@ OBJS += parse_ptop_xml.o parse_vtop_xml.o parse_policy_xml.o parse_error_handler ...@@ -41,7 +41,7 @@ OBJS += parse_ptop_xml.o parse_vtop_xml.o parse_policy_xml.o parse_error_handler
endif endif
# Pick either this # Pick either this
CXXFLAGS += -O3 CXXFLAGS += -O3
# or this # or this
#CXXFLAGS += -O0 -g -Wall -DVERBOSE #CXXFLAGS += -O0 -g -Wall -DVERBOSE
# and then zero or more of these # and then zero or more of these
......
This diff is collapsed.
# -*- tcl -*- # -*- tcl -*-
# #
# EMULAB-COPYRIGHT # EMULAB-COPYRIGHT
# Copyright (c) 2000-2009 University of Utah and the Flux Group. # Copyright (c) 2000-2010 University of Utah and the Flux Group.
# All rights reserved. # All rights reserved.
# #
...@@ -487,6 +487,8 @@ Node instproc set_fixed {pnode} { ...@@ -487,6 +487,8 @@ Node instproc set_fixed {pnode} {
if {$issubnode} { if {$issubnode} {
$pnode set subnodehost 1 $pnode set subnodehost 1
$pnode set subnodechild $self $pnode set subnodechild $self
} elseif ($isvirt) {
# Need to check anything?
} else { } else {
perror "\[set-fixed] Improper fix-node $self to $pnode!" perror "\[set-fixed] Improper fix-node $self to $pnode!"
return return
......
...@@ -38,10 +38,12 @@ Path instproc updatedb {DB} { ...@@ -38,10 +38,12 @@ Path instproc updatedb {DB} {
$self instvar sim $self instvar sim
set idx 0 set idx 0
set layer 0
foreach link $mylinklist { foreach link $mylinklist {
set fields [list "pathname" "segmentname" "segmentindex"] set layer [$link set layer]
set values [list $self $link $idx] set fields [list "pathname" "segmentname" "segmentindex" "layer"]
set values [list $self $link $idx $layer]
$sim spitxml_data "virt_paths" $fields $values $sim spitxml_data "virt_paths" $fields $values
......
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