Add serialisation code for required types.

- Locking travis to stackage.
- Fixed coverall.io integration.
closes #1

Author: jkozlowski

.ghci

@@ -1,17 +1,9 @@
-import System.FSNotify
-import Data.String
-import Control.Concurrent.MVar
-import Control.Concurrent
-
 :{
-:def test const (withManager (\manager -> 
-     do putStrLn "Listening to changes, press any key to stop..."
-        lock <- newEmptyMVar
-        watchTree manager (fromString ".") (const True) (const $ putMVar lock True)
-        forkIO (getLine >> putMVar lock False)
-        rerun <- readMVar lock
-        return $ if rerun 
-          then ":reload \n :main \n :test"
-          else ""
-     ))
+:def test const (
+     do putStrLn "Press any key to run tests, q to stop..."
+        x <- getLine
+        return $ if (x == "q")
+                    then ""
+                    else ":reload \n :main \n :test"
+     )
 :}

.gitignore

@@ -9,4 +9,9 @@ cabal-dev
 .hpc
 cabal.sandbox.config
 *.log
-.#*
+.#*
+*.iml
+q/
+.idea
+out/
+report.html

.travis.yml

@@ -5,9 +5,12 @@ before_install:
   - cabal install hpc-coveralls --avoid-reinstalls
 
 script:
+  - cat cabal.config >> ~/.cabal/config # use stackage - find a better way to do this
+  - cabal update
+  - cabal install --only-dependencies --enable-tests
   - cabal configure --enable-tests --enable-library-coverage
   - cabal build
   - run-cabal-test --show-details=always
 
 after_script:
-  - hpc-coveralls --exclude-dir=tests kdb-haskell-hpc
+  - hpc-coveralls --exclude-dir=tests kdb-haskell-tests

benchmarks/Benchmark.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE BangPatterns, OverloadedStrings #-}
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Benchmark
@@ -11,15 +12,80 @@
 module Main where
 
 import           Criterion.Main
+import           Data.Int (Int16)
+import           Database.Kdb.Internal.Types (Value(..), cV, s, li)
+import           Foreign.C.Types (CChar)
+import           Text.Printf (printf)
+import qualified Control.Monad                as CM (forM_)
+import qualified Data.ByteString.Char8        as C
+import qualified Data.Vector                  as V
+import qualified Data.Vector.Storable         as SV
+import qualified Data.Vector.Storable.Mutable as MSV
+import qualified Database.Kdb.Internal.Types  as KT
+import qualified Database.Kdb.Internal.IPC    as IPC
 
