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
9a4f50c9
Commit
9a4f50c9
authored
Jul 25, 2012
by
Mike Hibler
Browse files
Still more fixes to "imageinfo" change.
parent
59f41621
Changes
2
Hide whitespace changes
Inline
Side-by-side
tbsetup/libosload.pm.in
View file @
9a4f50c9
...
...
@@ -761,7 +761,7 @@ sub osload ($$) {
# (for the indicated node). This info is cached for use by all other
# nodes that require the image. Returns 1 on success, 0 on failure.
#
sub GetImageInfo($
;
$)
sub GetImageInfo($$)
{
my ($image, $node) = @_;
my $imagesize = 0;
...
...
tbsetup/libosload_new.pm.in
View file @
9a4f50c9
...
...
@@ -519,7 +519,7 @@ sub osload($$$) {
# Load up the imageinfo before we fork to minimize queries and maximize
# mem sharing.
#
#$self->GetImageInfo($image);
#$self->GetImageInfo($image
,...
);
}
#
...
...
@@ -924,9 +924,9 @@ sub AddNode($$$$)
# This info is cached for use by all other
# nodes that require the image. Returns 1 on success, 0 on failure.
#
sub GetImageInfo($$$)
sub GetImageInfo($$$
$
)
{
my ($self, $image, $rowrefptr) = @_;
my ($self, $image,
$node,
$rowrefptr) = @_;
my $imagesize = 0;
my $imageid = $image->imageid();
...
...
@@ -1746,7 +1746,7 @@ sub _CheckImages($$)
#
my $rowref = $self->imageinfo($imageid);
if (!defined($rowref)) {
my $retval = $self->GetImageInfo($image,\$rowref);
my $retval = $self->GetImageInfo($image,
$node_id,
\$rowref);
# save it off!
$self->imageinfo($imageid,$rowref);
if ($retval) {
...
...
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