Add support for resource matching service

.travis.yml

@@ -32,8 +32,8 @@ addons:
       - cmake
       - cmake-data
       - clang-3.8
-      - gcc-4.9
-      - g++-4.9
+      - gcc-8
+      - g++-8
       - uuid-dev
       - aspell
       - libopenmpi-dev
@@ -52,7 +52,7 @@ addons:
 before_install:
   - rm -rf $HOME/.luarocks
   - wget https://raw.githubusercontent.com/flux-framework/flux-core/master/src/test/travis-dep-builder.sh
-  - eval $(bash ./travis-dep-builder.sh --printenv)
+  - $(bash ./travis-dep-builder.sh --printenv)
   - export PKG_CONFIG_PATH=$HOME/local2/lib/pkgconfig:${PKG_CONFIG_PATH}
   - test "$TRAVIS_PULL_REQUEST" == "false" || export CCACHE_READONLY=1
   - if test "$CC" = "clang"; then export CCACHE_CPP2=1; fi
@@ -98,6 +98,7 @@ after_success:
  - ccache -s
  - if test "$COVERAGE" = "t"; then coveralls-lcov flux*-coverage.info;  bash <(curl -s https://codecov.io/bash); fi
 after_failure:
+ - find . -name test-suite.log | xargs -i sh -c 'printf "===XXX {} XXX===";cat {}'
  - find . -name t[0-9]*.output -print0 | xargs -0 -I'{}' sh -c 'printf "\033[31mFound {}\033[39m\n";cat {}'
  - find . -name *.broker.log -print0 | xargs -0 -I'{}' sh -c 'printf "\033[31mFound {}\033[39m\n";cat {}'
  - src/test/backtrace-all.sh

configure.ac

@@ -147,6 +147,7 @@ AC_CONFIG_FILES([Makefile
   resource/Makefile
   resource/planner/Makefile
   resource/planner/test/Makefile
+  resource/modules/Makefile
   sched/Makefile
   sched/priority/Makefile
   sched/priority/modified_fair_tree/Makefile

resource/Makefile.am

@@ -12,37 +12,21 @@ AM_LDFLAGS = $(CODE_COVERAGE_LDFLAGS) \
 AM_CPPFLAGS = -I$(top_srcdir) $(CZMQ_CFLAGS) $(FLUX_CORE_CFLAGS) \
 	      $(BOOST_CPPFLAGS)
 
-SUBDIRS = planner .
+SUBDIRS = planner . modules
+
+noinst_LTLIBRARIES = libresource.la
 
 noinst_PROGRAMS = utilities/grug2dot utilities/resource-query
 
 EXTRA_DIST= \
     utilities/conf
 
-#
-# grug2dot
-#
-utilities_grug2dot_SOURCES = \
-    utilities/grug2dot.cpp \
-    generators/spec.cpp \
-    generators/spec.hpp
-utilities_grug2dot_CXXFLAGS = \
-    $(AM_CXXFLAGS)
-utilities_grug2dot_LDADD = \
-    $(BOOST_SYSTEM_LIB) \
-    $(BOOST_FILESYSTEM_LIB) \
-    $(BOOST_GRAPH_LIB) \
-    $(BOOST_REGEX_LIB)
-
-#.
-# resource-query
-#
-utilities_resource_query_SOURCES = \
-    utilities/resource-query.cpp \
-    utilities/command.cpp \
+libresource_la_SOURCES = \
     policies/dfu_match_high_id_first.cpp \
     policies/dfu_match_low_id_first.cpp \
     policies/dfu_match_locality.cpp \
+    policies/dfu_match_policy_factory.cpp \
+    jobinfo/jobinfo.cpp \
     schema/resource_data.cpp \
     schema/infra_data.cpp \
     schema/sched_data.cpp \
@@ -59,6 +43,8 @@ utilities_resource_query_SOURCES = \
     policies/dfu_match_high_id_first.hpp \
     policies/dfu_match_low_id_first.hpp \
     policies/dfu_match_locality.hpp \
+    policies/dfu_match_policy_factory.hpp \
+    jobinfo/jobinfo.hpp \
     schema/resource_graph.hpp \
     schema/data_std.hpp \
     schema/infra_data.hpp \
@@ -76,15 +62,46 @@ utilities_resource_query_SOURCES = \
     evaluators/fold.hpp \
     config/system_defaults.hpp \
     planner/planner.h
-utilities_resource_query_CXXFLAGS = \
+
+libresource_la_CXXFLAGS = \
+    $(WARNING_CXXFLAGS) \
+    $(CODE_COVERAGE_CFLAGS) \
     $(AM_CXXFLAGS) \
     $(JOBSPEC_CFLAGS)
-utilities_resource_query_LDADD = \
+
+libresource_la_LIBADD = \
     $(top_builddir)/resource/planner/libplanner.la \
     $(JOBSPEC_LIBS) \
-    $(READLINE_LIBS) \
     $(BOOST_SYSTEM_LIB) \
     $(BOOST_FILESYSTEM_LIB) \
     $(BOOST_GRAPH_LIB) \
     $(BOOST_REGEX_LIB)
 
+#
+# grug2dot
+#
+utilities_grug2dot_SOURCES = \
+    utilities/grug2dot.cpp \
+    generators/spec.cpp \
+    generators/spec.hpp
+utilities_grug2dot_CXXFLAGS = \
+    $(AM_CXXFLAGS)
+utilities_grug2dot_LDADD = \
+    $(BOOST_SYSTEM_LIB) \
+    $(BOOST_FILESYSTEM_LIB) \
+    $(BOOST_GRAPH_LIB) \
+    $(BOOST_REGEX_LIB)
+
+#
+# resource-query
+#
+utilities_resource_query_SOURCES = \
+    utilities/resource-query.cpp \
+    utilities/command.cpp
+utilities_resource_query_CXXFLAGS = \
+    $(AM_CXXFLAGS) \
+    $(JOBSPEC_CFLAGS) \
+    $(READLINE_LIBS)
+utilities_resource_query_LDADD = \
+    libresource.la
+

resource/evaluators/edge_eval_api.cpp

@@ -22,7 +22,7 @@
  *  See also:  http://www.gnu.org/licenses/
 \*****************************************************************************/
 
-#include "evaluators/edge_eval_api.hpp"
+#include "resource/evaluators/edge_eval_api.hpp"
 
 namespace Flux {
 namespace resource_model {

resource/evaluators/edge_eval_api.hpp

@@ -27,7 +27,7 @@
 
 #include <vector>
 #include <string>
-#include "schema/resource_graph.hpp"
+#include "resource/schema/resource_graph.hpp"
 
 namespace Flux {
 namespace resource_model {

resource/evaluators/fold.hpp

@@ -27,7 +27,7 @@
 
 #include <boost/icl/interval.hpp>
 #include <boost/icl/interval_set.hpp>
-#include "evaluators/edge_eval_api.hpp"
+#include "resource/evaluators/edge_eval_api.hpp"
 
 namespace Flux {
 namespace resource_model {

resource/evaluators/scoring_api.cpp

@@ -22,7 +22,7 @@
  *  See also:  http://www.gnu.org/licenses/
 \*****************************************************************************/
 
-#include "evaluators/scoring_api.hpp"
+#include "resource/evaluators/scoring_api.hpp"
 
 namespace Flux {
 namespace resource_model {

resource/evaluators/scoring_api.hpp

@@ -32,9 +32,9 @@
 #include <numeric>
 #include <functional>
 #include <algorithm>
-#include "schema/resource_graph.hpp"
-#include "evaluators/edge_eval_api.hpp"
-#include "evaluators/fold.hpp"
+#include "resource/schema/resource_graph.hpp"
+#include "resource/evaluators/edge_eval_api.hpp"
+#include "resource/evaluators/fold.hpp"
 
 namespace Flux {
 namespace resource_model {

resource/generators/gen.cpp

@@ -27,8 +27,8 @@
 #include <vector>
 #include <cstdint>
 #include <boost/algorithm/string.hpp>
-#include "generators/gen.hpp"
-#include "planner/planner.h"
+#include "resource/generators/gen.hpp"
+#include "resource/planner/planner.h"
 
 extern "C" {
 #if HAVE_CONFIG_H
@@ -431,7 +431,7 @@ const std::string &resource_generator_t::err_message () const
 /*
  * Read a subsystem spec graphml file and generate resource database
  *
- * \param sfile  generator spec file in graphml
+ * \param sn     generator spec file in graphml
  * \param db     graph database consisting of resource graph and various indices
  * \return       0 on success; non-zero integer on an error
  */

resource/generators/gen.hpp

@@ -27,8 +27,8 @@
 
 #include <string>
 #include <boost/graph/depth_first_search.hpp>
-#include "schema/resource_graph.hpp"
-#include "generators/spec.hpp"
+#include "resource/schema/resource_graph.hpp"
+#include "resource/generators/spec.hpp"
 
 namespace Flux {
 namespace resource_model {

resource/generators/spec.cpp

@@ -27,7 +27,7 @@
 #include <boost/graph/graphviz.hpp>
 #include <boost/graph/graphml.hpp>
 #include <boost/filesystem.hpp>
-#include "generators/spec.hpp"
+#include "resource/generators/spec.hpp"
 
 extern "C" {
 #if HAVE_CONFIG_H

resource/jobinfo/jobinfo.cpp

@@ -0,0 +1,75 @@
+/*****************************************************************************\
+ *  Copyright (c) 2014 Lawrence Livermore National Security, LLC.  Produced at
+ *  the Lawrence Livermore National Laboratory (cf, AUTHORS, DISCLAIMER.LLNS).
+ *  LLNL-CODE-658032 All rights reserved.
+ *
+ *  This file is part of the Flux resource manager framework.
+ *  For details, see https://github.com/flux-framework.
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License as published by the Free
+ *  Software Foundation; either version 2 of the license, or (at your option)
+ *  any later version.
+ *
+ *  Flux is distributed in the hope that it will be useful, but WITHOUT
+ *  ANY WARRANTY; without even the IMPLIED WARRANTY OF MERCHANTABILITY or
+ *  FITNESS FOR A PARTICULAR PURPOSE.  See the terms and conditions of the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ *  See also:  http://www.gnu.org/licenses/
+\*****************************************************************************/
+
+#include <string>
+#include "resource/jobinfo/jobinfo.hpp"
+
+namespace Flux {
+namespace resource_model {
+
+job_info_t::job_info_t (uint64_t j, job_lifecycle_t s, int64_t at, const std::string &fn,
+                        const std::string &jstr, const std::string &R_str,  double o)
+    : jobid (j), state (s), scheduled_at (at), jobspec_fn (fn), jobspec_str (jstr),
+      R (R_str), overhead (o)
+{
+
+}
+
+job_info_t::job_info_t (uint64_t j, job_lifecycle_t s, int64_t at, const std::string &fn,
+                        const std::string &jstr, double o)
+    : jobid (j), state (s), scheduled_at (at), jobspec_fn (fn), jobspec_str (jstr),
+      overhead (o)
+{
+
+}
+
+void get_jobstate_str (job_lifecycle_t state, std::string &status)
+{
+    switch (state) {
+    case job_lifecycle_t::ALLOCATED:
+        status = "ALLOCATED";
+        break;
+    case job_lifecycle_t::RESERVED:
+        status = "RESERVED";
+        break;
+    case job_lifecycle_t::CANCELLED:
+        status = "CANCELLED";
+        break;
+    case job_lifecycle_t::ERROR:
+        status = "ERROR";
+        break;
+    case job_lifecycle_t::INIT:
+    default:
+        status = "INIT";
+        break;
+    }
+    return;
+}
+
+}
+}
+
+/*
+ * vi:tabstop=4 shiftwidth=4 expandtab
+ */

resource/jobinfo/jobinfo.hpp

@@ -0,0 +1,61 @@
+/*****************************************************************************\
+ *  Copyright (c) 2014 Lawrence Livermore National Security, LLC.  Produced at
+ *  the Lawrence Livermore National Laboratory (cf, AUTHORS, DISCLAIMER.LLNS).
+ *  LLNL-CODE-658032 All rights reserved.
+ *
+ *  This file is part of the Flux resource manager framework.
+ *  For details, see https://github.com/flux-framework.
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License as published by the Free
+ *  Software Foundation; either version 2 of the license, or (at your option)
+ *  any later version.
+ *
+ *  Flux is distributed in the hope that it will be useful, but WITHOUT
+ *  ANY WARRANTY; without even the IMPLIED WARRANTY OF MERCHANTABILITY or
+ *  FITNESS FOR A PARTICULAR PURPOSE.  See the terms and conditions of the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ *  See also:  http://www.gnu.org/licenses/
+\*****************************************************************************/
+
+#ifndef JOBINFO_HPP
+#define JOBINFO_HPP
+
+#include <string>
+
+namespace Flux {
+namespace resource_model {
+
+enum class job_lifecycle_t { INIT, ALLOCATED, RESERVED, CANCELLED, ERROR };
+
+struct job_info_t {
+    job_info_t (uint64_t j, job_lifecycle_t s, int64_t at,
+                const std::string &j_fn, const std::string &jstr,
+                const std::string &R_str,  double o);
+
+    job_info_t (uint64_t j, job_lifecycle_t s, int64_t at,
+                const std::string &j_fn, const std::string &jstr, double o);
+
+    uint64_t jobid = UINT64_MAX;
+    job_lifecycle_t state = job_lifecycle_t::INIT;
+    int64_t scheduled_at = -1;
+    std::string jobspec_fn;
+    std::string jobspec_str;
+    std::string R;
+    double overhead = 0.0f;
+};
+
+void get_jobstate_str (job_lifecycle_t state, std::string &status);
+
+} // namespace resource_model
+} // namespace Flux
+
+#endif // JOBINFO_HPP
+
+/*
+ * vi:tabstop=4 shiftwidth=4 expandtab
+ */