Changeset 81

Timestamp:

10/14/12 21:12:48 (12 years ago)

Author:

mmamonski

Message:

DRMAA 2.0 for PBS compiles

Location:

branches/2.0

Files:

• . (modified) (1 prop)
• .svnignore (modified) (1 diff)
• Makefile.am (modified) (2 diffs)
• configure.ac (modified) (2 diffs)
• drmaa2_testsuite (added)
• drmaa2_utils/configure.ac (modified) (1 diff)
• drmaa2_utils/drmaa_utils/Makefile.am (modified) (1 diff)
• drmaa2_utils/drmaa_utils/common.h (modified) (2 diffs)
• drmaa2_utils/drmaa_utils/drmaa_base.c (modified) (1 diff)
• drmaa2_utils/drmaa_utils/drmaa_base.h (modified) (1 diff)
• drmaa2_utils/drmaa_utils/fsd_jsession.c (added)
• drmaa2_utils/drmaa_utils/jsession.h (added)
• m4 (modified) (1 prop)
• pbs_drmaa (modified) (1 prop)
• pbs_drmaa/Makefile.am (modified) (2 diffs)
• pbs_drmaa/drmaa.c (modified) (3 diffs)
• test (deleted)

branches/2.0/.svnignore

@@ -33 +33 @@
 readme.aux
 readme.log
+libtool.m4
+lt~obsolete.m4
+ltsugar.m4
+ltversion.m4
+ltoptions.m4
+.project
+.cproject
+drmaa_example1
+drmaa_example2

branches/2.0/Makefile.am

@@ -1 +1 @@
 # $Id$
 #
-# FedStage DRMAA for PBS Pro
-# Copyright (C) 2006-2009  FedStage Systems
+# DRMAA for Torque/PBS Professional
+# Copyright (C) 2012  Poznan Supercomputing and Networking Center
 #
 # This program is free software: you can redistribute it and/or modify
@@ -24 +24 @@
  m4/missing-dev-prog.sh
 
-SUBDIRS = drmaa2_utils pbs_drmaa
+SUBDIRS = drmaa2_utils drmaa2_testsuite pbs_drmaa

branches/2.0/configure.ac

@@ -58 +58 @@
 fi
 
-if test x$GCC = xyes; then
-        CFLAGS="-pedantic -ansi ${CFLAGS}"
-fi
 AM_CONDITIONAL([GCC], [test x$GCC = xyes])
 
@@ -168 +165 @@
         Makefile
         pbs_drmaa/Makefile
+  drmaa2_testsuite/Makefile
 ])
 AC_CONFIG_HEADERS([config.h])

branches/2.0/drmaa2_utils/configure.ac

@@ -86 +86 @@
 fi
 
-if test x$GCC = xyes; then
-        CFLAGS="-pedantic -ansi ${CFLAGS}"
-fi
 AM_CONDITIONAL([GCC], [test x$GCC = xyes])
 

branches/2.0/drmaa2_utils/drmaa_utils/Makefile.am

@@ -33 +33 @@
  lookup3.c lookup.h \
  thread.h thread.c \
- xmalloc.h xmalloc.c
+ xmalloc.h xmalloc.c \
+ jsession.h fsd_jsession.c
 # job.h fsd_job.c \
 # session.h fsd_session.c \

branches/2.0/drmaa2_utils/drmaa_utils/common.h

@@ -29 +29 @@
 #include <drmaa_utils/logging.h>
 #include <drmaa_utils/xmalloc.h>
+#include <drmaa_utils/drmaa2.h>
+
 
 #define FSD_SAFE_STR(str) ( str != NULL ? str : "(null)" )
@@ -45 +47 @@
 /* DRMAA structures */
 typedef struct fsd_drmaa_singletone_s  fsd_drmaa_singletone_t;
-typedef struct fsd_drmaa_session_s     fsd_drmaa_session_t;
+typedef struct fsd_drmaa_jsession_s     fsd_drmaa_jsession_t;
+typedef struct fsd_drmaa_rsession_s     fsd_drmaa_rsession_t;
+typedef struct fsd_drmaa_msession_s     fsd_drmaa_msession_t;
+
 typedef struct fsd_job_set_s           fsd_job_set_t;
 typedef struct fsd_job_s               fsd_job_t;

branches/2.0/drmaa2_utils/drmaa_utils/drmaa_base.c

@@ -83 +83 @@
 
 
+/*
+ * 109 functions in total
+ *
+ * implemented so far:
+ * 14/10/2012 - 0
+ */
 
 void drmaa2_string_free(drmaa2_string *ptr)

branches/2.0/drmaa2_utils/drmaa_utils/drmaa_base.h

@@ -26 +26 @@
 
 #include <drmaa_utils/common.h>
-#include <drmaa_utils/thread.h>
+#include <drmaa_utils/drmaa2.h>
 