-fib :: Int -> Int
-fib 0 = 0
-fib 1 = 1
-fib n = fib (n-1) + fib (n-2)
+-- Unsafe stuff
+import System.IO.Unsafe (unsafePerformIO)
+
+-- Networking
+import Network.Socket hiding (recv)
+import Network.Socket.ByteString (recv, sendAll)
+
+fillS :: [[CChar]] -> Value
+fillS x = let (x',y') = createS x
+          in SV x' y'
+{-# INLINE fillS #-}
+
+createS :: [[CChar]] -> (Int, SV.Vector CChar)
+createS cl = unsafePerformIO $ do
+            v <- MSV.new (Prelude.length . Prelude.concat $ cl)
+            fill v 0 $ Prelude.concat cl
+            SV.unsafeFreeze v >>= \x -> return (Prelude.length cl,x)
+          where
+            fill _ _ [] = return ()
+            fill v i (x:xs) = MSV.unsafeWrite v i x >> fill v (i + 1) xs
+
+-- | Constructor for T - a Q table - we must always build it using this function
+-- 2 bytes for table header - 1 additional byte for dict type header
+fillT :: V.Vector Value -> Value
+fillT !xs = T (V.foldl' (\x y -> x + KT.size y) 3 xs) xs
+{-# INLINE fillT #-}
+
+-- function to convert list of bytestring into hex digits - useful for debugging kx IPC bytes
+bprint :: C.ByteString -> String
+bprint x = ("0x" ++ ) $ foldl (++) "" $ fmap (printf "%02x") $ C.unpack x
 
 main :: IO ()
-main = defaultMain [
-      bench "fib 10" $ nf (\n -> fib (10+n-n)) 10
-    , bench "fib 30" $ nf (\n -> fib (30+n-n)) 30
-    , bench "fib 35" $ nf (\n -> fib (35+n-n)) 35
+main = do
+  let shortv = HV (SV.fromList[1..10]) -- short list - for benchmark testing
+      il1 = IV $ SV.enumFromN 1 5000000 -- list of int
+      il2 = IV $ SV.enumFromN 1 5000000 -- list of int
+      il3 = IV $ SV.enumFromN 1 5000000 -- list of int
+      l1 = L (V.fromList [il1,il2,il3]) -- general list of int
+      sl1 = fillS [[97,0],[98,0],[99,0]] -- symbol list: `a`b`c
+      t = fillT (V.fromList [sl1,l1]) -- table t:([] a:til 5000000;b:til 5000000;c:til 5000000)
+      sl2 = s "t" -- atomic symbol `t
+      cl1 = cV "insert" -- string ".u.insert"
+      gl1 = li [cl1,sl2,t] -- general list (".u.insert";`t;t). t is the table from above
+{--
+  defaultMain [
+        bench "ShortV" $ whnf SV.fromList ([1..10]::[Int16])
+        ,bench "IPC.qIPC ShortV" $ whnf (IPC.qIPC 0) (HV (SV.fromList[1..10]))
+        --,bench "foldl T" $ whnf (V.foldl' (\x y -> x + size y) 3) (V.fromList [sl1,l1])
+        ,bench "fillT" $ whnf fillT (V.fromList [sl1,l1])
+        ,bench "fillS" $ whnf fillS [[97,0],[98,0],[99,0]]
+        ,bench "IPC.qIPC Taable" $ whnf (IPC.qIPC 0) t
+        ,bench "IPC.qIPC General List" $ whnf (IPC.qIPC 0) gl1
     ]
+--}
+  addrinfos <- getAddrInfo Nothing (Just "127.0.0.1") (Just "7777")
+  let serveraddr = head addrinfos
+  sock <- socket (addrFamily serveraddr) Stream defaultProtocol
+  connect sock (addrAddress serveraddr)
+  sendAll sock "user:pwd\1\0"
+  msg <- recv sock 1024
+  print "Received authentication"
+  print $ bprint msg
+  CM.forM_ [1..1] $ \x -> sendAll sock $ IPC.asyncIPC gl1
+  sClose sock
+

cabal.config

@@ -0,0 +1,2 @@
+-- Lock the package database
+remote-repo: stackage:http://www.stackage.org/stackage/7cbdc905d399a45de2128a2d8e67e22636f309a1

kdb-haskell.cabal

@@ -1,3 +1,4 @@
+
 name:               kdb-haskell
 version:            0.1.0
 synopsis:           Haskell bindings for KDB+.
@@ -29,67 +30,47 @@ flag documentation
       False
 
 library
-  exposed-modules:    Database.Kdb.Types
+  exposed-modules:    
+  other-modules:      Database.Kdb.Internal.Types
+                    , Database.Kdb.Internal.IPC
   default-language:   Haskell2010
   build-depends:      base >= 4 && < 5
                     , mtl
                     , bytestring
+                    , vector
                     , text
                     , containers
                     , binary
                     , lens
-                    , QuickCheck == 2.6.*
+                    , QuickCheck
                     , directory
   hs-source-dirs:     src
   ghc-options:       -Wall 
                      -fwarn-incomplete-patterns
                      -funbox-strict-fields
 
-test-suite kdb-haskell-hpc
-  main-is:            Test.hs
-  type:               exitcode-stdio-1.0
-  build-depends:      base
-                    , bytestring
-                    , containers
-                    , text
-                    , time
-                    , binary
-                    , mtl
-                    , lens
-                    , tasty == 0.8
-                    , tasty-quickcheck == 0.8
-                    , QuickCheck == 2.6.*
-                    , Cabal >= 1.9.2
-  Ghc-Options:       -Wall 
-                     -O0 
-                     -fhpc 
-                     -hpcdir 
-                      dist/hpc/mix/kdb-haskell-hpc
-                     -funbox-strict-fields
-  hs-source-dirs:     src 
-                    , tests
-
 test-suite kdb-haskell-tests
   hs-source-dirs:     src 
                     , tests
   main-is:            Test.hs
   type:               exitcode-stdio-1.0
   build-depends:      base
                     , bytestring
+                    , base16-bytestring
                     , containers
+                    , vector
                     , text
                     , time
                     , binary
                     , mtl
                     , lens
-                    , tasty == 0.8
-                    , tasty-quickcheck == 0.8
-                    , QuickCheck == 2.6.*
-                    , Cabal >= 1.9.2
-                      -- Dependencies for rerunning tests in ghci 
-                    , fsnotify >= 0.0.11
-                    , system-filepath >= 0.4.7
-  Ghc-Options:       -Wall 
+                    -- Testing
+                    , tasty
+                    , tasty-quickcheck
+                    , tasty-hunit
+                    , QuickCheck
+                    , Cabal
+  Ghc-Options:       -Wall
                      -O0
                      -funbox-strict-fields 
 
@@ -100,6 +81,9 @@ benchmark kdb-haskell-benchmark
   main-is:            Benchmark.hs
   build-depends:      base
                     , mtl
+                    , vector
+                    , bytestring
+                    , network
                     , criterion
                     , random
   ghc-options:       -Wall