- adding skeleton class files for QueueSGE

- changed QueueBase methods to pure virtual

rsmcore/CMakeLists.txt

@@ -5,6 +5,7 @@ sessionworker.hh
 sessioncontroller.hh
 queuebase.hh
 queuepbs.hh
+queuesge.hh
 )
 SET(SOURCES
 hostconfig.cc
@@ -12,6 +13,7 @@ sessionworker.cc
 sessioncontroller.cc
 queuebase.cc
 queuepbs.cc
+queuesge.cc
 )
 
 QT5_WRAP_CPP(MOC_FILES

rsmcore/queuebase.cc

@@ -2,35 +2,6 @@
 
 namespace rsm
 {
+// need out-of-line definition for destructor
 QueueBase::~QueueBase() {}
-QString QueueBase::allnodeinfo()
-{
-  fprintf(stderr, "QueueBase allnodeinfo\n");
-  return "";
-}
-QString QueueBase::checkjob(QString params)
-{
-  (void)sizeof(params);
-  return "";
-}
-QString QueueBase::qdel(QString params)
-{
-  (void)sizeof(params);
-  return "";
-}
-QString QueueBase::qstat(QString params)
-{
-  (void)sizeof(params);
-  return "";
-}
-QString QueueBase::qsub(QString params)
-{
-  (void)sizeof(params);
-  return "";
-}
-QString QueueBase::showq(QString params)
-{
-  (void)sizeof(params);
-  return "";
-}
 }  // namespace rsm

rsmcore/queuebase.hh

@@ -9,13 +9,12 @@ class QueueBase
 {
  public:
   virtual ~QueueBase();
-  // TODO: once downstream issues are fixed, these should be pure virtual
-  virtual QString allnodeinfo();
-  virtual QString checkjob(QString params);
-  virtual QString qdel(QString params);
-  virtual QString qstat(QString params);
-  virtual QString qsub(QString params);
-  virtual QString showq(QString params);
+  virtual QString allnodeinfo()            = 0;
+  virtual QString checkjob(QString params) = 0;
+  virtual QString qdel(QString params)     = 0;
+  virtual QString qstat(QString params)    = 0;
+  virtual QString qsub(QString params)     = 0;
+  virtual QString showq(QString params)    = 0;
 };  // class QueueBase
 }  // namespace rsm
 

rsmcore/queuepbs.cc

@@ -2,13 +2,8 @@
 
 namespace rsm
 {
-QueuePBS::QueuePBS() {}
-QueuePBS::~QueuePBS() {}
-QString QueuePBS::allnodeinfo()
-{
-  fprintf(stderr, "QueuePBS\n");
-  return "qstat -F";
-}
+// QueuePBS::~QueuePBS() {}
+QString QueuePBS::allnodeinfo() { return "qstat -F"; }
 QString QueuePBS::checkjob(QString params) { return "qstat " + params; }
 QString QueuePBS::qdel(QString params) { return "qdel " + params; }
 QString QueuePBS::qstat(QString params) { return "qstat " + params; }

rsmcore/queuepbs.hh

@@ -8,8 +8,7 @@ namespace rsm
 class QueuePBS : public QueueBase
 {
  public:
-  QueuePBS();
-  ~QueuePBS() override;
+  //  ~QueuePBS() override;
   QString allnodeinfo() override;
   QString checkjob(QString params) override;
   QString qdel(QString params) override;

rsmcore/queuesge.cc

+#include "queuesge.hh"
+
+namespace rsm
+{
+// QueueSGE::~QueueSGE() {}
+QString QueueSGE::allnodeinfo() { return "qstat -F"; }
+QString QueueSGE::checkjob(QString params) { return "qstat " + params; }
+QString QueueSGE::qdel(QString params) { return "qdel " + params; }
+QString QueueSGE::qstat(QString params) { return "qstat " + params; }
+QString QueueSGE::qsub(QString params) { return "qsub " + params; }
+QString QueueSGE::showq(QString params) { return "asdf " + params; }
+}  // namespace rsm

rsmcore/queuesge.hh

+#ifndef RSMSGE_QUEUESGE_HH_
+#define RSMSGE_QUEUESGE_HH_
+
+#include "rsmcore/queuebase.hh"
+
+namespace rsm
+{
+class QueueSGE : public QueueBase
+{
+ public:
+  //  ~QueueSGE() override;
+  QString allnodeinfo() override;
+  QString checkjob(QString params) override;
+  QString qdel(QString params) override;
+  QString qstat(QString params) override;
+  QString qsub(QString params) override;
+  QString showq(QString params) override;
+};  // class QueueSGE
+}  // namespace rsm
+
+#endif /* RSMSGE_QUEUESGE_HH_ */