Skip to content
Snippets Groups Projects
Commit 7847a037 authored by Iustin Pop's avatar Iustin Pop
Browse files

Some small changes in preparation for hscan

This patch does some small changes:
  - fixes a comment
  - export more node functions (unneeded now, but hscan will use them)
  - fixes Makefile rule for building the programs
parent 740ec004
No related branches found
No related tags found
No related merge requests found
...@@ -754,7 +754,7 @@ loadData ndata idata = ...@@ -754,7 +754,7 @@ loadData ndata idata =
(ktn, nl) = loadTabular ndata (ktn, nl) = loadTabular ndata
(\ (i:jt:jf:kt:kf:[]) -> (i, Node.create jt jf kt kf)) (\ (i:jt:jf:kt:kf:[]) -> (i, Node.create jt jf kt kf))
Node.setIdx Node.setIdx
{- instance file: name mem disk -} {- instance file: name mem disk pnode snode -}
(kti, il) = loadTabular idata (kti, il) = loadTabular idata
(\ (i:j:k:l:m:[]) -> (i, (\ (i:j:k:l:m:[]) -> (i,
Instance.create j k Instance.create j k
......
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
module Ganeti.HTools.Node module Ganeti.HTools.Node
( (
Node(failN1, idx, f_mem, f_dsk, p_mem, p_dsk, slist, plist, Node(failN1, idx, t_mem, f_mem, t_dsk, f_dsk, p_mem, p_dsk, p_rem,
p_rem, offline) plist, slist, offline)
-- * Constructor -- * Constructor
, create , create
-- ** Finalization after data loading -- ** Finalization after data loading
......
...@@ -8,7 +8,7 @@ DOCS = README.html NEWS.html ...@@ -8,7 +8,7 @@ DOCS = README.html NEWS.html
all: $(HPROGS) all: $(HPROGS)
hn1 hbal: % : %.hs Ganeti/HTools/Version.hs $(HSRCS) Makefile $(HPROGS): %: %.hs Ganeti/HTools/Version.hs $(HSRCS) Makefile
ghc --make -O2 -W $@ ghc --make -O2 -W $@
$(DOCS) : %.html : % $(DOCS) : %.html : %
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment