Async Runtime

.gitignore

@@ -8,4 +8,6 @@ _build
 .DS_Store
 setup.data
 setup.log
-*~
+*~
+.*.sw[po]
+._*

.travis.yml

@@ -2,8 +2,8 @@ language: c
 script: bash -ex .travis-ci.sh
 env:
   global:
-    - OPAM_DEPENDS="lwt cstruct quickcheck ounit pa_ounit"
-    - CONFIG_FLAGS="--enable-tests --enable-quickcheck --enable-lwt"
+    - OPAM_DEPENDS="lwt cstruct quickcheck ounit pa_ounit textutils core async"
+    - CONFIG_FLAGS="--enable-tests --enable-quickcheck --enable-lwt --enable-async"
     - FRENETIC_DEPENDS="ocaml-packet"
   matrix:
     - OCAML_VERSION=4.01.0 OPAM_VERSION=1.1.0

Makefile

@@ -1,38 +1,32 @@
-# OASIS_START
-# DO NOT EDIT (digest: 7b2408909643717852b95f994b273fee)
+all: build
 
-SETUP = ocaml setup.ml
+LWT ?= $(shell if ocamlfind query lwt.unix >/dev/null 2>&1; then echo --enable-lwt; else echo --disable-lwt; fi)
+ASYNC ?= $(shell if ocamlfind query async >/dev/null 2>&1; then echo --enable-async; else echo --disable-async; fi)
+# Implies --enable-quickcheck
+TESTS ?= $(shell if ocamlfind query quickcheck >/dev/null 2>&1; then echo --enable-tests; else echo --disable-tests; fi)
 
-build: setup.data
-	$(SETUP) -build $(BUILDFLAGS)
+NAME=openflow
+J=4
 
-doc: setup.data build
-	$(SETUP) -doc $(DOCFLAGS)
+setup.ml: _oasis
+	oasis setup
 
-test: setup.data build
-	$(SETUP) -test $(TESTFLAGS)
+setup.data: setup.ml
+	ocaml setup.ml -configure $(LWT) $(ASYNC) $(TESTS)
 
-all:
-	$(SETUP) -all $(ALLFLAGS)
+build: setup.data setup.ml
+	ocaml setup.ml -build -j $(J)
 
-install: setup.data
-	$(SETUP) -install $(INSTALLFLAGS)
+install: setup.data setup.ml
+	ocaml setup.ml -install
 
-uninstall: setup.data
-	$(SETUP) -uninstall $(UNINSTALLFLAGS)
+test: setup.ml build
+	_build/test/Test.byte inline-test-runner openflow
 
-reinstall: setup.data
-	$(SETUP) -reinstall $(REINSTALLFLAGS)
+reinstall: setup.ml
+	ocamlfind remove $(NAME) || true
+	ocaml setup.ml -reinstall
 
 clean:
-	$(SETUP) -clean $(CLEANFLAGS)
-
-distclean:
-	$(SETUP) -distclean $(DISTCLEANFLAGS)
-
-setup.data:
-	$(SETUP) -configure $(CONFIGUREFLAGS)
-
-.PHONY: build doc test all install uninstall reinstall clean distclean configure
-
-# OASIS_STOP
+	ocamlbuild -clean
+	rm -f setup.data setup.log

_oasis

@@ -6,26 +6,32 @@ Synopsis:    Serialization library for OpenFlow
 Authors:     Marco Canini, Nate Foster, Arjun Guha, Mark Reitblatt,
              Cole Schlesinger, and Laurent Vanbever
 License:     LGPL
-Plugins:     META (0.3), DevFiles (0.3)
+Plugins:     META (0.3)
 BuildTools:
-  ocamlbuild,
-  ocamldoc
+  ocamlbuild
 
 Flag quickcheck
     Description: build the openflow.quickcheck library
-    Default: False
+    Default: false
 
 Flag lwt
     Description: build the openflow.lwt library
-    Default: False
+    Default: false
+
+Flag async
+    Description: build the openflow.async library
+    Default: false
 
 Library openflow
   Path: lib
   BuildDepends:
     str,
     cstruct,
     cstruct.syntax,
-    packet
+    packet,
+    core,
+    sexplib.syntax,
+    threads
   InternalModules:
     Bits,
     Misc,
@@ -36,13 +42,39 @@ Library openflow
     HighLevelSwitch_common    
   Modules:
     VInt,
+    OpenFlow_Header,
     OpenFlow0x01,
     OpenFlow0x01_Core,
     OpenFlow0x01_Stats,
     OpenFlow0x04,
     OpenFlow0x04_Core,
     SDN_Types    
 
+Library async
+  Findlibparent: openflow
+  Findlibname: async
+  Path: async
+  Build$: flag(async)
+  BuildDepends:
+    async,
+    openflow,
+    cstruct.async,
+    threads,
+    textutils,
+    sexplib.syntax
+  InternalModules:
+    Async_OpenFlow_Log,
+    Async_OpenFlow_Message,
+    Async_OpenFlow_Platform,
+    Async_OpenFlow_ClientServer,
+    Async_OpenFlow0x01,
+    Async_OpenFlow0x04,
+    Async_OpenFlowChunk,
+    Async_Highlevel
+  Modules:
+    Async_OpenFlow
+
+
 Library lwt
   Findlibparent: openflow
   Findlibname: lwt
@@ -72,33 +104,18 @@ Library quickcheck
     Findlibparent: openflow
     Findlibname: quickcheck
     Path: quickcheck
-    Build$: flag(quickcheck)
+    Build$: flag(tests) || flag(quickcheck)
     BuildDepends:
         quickcheck,
         openflow
     Modules:
+        OpenFlow_Arbitrary,
         OpenFlow0x01_Arbitrary
 
-Document doc
-  Title: OpenFlow documentation
-  Type: ocamlbuild (0.3)
-  XOCamlBuildPath: lib
-  XOCamlBuildModules:
-    OpenFlow0x01,
-    OpenFlow0x01_Core,
-    OpenFlow0x01_Stats,
-    OpenFlow0x01_Switch,
-    OpenFlow0x01_TxSwitch,
-    OpenFlow0x01_Platform,
-    OpenFlow0x04,
-    OpenFlow0x04_Core,
-    OpenFlow0x04_Platform,
-    OpenFlow0x04_Misc
-
 Executable testtool
   Path: test
   Install: False
-  Build$: flag(quickcheck) && flag(tests)
+  Build$: flag(tests)
   MainIs: Test.ml
   BuildDepends:
     packet,
@@ -110,14 +127,33 @@ Executable testtool
     openflow.quickcheck,
     quickcheck
 
-Executable test0
-  Path: test
-  Install: False
-  Build$: flag(quickcheck) && flag(tests)
-  MainIs: Test0.ml
-  BuildDepends: packet,openflow,openflow.lwt,oUnit,pa_ounit,pa_ounit.syntax
-
 Test all_tests
-  Command: $testtool inline-test-runner dummy
+  Command: $testtool inline-test-runner openflow
   Run$:  flag(quickcheck) && flag(tests)
   TestTools: testtool
+
+Executable Hypervisor
+  Path: examples
+  MainIs: Hypervisor.ml
+  Install: False
+  BuildDepends:
+    threads,
+    core,
+    async,
+    packet,
+    cstruct.async,
+    openflow,
+    openflow.async
+
+Executable learning_switch
+  Path: examples
+  MainIs: Learning_Switch.ml
+  Install: false
+  BuildDepends:
+    threads,
+    core,
+    async,
+    packet,
+    cstruct.async,
+    openflow,
+    openflow.async

_tags

@@ -1,5 +1,5 @@
 # OASIS_START
-# DO NOT EDIT (digest: f67bf63e760b489a07a3561d1e1b9dad)
+# DO NOT EDIT (digest: cd5e0972635d1a28cbce6bdbb6bc87fb)
 # Ignore VCS directories, you can use the same kind of rule outside
 # OASIS_START/STOP if you want to exclude directories that contains
 # useless stuff for the build process
@@ -15,68 +15,119 @@
 "_darcs": not_hygienic
 # Library openflow
 "lib/openflow.cmxs": use_openflow
