Changeset 81


Ignore:
Timestamp:
10/14/12 21:12:48 (7 years ago)
Author:
mmamonski
Message:

DRMAA 2.0 for PBS compiles

Location:
branches/2.0
Files:
3 added
1 deleted
13 edited

Legend:

Unmodified
Added
Removed
  • branches/2.0

    • Property svn:ignore set to
      configure
      Makefile.in
      config.log
      scripts
      config.status
      stamp-h1
      config.h
      config.h.in
      drmaa_utils
      libtool
      autom4te.cache
      Makefile
      aclocal.m4
      .libs
      .deps
      pbs_attrib.c
      del_all_jobs
      pbs_drmaa-1.0.2.tar.gz
      pbs_drmaa-1.0.3.tar.gz
      pbs_drmaa
      .svnignore
      configure.ac
      readme.html
      readme.pdf
      readme.tex
      ltsugar.m4
      libtool.m4
      ltversion.m4
      lt~obsolete.m4
      ltoptions.m4
      readme.toc
      readme.out
      readme.aux
      readme.log
      libtool.m4
      lt~obsolete.m4
      ltsugar.m4
      ltversion.m4
      ltoptions.m4
      .project
      .cproject
      drmaa_example1
      drmaa_example2
  • branches/2.0/.svnignore

    r12 r81  
    3333readme.aux 
    3434readme.log 
     35libtool.m4 
     36lt~obsolete.m4 
     37ltsugar.m4 
     38ltversion.m4 
     39ltoptions.m4 
     40.project 
     41.cproject 
     42drmaa_example1 
     43drmaa_example2 
  • branches/2.0/Makefile.am

    r77 r81  
    11# $Id$ 
    22# 
    3 # FedStage DRMAA for PBS Pro 
    4 # Copyright (C) 2006-2009  FedStage Systems 
     3# DRMAA for Torque/PBS Professional 
     4# Copyright (C) 2012  Poznan Supercomputing and Networking Center 
    55# 
    66# This program is free software: you can redistribute it and/or modify 
     
    2424 m4/missing-dev-prog.sh 
    2525 
    26 SUBDIRS = drmaa2_utils pbs_drmaa 
     26SUBDIRS = drmaa2_utils drmaa2_testsuite pbs_drmaa 
  • branches/2.0/configure.ac

    r77 r81  
    5858fi 
    5959 
    60 if test x$GCC = xyes; then 
    61         CFLAGS="-pedantic -ansi ${CFLAGS}" 
    62 fi 
    6360AM_CONDITIONAL([GCC], [test x$GCC = xyes]) 
    6461 
     
    168165        Makefile 
    169166        pbs_drmaa/Makefile 
     167  drmaa2_testsuite/Makefile 
    170168]) 
    171169AC_CONFIG_HEADERS([config.h]) 
  • branches/2.0/drmaa2_utils/configure.ac

    r78 r81  
    8686fi 
    8787 
    88 if test x$GCC = xyes; then 
    89         CFLAGS="-pedantic -ansi ${CFLAGS}" 
    90 fi 
    9188AM_CONDITIONAL([GCC], [test x$GCC = xyes]) 
    9289 
  • branches/2.0/drmaa2_utils/drmaa_utils/Makefile.am

    r77 r81  
    3333 lookup3.c lookup.h \ 
    3434 thread.h thread.c \ 
    35  xmalloc.h xmalloc.c 
     35 xmalloc.h xmalloc.c \ 
     36 jsession.h fsd_jsession.c 
    3637# job.h fsd_job.c \ 
    3738# session.h fsd_session.c \ 
  • branches/2.0/drmaa2_utils/drmaa_utils/common.h

    r77 r81  
    2929#include <drmaa_utils/logging.h> 
    3030#include <drmaa_utils/xmalloc.h> 
     31#include <drmaa_utils/drmaa2.h> 
     32 
    3133 
    3234#define FSD_SAFE_STR(str) ( str != NULL ? str : "(null)" ) 
     
    4547/* DRMAA structures */ 
    4648typedef struct fsd_drmaa_singletone_s  fsd_drmaa_singletone_t; 
    47 typedef struct fsd_drmaa_session_s     fsd_drmaa_session_t; 
     49typedef struct fsd_drmaa_jsession_s     fsd_drmaa_jsession_t; 
     50typedef struct fsd_drmaa_rsession_s     fsd_drmaa_rsession_t; 
     51typedef struct fsd_drmaa_msession_s     fsd_drmaa_msession_t; 
     52 
    4853typedef struct fsd_job_set_s           fsd_job_set_t; 
    4954typedef struct fsd_job_s               fsd_job_t; 
  • branches/2.0/drmaa2_utils/drmaa_utils/drmaa_base.c

    r77 r81  
    8383 
    8484 
     85/* 
     86 * 109 functions in total 
     87 * 
     88 * implemented so far: 
     89 * 14/10/2012 - 0 
     90 */ 
    8591 
    8692void drmaa2_string_free(drmaa2_string *ptr) 
  • branches/2.0/drmaa2_utils/drmaa_utils/drmaa_base.h

    r77 r81  
    2626 
    2727#include <drmaa_utils/common.h> 
    28 #include <drmaa_utils/thread.h> 
     28#include <drmaa_utils/drmaa2.h> 
    2929 
    30 #if 0 
     30 
    3131struct fsd_drmaa_singletone_s { 
    32         /** Global session object */ 
    33         fsd_drmaa_session_t *session; 
    34         fsd_mutex_t session_mutex; 
    3532 
    36         fsd_drmaa_session_t *(*new_session)( 
    37                         fsd_drmaa_singletone_t *self, 
    38                         const char *contact 
    39                         ); 
     33        fsd_drmaa_jsession_t *(*new_jsession)(fsd_drmaa_singletone_t *self, const char *contact); 
     34        fsd_drmaa_rsession_t *(*new_rsession)(fsd_drmaa_singletone_t *self, const char *contact); 
     35        fsd_drmaa_msession_t *(*new_msession)(fsd_drmaa_singletone_t *self, const char *contact); 
    4036 
    41         fsd_template_t *(*new_job_template)( 
    42                         fsd_drmaa_singletone_t *self 
    43                         ); 
    44  
    45         const char* (*get_contact)( fsd_drmaa_singletone_t *self ); 
    46         void (*get_version)( 
    47                         fsd_drmaa_singletone_t *self, 
    48                         unsigned *major, unsigned *minor 
    49                         ); 
    50         const char* (*get_DRM_system)( fsd_drmaa_singletone_t *self ); 
    51         const char* (*get_DRMAA_implementation)( fsd_drmaa_singletone_t *self ); 
    52  
    53         fsd_iter_t * (* 
    54         get_attribute_names)( 
    55                 fsd_drmaa_singletone_t *self ); 
    56  
    57         fsd_iter_t * (* 
    58         get_vector_attribute_names)( 
    59                 fsd_drmaa_singletone_t *self ); 
    60  
    61         int (*wifexited)( int *exited, int stat, 
    62                 char *error_diagnosis, size_t error_diag_len ); 
    63         int (*wexitstatus)( int *exit_status, int stat, 
    64                 char *error_diagnosis, size_t error_diag_len ); 
    65         int (*wifsignaled)( int *signaled, int stat, 
    66                 char *error_diagnosis, size_t error_diag_len ); 
    67         int (*wtermsig)( char *signal, size_t signal_len, int stat, 
    68                 char *error_diagnosis, size_t error_diag_len ); 
    69         int (*wcoredump)( int *core_dumped, int stat, 
    70                 char *error_diagnosis, size_t error_diag_len ); 
    71         int (*wifaborted)( int *aborted, int stat, 
    72                 char *error_diagnosis, size_t error_diag_len ); 
     37        drmaa2_string (*get_drms_name)(void); 
     38        drmaa2_version (*get_drms_version)(void); 
     39        drmaa2_string (*get_drmaa_name)(void); 
     40        drmaa2_version (*get_drmaa_version)(void); 
     41        drmaa2_bool (*drmaa2_supports)(const drmaa2_capability c); 
    7342}; 
    7443 
    7544extern fsd_drmaa_singletone_t _fsd_drmaa_singletone; 
    76 #endif 
    7745 
    7846#endif /* __DRMAA_UTILS__DRMAA_BASE_H */ 
  • branches/2.0/m4

    • Property svn:ignore set to
      configure
      Makefile.in
      config.log
      scripts
      config.status
      stamp-h1
      config.h
      config.h.in
      drmaa_utils
      libtool
      autom4te.cache
      Makefile
      aclocal.m4
      .libs
      .deps
      pbs_attrib.c
      del_all_jobs
      pbs_drmaa-1.0.2.tar.gz
      pbs_drmaa-1.0.3.tar.gz
      pbs_drmaa
      .svnignore
      configure.ac
      readme.html
      readme.pdf
      readme.tex
      ltsugar.m4
      libtool.m4
      ltversion.m4
      lt~obsolete.m4
      ltoptions.m4
      readme.toc
      readme.out
      readme.aux
      readme.log
      libtool.m4
      lt~obsolete.m4
      ltsugar.m4
      ltversion.m4
      ltoptions.m4

  • branches/2.0/pbs_drmaa

    • Property svn:ignore set to
      configure
      Makefile.in
      config.log
      scripts
      config.status
      stamp-h1
      config.h
      config.h.in
      drmaa_utils
      libtool
      autom4te.cache
      Makefile
      aclocal.m4
      .libs
      .deps
      pbs_attrib.c
      del_all_jobs
      pbs_drmaa-1.0.2.tar.gz
      pbs_drmaa-1.0.3.tar.gz
      pbs_drmaa
      .svnignore
      configure.ac
      readme.html
      readme.pdf
      readme.tex
      ltsugar.m4
      libtool.m4
      ltversion.m4
      lt~obsolete.m4
      ltoptions.m4
      readme.toc
      readme.out
      readme.aux
      readme.log
      libtool.m4
      lt~obsolete.m4
      ltsugar.m4
      ltversion.m4
      ltoptions.m4

  • branches/2.0/pbs_drmaa/Makefile.am

    r12 r81  
    11# $Id$ 
    22#  
    3 # FedStage DRMAA for PBS Professional 
    4 # Copyright (C) 2006-2009  FedStage Systems 
     3# DRMAA for Torque/PBS Professional 
     4# Copyright (C) 2012  Poznan Supercomputing and Networking Center 
    55# 
    66# This program is free software: you can redistribute it and/or modify 
     
    2020GPERF       = @GPERF@ 
    2121GPERFFLAGS  = --readonly-tables 
    22 AM_CPPFLAGS = @PBS_INCLUDES@ -I$(top_srcdir)/drmaa_utils -fPIC 
     22AM_CPPFLAGS = @PBS_INCLUDES@ -I$(top_srcdir)/drmaa2_utils -fPIC 
    2323 
    2424lib_LTLIBRARIES = libdrmaa.la 
    2525 
    2626libdrmaa_la_SOURCES = \ 
    27  drmaa.c \ 
    28  job.c job.h \ 
    29  pbs_attrib.gperf pbs_attrib.h \ 
    30  session.c session.h \ 
    31  submit.c submit.h \ 
    32  util.c util.h \ 
    33  log_reader.c log_reader.h  
     27 drmaa.c  
     28# job.c job.h \ 
     29# pbs_attrib.gperf pbs_attrib.h \ 
     30# session.c session.h \ 
     31# submit.c submit.h \ 
     32# util.c util.h \ 
     33# log_reader.c log_reader.h  
    3434BUILT_SOURCES       = pbs_attrib.c 
    3535EXTRA_DIST          = pbs_attrib.c 
    3636dist_sysconf_DATA   = pbs_drmaa.conf.example 
    37 libdrmaa_la_LIBADD  = ../drmaa_utils/drmaa_utils/libdrmaa_utils.la @PBS_LIBS@ 
     37libdrmaa_la_LIBADD  = ../drmaa2_utils/drmaa_utils/libdrmaa_utils.la @PBS_LIBS@ 
    3838libdrmaa_la_LDFLAGS = @PBS_LDFLAGS@ -version-info @PBS_DRMAA_VERSION_INFO@ 
    3939 
  • branches/2.0/pbs_drmaa/drmaa.c

    r12 r81  
    11/* $Id$ */ 
    22/* 
    3  *  FedStage DRMAA for PBS Pro 
    4  *  Copyright (C) 2006-2007  FedStage Systems 
     3 *  PSNC DRMAA 2.0 for Torque/PBS Pro 
     4 *  Copyright (C) 2012  Poznan Supercomputing and Networking Center 
    55 * 
    66 *  This program is free software: you can redistribute it and/or modify 
     
    2222#endif 
    2323 
    24 #include <signal.h> 
    2524#include <drmaa_utils/drmaa_base.h> 
    26 #include <drmaa_utils/session.h> 
    27 #include <drmaa_utils/template.h> 
    28 #include <drmaa_utils/drmaa_attrib.h> 
    29 #include <drmaa_utils/iter.h> 
    30 #include <drmaa_utils/logging.h> 
    31 #include <pbs_drmaa/session.h> 
    32  
    33  
     25 
     26 
     27 
     28#if 0 
    3429static fsd_drmaa_session_t * 
    3530pbsdrmaa_new_session( fsd_drmaa_singletone_t *self, const char *contact ) 
     
    225220}; 
    226221 
     222#endif 
Note: See TracChangeset for help on using the changeset viewer.