-#if 0
+
 struct fsd_drmaa_singletone_s {
-        /** Global session object */
-        fsd_drmaa_session_t *session;
-        fsd_mutex_t session_mutex;
 
-        fsd_drmaa_session_t *(*new_session)(
-                        fsd_drmaa_singletone_t *self,
-                        const char *contact
-                        );
+        fsd_drmaa_jsession_t *(*new_jsession)(fsd_drmaa_singletone_t *self, const char *contact);
+        fsd_drmaa_rsession_t *(*new_rsession)(fsd_drmaa_singletone_t *self, const char *contact);
+        fsd_drmaa_msession_t *(*new_msession)(fsd_drmaa_singletone_t *self, const char *contact);
 
-        fsd_template_t *(*new_job_template)(
-                        fsd_drmaa_singletone_t *self
-                        );
-
-        const char* (*get_contact)( fsd_drmaa_singletone_t *self );
-        void (*get_version)(
-                        fsd_drmaa_singletone_t *self,
-                        unsigned *major, unsigned *minor
-                        );
-        const char* (*get_DRM_system)( fsd_drmaa_singletone_t *self );
-        const char* (*get_DRMAA_implementation)( fsd_drmaa_singletone_t *self );
-
-        fsd_iter_t * (*
-        get_attribute_names)(
-                fsd_drmaa_singletone_t *self );
-
-        fsd_iter_t * (*
-        get_vector_attribute_names)(
-                fsd_drmaa_singletone_t *self );
-
-        int (*wifexited)( int *exited, int stat,
-                char *error_diagnosis, size_t error_diag_len );
-        int (*wexitstatus)( int *exit_status, int stat,
-                char *error_diagnosis, size_t error_diag_len );
-        int (*wifsignaled)( int *signaled, int stat,
-                char *error_diagnosis, size_t error_diag_len );
-        int (*wtermsig)( char *signal, size_t signal_len, int stat,
-                char *error_diagnosis, size_t error_diag_len );
-        int (*wcoredump)( int *core_dumped, int stat,
-                char *error_diagnosis, size_t error_diag_len );
-        int (*wifaborted)( int *aborted, int stat,
-                char *error_diagnosis, size_t error_diag_len );
+        drmaa2_string (*get_drms_name)(void);
+        drmaa2_version (*get_drms_version)(void);
+        drmaa2_string (*get_drmaa_name)(void);
+        drmaa2_version (*get_drmaa_version)(void);
+        drmaa2_bool (*drmaa2_supports)(const drmaa2_capability c);
 };
 
 extern fsd_drmaa_singletone_t _fsd_drmaa_singletone;
-#endif
 
 #endif /* __DRMAA_UTILS__DRMAA_BASE_H */

branches/2.0/pbs_drmaa/Makefile.am

@@ -1 +1 @@
 # $Id$
 # 
-# FedStage DRMAA for PBS Professional
-# Copyright (C) 2006-2009  FedStage Systems
+# DRMAA for Torque/PBS Professional
+# Copyright (C) 2012  Poznan Supercomputing and Networking Center
 #
 # This program is free software: you can redistribute it and/or modify
@@ -20 +20 @@
 GPERF       = @GPERF@
 GPERFFLAGS  = --readonly-tables
-AM_CPPFLAGS = @PBS_INCLUDES@ -I$(top_srcdir)/drmaa_utils -fPIC
+AM_CPPFLAGS = @PBS_INCLUDES@ -I$(top_srcdir)/drmaa2_utils -fPIC
 
 lib_LTLIBRARIES = libdrmaa.la
 
 libdrmaa_la_SOURCES = \
- drmaa.c \
- job.c job.h \
- pbs_attrib.gperf pbs_attrib.h \
- session.c session.h \
- submit.c submit.h \
- util.c util.h \
- log_reader.c log_reader.h 
+ drmaa.c 
+# job.c job.h \
+# pbs_attrib.gperf pbs_attrib.h \
+# session.c session.h \
+# submit.c submit.h \
+# util.c util.h \
+# log_reader.c log_reader.h 
 BUILT_SOURCES       = pbs_attrib.c
 EXTRA_DIST          = pbs_attrib.c
 dist_sysconf_DATA   = pbs_drmaa.conf.example
-libdrmaa_la_LIBADD  = ../drmaa_utils/drmaa_utils/libdrmaa_utils.la @PBS_LIBS@
+libdrmaa_la_LIBADD  = ../drmaa2_utils/drmaa_utils/libdrmaa_utils.la @PBS_LIBS@
 libdrmaa_la_LDFLAGS = @PBS_LDFLAGS@ -version-info @PBS_DRMAA_VERSION_INFO@
 

branches/2.0/pbs_drmaa/drmaa.c

@@ -1 +1 @@
 /* $Id$ */
 /*
- *  FedStage DRMAA for PBS Pro
- *  Copyright (C) 2006-2007  FedStage Systems
+ *  PSNC DRMAA 2.0 for Torque/PBS Pro
+ *  Copyright (C) 2012  Poznan Supercomputing and Networking Center
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -22 +22 @@
 #endif
 
-#include <signal.h>
 #include <drmaa_utils/drmaa_base.h>
-#include <drmaa_utils/session.h>
-#include <drmaa_utils/template.h>
-#include <drmaa_utils/drmaa_attrib.h>
-#include <drmaa_utils/iter.h>
-#include <drmaa_utils/logging.h>
-#include <pbs_drmaa/session.h>
-
-
+
+
+
+#if 0
 static fsd_drmaa_session_t *
 pbsdrmaa_new_session( fsd_drmaa_singletone_t *self, const char *contact )
@@ -225 +220 @@
 };
 
+#endif