Skip to content

Standalone chunk #190

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Standalone chunk #190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
74bed71
refactored OpenFlow0x01 controller into new process
reitblatt Mar 2, 2015
e9b2b2e
added debug printing
reitblatt Mar 2, 2015
2c0e554
playing with channel semantics
reitblatt Mar 4, 2015
1fc6368
Added CV to guard calls to Channel.read
reitblatt May 7, 2015
ac10ed5
Add log_level flag to pass log level to standalone process
reitblatt May 8, 2015
b910fdb
Use Deferred.List in send_flow_mods, add CPU logging
reitblatt May 9, 2015
4be94dc
More debug logging in Async_Openflow0x01
reitblatt May 11, 2015
4575897
merge from master
reitblatt May 12, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion _oasis
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ Library async
cstruct.async,
threads,
sexplib.syntax,
sexplib
sexplib,
async_parallel
InternalModules:
Async_OpenFlow_Log,
Async_OpenFlow_Message,
Expand Down
8 changes: 7 additions & 1 deletion _tags
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# OASIS_START
# DO NOT EDIT (digest: c549d3b3eb1ea3a63e2936cb07d78beb)
# DO NOT EDIT (digest: a559d07643364864392828b1b85386b8)
# 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
Expand Down Expand Up @@ -27,6 +27,7 @@ true: annot, bin_annot
# Library async
"async/async.cmxs": use_async
<async/*.ml{,i,y}>: package(async)
<async/*.ml{,i,y}>: package(async_parallel)
<async/*.ml{,i,y}>: package(core)
<async/*.ml{,i,y}>: package(cstruct)
<async/*.ml{,i,y}>: package(cstruct.async)
Expand Down Expand Up @@ -83,6 +84,7 @@ true: annot, bin_annot
<test/*.ml{,i,y}>: use_quickcheck
# Executable ping_test
"ping-test/PingTest.byte": package(async)
"ping-test/PingTest.byte": package(async_parallel)
"ping-test/PingTest.byte": package(core)
"ping-test/PingTest.byte": package(cstruct)
"ping-test/PingTest.byte": package(cstruct.async)
Expand All @@ -98,6 +100,7 @@ true: annot, bin_annot
"ping-test/PingTest.byte": use_async
"ping-test/PingTest.byte": use_openflow
<ping-test/*.ml{,i,y}>: package(async)
<ping-test/*.ml{,i,y}>: package(async_parallel)
<ping-test/*.ml{,i,y}>: package(core)
<ping-test/*.ml{,i,y}>: package(cstruct)
<ping-test/*.ml{,i,y}>: package(cstruct.async)
Expand All @@ -114,6 +117,7 @@ true: annot, bin_annot
<ping-test/*.ml{,i,y}>: use_openflow
# Executable learning_switch
"examples/Learning_Switch.byte": package(async)
"examples/Learning_Switch.byte": package(async_parallel)
"examples/Learning_Switch.byte": package(core)
"examples/Learning_Switch.byte": package(cstruct)
"examples/Learning_Switch.byte": package(cstruct.async)
Expand All @@ -127,6 +131,7 @@ true: annot, bin_annot
"examples/Learning_Switch.byte": use_openflow
# Executable learning_switch0x04
"examples/Learning_Switch0x04.byte": package(async)
"examples/Learning_Switch0x04.byte": package(async_parallel)
"examples/Learning_Switch0x04.byte": package(core)
"examples/Learning_Switch0x04.byte": package(cstruct)
"examples/Learning_Switch0x04.byte": package(cstruct.async)
Expand All @@ -139,6 +144,7 @@ true: annot, bin_annot
"examples/Learning_Switch0x04.byte": use_async
"examples/Learning_Switch0x04.byte": use_openflow
<examples/*.ml{,i,y}>: package(async)
<examples/*.ml{,i,y}>: package(async_parallel)
<examples/*.ml{,i,y}>: package(core)
<examples/*.ml{,i,y}>: package(cstruct)
<examples/*.ml{,i,y}>: package(cstruct.async)
Expand Down
12 changes: 7 additions & 5 deletions async/Async_OpenFlow.mli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ module Platform : sig
-> ?log_disconnects:bool
-> ?buffer_age_limit:[ `At_most of Time.Span.t | `Unlimited ]
-> ?monitor_connections:bool
-> ?log_level:Async.Std.Log.Level.t
-> port:int
-> unit
-> t Deferred.t
Expand All @@ -51,7 +52,7 @@ module Platform : sig

val close : t -> Client_id.t -> unit

val has_client_id : t -> Client_id.t -> bool
val has_client_id : t -> Client_id.t -> bool Deferred.t

val send
: t
Expand All @@ -66,9 +67,9 @@ module Platform : sig
val client_addr_port
: t
-> Client_id.t
-> (Unix.Inet_addr.t * int) option
-> (Unix.Inet_addr.t * int) option Deferred.t

val listening_port : t -> int
val listening_port : t -> int Deferred.t

end

Expand Down Expand Up @@ -178,8 +179,8 @@ module OpenFlow0x01 : sig
open OpenFlow0x01_Core
open OpenFlow0x01_Stats

val get_switches : t -> SDN_Types.switchId list
val get_switch_features : t -> SDN_Types.switchId -> OpenFlow0x01.SwitchFeatures.t option
val get_switches : t -> SDN_Types.switchId list Deferred.t
val get_switch_features : t -> SDN_Types.switchId -> OpenFlow0x01.SwitchFeatures.t option Deferred.t

val clear_flows
: ?pattern:pattern -> t -> Client_id.t
Expand Down Expand Up @@ -267,6 +268,7 @@ module SDN : sig
-> ?log_disconnects:bool (** default is [true] *)
-> ?buffer_age_limit:[ `At_most of Time.Span.t | `Unlimited ]
-> ?monitor_connections:bool
-> ?log_level:Async.Std.Log.Level.t
-> port:int
-> unit
-> t Deferred.t
Expand Down
Loading