+<lib/*.ml{,i}>: package(threads)
+<lib/*.ml{,i}>: package(core)
 <lib/*.ml{,i}>: package(packet)
+<lib/*.ml{,i}>: package(sexplib.syntax)
 <lib/*.ml{,i}>: package(str)
 <lib/*.ml{,i}>: package(cstruct)
 <lib/*.ml{,i}>: package(cstruct.syntax)
+# Library async
+"async/async.cmxs": use_async
+<async/*.ml{,i}>: use_openflow
+<async/*.ml{,i}>: package(threads)
+<async/*.ml{,i}>: package(core)
+<async/*.ml{,i}>: package(async)
+<async/*.ml{,i}>: package(packet)
+<async/*.ml{,i}>: package(cstruct.async)
+<async/*.ml{,i}>: package(textutils)
+<async/*.ml{,i}>: package(sexplib.syntax)
+<async/*.ml{,i}>: package(str)
+<async/*.ml{,i}>: package(cstruct)
+<async/*.ml{,i}>: package(cstruct.syntax)
 # Library lwt
 "lwt/lwt.cmxs": use_lwt
 <lwt/*.ml{,i}>: use_openflow
+<lwt/*.ml{,i}>: package(threads)
+<lwt/*.ml{,i}>: package(core)
 <lwt/*.ml{,i}>: package(packet)
 <lwt/*.ml{,i}>: package(lwt)
 <lwt/*.ml{,i}>: package(lwt.unix)
 <lwt/*.ml{,i}>: package(lwt.syntax)
+<lwt/*.ml{,i}>: package(sexplib.syntax)
 <lwt/*.ml{,i}>: package(str)
 <lwt/*.ml{,i}>: package(cstruct)
 <lwt/*.ml{,i}>: package(cstruct.syntax)
 # Library quickcheck
 "quickcheck/quickcheck.cmxs": use_quickcheck
 <quickcheck/*.ml{,i}>: use_openflow
+<quickcheck/*.ml{,i}>: package(threads)
+<quickcheck/*.ml{,i}>: package(core)
 <quickcheck/*.ml{,i}>: package(packet)
 <quickcheck/*.ml{,i}>: package(quickcheck)
+<quickcheck/*.ml{,i}>: package(sexplib.syntax)
 <quickcheck/*.ml{,i}>: package(str)
 <quickcheck/*.ml{,i}>: package(cstruct)
 <quickcheck/*.ml{,i}>: package(cstruct.syntax)
 # Executable testtool
 "test/Test.byte": use_quickcheck
 "test/Test.byte": use_openflow
+"test/Test.byte": package(threads)
+"test/Test.byte": package(core)
 "test/Test.byte": package(packet)
 "test/Test.byte": package(oUnit)
 "test/Test.byte": package(pa_ounit)
 "test/Test.byte": package(pa_ounit.syntax)
 "test/Test.byte": package(quickcheck)
+"test/Test.byte": package(sexplib.syntax)
 "test/Test.byte": package(str)
 "test/Test.byte": package(cstruct)
 "test/Test.byte": package(cstruct.syntax)
 <test/*.ml{,i}>: use_quickcheck
-<test/*.ml{,i}>: package(quickcheck)
-# Executable test0
-"test/Test0.byte": use_lwt
-"test/Test0.byte": use_openflow
-"test/Test0.byte": package(packet)
-"test/Test0.byte": package(oUnit)
-"test/Test0.byte": package(pa_ounit)
-"test/Test0.byte": package(pa_ounit.syntax)
-"test/Test0.byte": package(lwt)
-"test/Test0.byte": package(lwt.unix)
-"test/Test0.byte": package(lwt.syntax)
-"test/Test0.byte": package(str)
-"test/Test0.byte": package(cstruct)
-"test/Test0.byte": package(cstruct.syntax)
-<test/*.ml{,i}>: use_lwt
 <test/*.ml{,i}>: use_openflow
+<test/*.ml{,i}>: package(threads)
+<test/*.ml{,i}>: package(core)
 <test/*.ml{,i}>: package(packet)
 <test/*.ml{,i}>: package(oUnit)
 <test/*.ml{,i}>: package(pa_ounit)
 <test/*.ml{,i}>: package(pa_ounit.syntax)
-<test/*.ml{,i}>: package(lwt)
-<test/*.ml{,i}>: package(lwt.unix)
-<test/*.ml{,i}>: package(lwt.syntax)
+<test/*.ml{,i}>: package(quickcheck)
+<test/*.ml{,i}>: package(sexplib.syntax)
 <test/*.ml{,i}>: package(str)
 <test/*.ml{,i}>: package(cstruct)
 <test/*.ml{,i}>: package(cstruct.syntax)
+# Executable Hypervisor
+"examples/Hypervisor.byte": use_async
+"examples/Hypervisor.byte": use_openflow
+"examples/Hypervisor.byte": package(threads)
+"examples/Hypervisor.byte": package(core)
+"examples/Hypervisor.byte": package(async)
+"examples/Hypervisor.byte": package(packet)
+"examples/Hypervisor.byte": package(cstruct.async)
+"examples/Hypervisor.byte": package(textutils)
+"examples/Hypervisor.byte": package(sexplib.syntax)
+"examples/Hypervisor.byte": package(str)
+"examples/Hypervisor.byte": package(cstruct)
+"examples/Hypervisor.byte": package(cstruct.syntax)
+# Executable learning_switch
+"examples/Learning_Switch.byte": use_async
+"examples/Learning_Switch.byte": use_openflow
+"examples/Learning_Switch.byte": package(threads)
+"examples/Learning_Switch.byte": package(core)
+"examples/Learning_Switch.byte": package(async)
+"examples/Learning_Switch.byte": package(packet)
+"examples/Learning_Switch.byte": package(cstruct.async)
+"examples/Learning_Switch.byte": package(textutils)
+"examples/Learning_Switch.byte": package(sexplib.syntax)
+"examples/Learning_Switch.byte": package(str)
+"examples/Learning_Switch.byte": package(cstruct)
+"examples/Learning_Switch.byte": package(cstruct.syntax)
+<examples/*.ml{,i}>: use_async
+<examples/*.ml{,i}>: use_openflow
+<examples/*.ml{,i}>: package(threads)
+<examples/*.ml{,i}>: package(core)
+<examples/*.ml{,i}>: package(async)
+<examples/*.ml{,i}>: package(packet)
+<examples/*.ml{,i}>: package(cstruct.async)
+<examples/*.ml{,i}>: package(textutils)
+<examples/*.ml{,i}>: package(sexplib.syntax)
+<examples/*.ml{,i}>: package(str)
+<examples/*.ml{,i}>: package(cstruct)
+<examples/*.ml{,i}>: package(cstruct.syntax)
 # OASIS_STOP
 <lib/*.ml>: syntax_camlp4o
 <lwt/*.ml>: syntax_camlp4o
+<async/*.ml>: syntax_camlp4o
 <test/*.ml>: syntax_camlp4o
+<examples/*.ml>: syntax_camlp4o
 <of13test/*.ml>: syntax_camlp4o