drmaa 0.1.0.1 → 0.1.1

raw patch · 3 files changed

+20/−20 lines, 3 files

Files

• drmaa.cabal +4/−6
• src/DRMAA.c +3/−1
• src/DRMAA.hs +13/−13

@@ -1,12 +1,12 @@ name:                drmaa-version:             0.1.0.1-synopsis:            A simple Haskell bindings to DRMAA C library.-description:         A simple Haskell bindings to DRMAA C library.+version:             0.1.1+synopsis:            A minimal Haskell bindings to DRMAA C library.+description:         A minimal Haskell bindings to DRMAA C library. license:             BSD3 license-file:        LICENSE author:              Kai Zhang maintainer:          kai@kzhang.org--- copyright:+copyright:           (c) 2016 Kai Zhang category:            Language build-type:          Simple extra-source-files:  ChangeLog.md@@ -17,8 +17,6 @@   exposed-modules:     DRMAA -  -- other-modules:-  -- other-extensions:   build-depends:       base >=4.7 && <5.0     , inline-c

@@ -31,7 +31,7 @@ }  -int inline_c_DRMAA_2_8569c20fd54d45f727dd1560458a1febedbc42e1(char * wd_inline_c_0, const char ** envPtr_inline_c_1, char * native_inline_c_2, char * c_exec_inline_c_3, const char ** aptr_inline_c_4) {+int inline_c_DRMAA_2_f3edb2a436e7c708ac077181355a61d0a274be4a(char * wd_inline_c_0, const char ** envPtr_inline_c_1, char * native_inline_c_2, char * c_exec_inline_c_3, const char ** aptr_inline_c_4) {              int exception = 0;             char error[DRMAA_ERROR_STRING_BUFFER];@@ -122,11 +122,13 @@                                 } /* else */                             } /* else */ +                            /*                             printf ("Job Usage:\n");                              while (drmaa_get_next_attr_value (rusage, usage, DRMAA_ERROR_STRING_BUFFER) == DRMAA_ERRNO_SUCCESS) {                                 printf ("  %s\n", usage);                             }+                            */                              drmaa_release_attr_values (rusage);                         } /* else */

@@ -3,15 +3,15 @@ {-# LANGUAGE TemplateHaskell   #-} module DRMAA where -import           Control.Exception        (bracket_, bracket)-import qualified Data.Text                as T-import           Shelly                   hiding (FilePath, withTmpDir)-+import           Control.Exception     (bracket, bracket_)+import qualified Data.Text             as T import           Foreign.C.String import           Foreign.Marshal.Alloc import           Foreign.Marshal.Array import           Foreign.Ptr-import qualified Language.C.Inline        as C+import qualified Language.C.Inline     as C+import           Shelly                hiding (FilePath, withTmpDir)+import           Text.Printf           (printf)  C.include "stddef.h" C.include "stdio.h"@@ -56,9 +56,7 @@         }         return 0;         }|]-    case status of-        0 -> putStrLn "DRMAA session started"-        _ -> peekCString ptr >>= error+    when (status /= 0) $ peekCString ptr >>= error  drmaaExit :: IO () drmaaExit = do@@ -72,13 +70,11 @@         }         return 0;         }|]-    case r of-        0 -> putStrLn "DRMAA session closed"-        _ -> error "Exit 1"+    when (r /= 0) $ error "Exit 1"  data DrmaaAttribute = DrmaaAttribute     { drmaa_wd     :: !FilePath-    , drmaa_env :: ![(String, String)]+    , drmaa_env    :: ![(String, String)]     , drmaa_native :: !String     } deriving (Show, Read) @@ -191,11 +187,13 @@                                 } /* else */                             } /* else */ +                            /*                             printf ("Job Usage:\n");                              while (drmaa_get_next_attr_value (rusage, usage, DRMAA_ERROR_STRING_BUFFER) == DRMAA_ERRNO_SUCCESS) {                                 printf ("  %s\n", usage);                             }+                            */                              drmaa_release_attr_values (rusage);                         } /* else */@@ -211,4 +209,6 @@              return exception;             }|]-    if e /= 0 then error ("status=" ++ show e) else return ()+    when (e/=0) $ error $ printf+        "Job failed (status=%d). Please see SGE log for details"+        (fromIntegral e :: Int)