reapi: add match options for c++ bindings

Problem: reapi match allocate functions use a boolean parameter
to toggle beteween 2 of the 4 total match options. This leads to
the other 2 match options being inaccesible from the reapi.

Overload the C++ bindings for match allocate to accept a different
parameter that allows for all 4 options. Rework old function to call
new function with correct match option to maintain backwards
compatibility.

Author: zekemorton

resource/reapi/bindings/c++/reapi_cli.hpp

@@ -133,6 +133,10 @@ class reapi_cli_t : public reapi_t {
                                const std::string &jobspec,
                                const uint64_t jobid, bool &reserved,
                                std::string &R, int64_t &at, double &ov);
+    static int match_allocate (void *h, match_op_t match_op,
+                               const std::string &jobspec,
+                               const uint64_t jobid, bool &reserved,
+                               std::string &R, int64_t &at, double &ov);
     static int match_allocate_multi (void *h, bool orelse_reserve,
                                      const char *jobs,
                                      queue_adapter_base_t *adapter);

resource/reapi/bindings/c++/reapi_cli_impl.hpp

@@ -51,7 +51,7 @@ std::string reapi_cli_t::m_err_msg = "";
  *                                                                          *
  ****************************************************************************/
 
-int reapi_cli_t::match_allocate (void *h, bool orelse_reserve,
+int reapi_cli_t::match_allocate (void *h, match_op_t match_op,
                                  const std::string &jobspec,
                                  const uint64_t jobid, bool &reserved,
                                  std::string &R, int64_t &at, double &ov)
@@ -76,13 +76,7 @@ int reapi_cli_t::match_allocate (void *h, bool orelse_reserve,
             goto out;
         }
 
-        if (orelse_reserve)
-            rc = rq->traverser_run (job,
-                                match_op_t::MATCH_ALLOCATE_ORELSE_RESERVE,
-                                (int64_t)jobid, at);
-        else
-            rc = rq->traverser_run (job, match_op_t::MATCH_ALLOCATE, 
-                                    (int64_t)jobid, at);
+        rc = rq->traverser_run (job, match_op, (int64_t)jobid, at);
 
         if (rq->get_traverser_err_msg () != "") {
             m_err_msg += __FUNCTION__;
@@ -110,7 +104,7 @@ int reapi_cli_t::match_allocate (void *h, bool orelse_reserve,
     }
 
     // Check for an unsuccessful match 
-    if (rc == 0) {
+    if ( (rc == 0) && (match_op != match_op_t::MATCH_SATISFIABILITY)) {
         matched = true;
     }
 
@@ -154,12 +148,26 @@ int reapi_cli_t::match_allocate (void *h, bool orelse_reserve,
 
     }
 
-    rq->incr_job_counter ();
+    if (match_op != match_op_t::MATCH_SATISFIABILITY)
+        rq->incr_job_counter ();
 
 out:
     return rc;
 }
 
+int reapi_cli_t::match_allocate (void *h, bool orelse_reserve,
+                                 const std::string &jobspec,
+                                 const uint64_t jobid, bool &reserved,
+                                 std::string &R, int64_t &at, double &ov)
+{
+    match_op_t match_op = orelse_reserve ? 
+                          match_op_t::MATCH_ALLOCATE_ORELSE_RESERVE : 
+                          match_op_t::MATCH_ALLOCATE;
+    
+    return match_allocate (h, match_op, jobspec, jobid, reserved,
+                           R, at, ov);
+}
+
 int reapi_cli_t::update_allocate (void *h, const uint64_t jobid,
                                   const std::string &R, int64_t &at, double &ov,
                                   std::string &R_out)

resource/reapi/bindings/c++/reapi_module.hpp

@@ -28,13 +28,20 @@ namespace detail {
 
 class reapi_module_t : public reapi_t {
 public:
+    static int match_allocate (void *h, const char *cmd,
+                               const std::string &jobspec,
+                               const uint64_t jobid, bool &reserved,
+                               std::string &R, int64_t &at, double &ov);
     static int match_allocate (void *h, bool orelse_reserve,
                                const std::string &jobspec,
                                const uint64_t jobid, bool &reserved,
                                std::string &R, int64_t &at, double &ov);
     static int match_allocate_multi (void *h, bool orelse_reserve,
                                      const char *jobs,
                                      queue_adapter_base_t *adapter);
+    static int match_allocate_multi (void *h, const char *cmd,
+                                     const char *jobs,
+                                     queue_adapter_base_t *adapter);
     static int update_allocate (void *h, const uint64_t jobid,
                                 const std::string &R, int64_t &at, double &ov,
                                 std::string &R_out);

resource/reapi/bindings/c++/reapi_module_impl.hpp

@@ -25,7 +25,7 @@ namespace Flux {
 namespace resource_model {
 namespace detail {
 
-int reapi_module_t::match_allocate (void *h, bool orelse_reserve,
+int reapi_module_t::match_allocate (void *h, const char *cmd,
                                     const std::string &jobspec,
                                     const uint64_t jobid, bool &reserved,
                                     std::string &R, int64_t &at, double &ov)
@@ -36,8 +36,6 @@ int reapi_module_t::match_allocate (void *h, bool orelse_reserve,
     flux_future_t *f = NULL;
     const char *rset = NULL;
     const char *status = NULL;
-    const char *cmd = (orelse_reserve)? "allocate_orelse_reserve"
-                                      : "allocate_with_satisfiability";
 
     if (!fh || jobspec == "" || jobid > INT64_MAX) {
         errno = EINVAL;
@@ -70,6 +68,18 @@ int reapi_module_t::match_allocate (void *h, bool orelse_reserve,
     return rc;
 }
 
+int reapi_module_t::match_allocate (void *h, bool orelse_reserve,
+                                    const std::string &jobspec,
+                                    const uint64_t jobid, bool &reserved,
+                                    std::string &R, int64_t &at, double &ov)
+{
+    const char *cmd = (orelse_reserve)? "allocate_orelse_reserve"
+                                      : "allocate_with_satisfiability";
+    
+    return match_allocate (h, cmd, jobspec, jobid, reserved, R, at, ov); 
+
+}
+
 void match_allocate_multi_cont (flux_future_t *f, void *arg)
 {
     int64_t rj = -1;
@@ -101,16 +111,14 @@ void match_allocate_multi_cont (flux_future_t *f, void *arg)
 }
 
 int reapi_module_t::match_allocate_multi (void *h,
-                                          bool orelse_reserve,
+                                          const char *cmd,
                                           const char *jobs,
                                           queue_adapter_base_t *adapter)
 {
     int rc = -1;
     flux_t *fh = static_cast<flux_t *> (h);
     flux_future_t *f = nullptr;
 
-    const char *cmd = orelse_reserve ? "allocate_orelse_reserve"
-                                     : "allocate_with_satisfiability";
     if (!fh) {
         errno = EINVAL;
         goto error;
@@ -134,6 +142,16 @@ int reapi_module_t::match_allocate_multi (void *h,
     return rc;
 }
 
+int reapi_module_t::match_allocate_multi (void *h,
+                                          bool orelse_reserve,
+                                          const char *jobs,
+                                          queue_adapter_base_t *adapter)
+{
+    const char *cmd = orelse_reserve ? "allocate_orelse_reserve"
+                                     : "allocate_with_satisfiability";
+    return match_allocate_multi (h, cmd, jobs, adapter);
+}
+
 int reapi_module_t::update_allocate (void *h, const uint64_t jobid,
                                     const std::string &R, int64_t &at,
                                     double &ov, std::string &R_out)