dnrops
/
ZeroMQ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

new snapshot (#9) 

* new snapshot

* Update .swift-version
This commit is contained in:
goloveychuk 2016-04-19 16:54:50 +03:00 committed by Anton
parent 0572420ed0
commit df3e71d756
4 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.swift-version
View File

@ -1 +1 @@
DEVELOPMENT-SNAPSHOT-2016-03-24-a DEVELOPMENT-SNAPSHOT-2016-04-12-a

6
Sources/ZeroMQ/Context.swift
View File

@ -86,7 +86,7 @@ extension SocketType {
} }
public final class Context { public final class Context {
let context: UnsafeMutablePointer<Void> let context: UnsafeMutablePointer<Void>?
public init() throws { public init() throws {
context = zmq_ctx_new() context = zmq_ctx_new()
@ -116,11 +116,11 @@ public final class Context {
} }
} }
func setOption(option: Int32, value: Int32) { func setOption(_ option: Int32, value: Int32) {
zmq_ctx_set(context, option, value) zmq_ctx_set(context, option, value)
} }
func getOption(option: Int32) -> Int32 { func getOption(_ option: Int32) -> Int32 {
return zmq_ctx_get(context, option) return zmq_ctx_get(context, option)
} }

8
Sources/ZeroMQ/Message.swift
View File

@ -43,7 +43,7 @@ public final class Message {
} }
} }
public init(data: UnsafeMutablePointer<Void>, size: Int, hint: UnsafeMutablePointer<Void> = nil, ffn: @convention(c) (UnsafeMutablePointer<Void>, UnsafeMutablePointer<Void>) -> Void) throws { public init(data: UnsafeMutablePointer<Void>, size: Int, hint: UnsafeMutablePointer<Void>? = nil, ffn: @convention(c) (UnsafeMutablePointer<Void>!, UnsafeMutablePointer<Void>!) -> Void) throws {
message = zmq_msg_t() message = zmq_msg_t()
if zmq_msg_init_data(&message, data, size, ffn, hint) == -1 { if zmq_msg_init_data(&message, data, size, ffn, hint) == -1 {
@ -63,15 +63,15 @@ public final class Message {
zmq_msg_close(&message) zmq_msg_close(&message)
} }
func setProperty(property: Int32, value: Int32) { func setProperty(_ property: Int32, value: Int32) {
zmq_msg_set(&message, property, value) zmq_msg_set(&message, property, value)
} }
func getProperty(property: Int32) -> Int32 { func getProperty(_ property: Int32) -> Int32 {
return zmq_msg_get(&message, property) return zmq_msg_get(&message, property)
} }
public func getProperty(property: String) throws -> String { public func getProperty(_ property: String) throws -> String {
let result = zmq_msg_gets(&message, property) let result = zmq_msg_gets(&message, property)
if result == nil { if result == nil {

28
Sources/ZeroMQ/Socket.swift
View File

@ -57,13 +57,13 @@ public final class Socket {
zmq_close(socket) zmq_close(socket)
} }
func setOption(option: Int32, value: UnsafePointer<Void>, length: Int) throws { func setOption(_ option: Int32, value: UnsafePointer<Void>?, length: Int) throws {
if zmq_setsockopt(socket, option, value, length) == -1 { if zmq_setsockopt(socket, option, value, length) == -1 {
throw Error.lastError throw Error.lastError
} }
} }
func getOption(option: Int32, value: UnsafeMutablePointer<Void>, length: UnsafeMutablePointer<Int>) throws { func getOption(_ option: Int32, value: UnsafeMutablePointer<Void>, length: UnsafeMutablePointer<Int>) throws {
if zmq_getsockopt(socket, option, value, length) == -1 { if zmq_getsockopt(socket, option, value, length) == -1 {
throw Error.lastError throw Error.lastError
} }
@ -95,7 +95,7 @@ public final class Socket {
return true return true
} }
func send(buffer: UnsafeMutablePointer<Void>, length: Int, mode: SendMode = []) throws -> Bool { func send(_ buffer: UnsafeMutablePointer<Void>, length: Int, mode: SendMode = []) throws -> Bool {
let result = zmq_send(socket, buffer, length, Int32(mode.rawValue)) let result = zmq_send(socket, buffer, length, Int32(mode.rawValue))
if result == -1 && zmq_errno() == EAGAIN { if result == -1 && zmq_errno() == EAGAIN {
@ -108,12 +108,12 @@ public final class Socket {
return true return true
} }
public func send(data: Data, mode: SendMode = []) throws -> Bool { public func send(_ data: Data, mode: SendMode = []) throws -> Bool {
var data = data var data = data
return try self.send(&data.bytes, length: data.count, mode: mode) return try self.send(&data.bytes, length: data.count, mode: mode)
} }
func sendImmutable(buffer: UnsafePointer<Void>, length: Int, mode: SendMode = []) throws -> Bool { func sendImmutable(_ buffer: UnsafePointer<Void>, length: Int, mode: SendMode = []) throws -> Bool {
let result = zmq_send_const(socket, buffer, length, Int32(mode.rawValue)) let result = zmq_send_const(socket, buffer, length, Int32(mode.rawValue))
if result == -1 && zmq_errno() == EAGAIN { if result == -1 && zmq_errno() == EAGAIN {
@ -142,7 +142,7 @@ public final class Socket {
return message return message
} }
public func receive(bufferSize bufferSize: Int = 1024, mode: ReceiveMode = []) throws -> Data? { public func receive(bufferSize: Int = 1024, mode: ReceiveMode = []) throws -> Data? {
var data = Data.buffer(with: bufferSize) var data = Data.buffer(with: bufferSize)
let result = zmq_recv(socket, &data.bytes, bufferSize, Int32(mode.rawValue)) let result = zmq_recv(socket, &data.bytes, bufferSize, Int32(mode.rawValue))
if result == -1 && zmq_errno() == EAGAIN { if result == -1 && zmq_errno() == EAGAIN {
@ -191,23 +191,23 @@ public struct SocketEvent : OptionSet {
} }
extension Socket { extension Socket {
func setOption(option: Int32, _ value: Bool) throws { func setOption(_ option: Int32, _ value: Bool) throws {
var value = value ? 1 : 0 var value = value ? 1 : 0
try setOption(option, value: &value, length: strideof(Int32)) try setOption(option, value: &value, length: strideof(Int32))
} }
func setOption(option: Int32, _ value: Int32) throws { func setOption(_ option: Int32, _ value: Int32) throws {
var value = value var value = value
try setOption(option, value: &value, length: strideof(Int32)) try setOption(option, value: &value, length: strideof(Int32))
} }
func setOption(option: Int32, _ value: String) throws { func setOption(_ option: Int32, _ value: String) throws {
try value.withCString { v in try value.withCString { v in
try setOption(option, value: v, length: value.utf8.count) try setOption(option, value: v, length: value.utf8.count)
} }
} }
func setOption(option: Int32, _ value: Data) throws { func setOption(_ option: Int32, _ value: Data) throws {
try setOption(option, value: value.bytes, length: value.count) try setOption(option, value: value.bytes, length: value.count)
} }
func setOption(option: Int32, _ value: String?) throws { func setOption(_ option: Int32, _ value: String?) throws {
if let value = value { if let value = value {
try value.withCString { v in try value.withCString { v in
try setOption(option, value: v, length: value.utf8.count) try setOption(option, value: v, length: value.utf8.count)
@ -455,17 +455,17 @@ extension Socket {
} }
} }
extension Socket { extension Socket {
func getOption(option: Int32) throws -> Int32 { func getOption(_ option: Int32) throws -> Int32 {
var value: Int32 = 0 var value: Int32 = 0
var length = strideof(Int32) var length = strideof(Int32)
try getOption(option, value: &value, length: &length) try getOption(option, value: &value, length: &length)
return value return value
} }
func getOption(option: Int32) throws -> Bool { func getOption(_ option: Int32) throws -> Bool {
let value: Int32 = try getOption(option) let value: Int32 = try getOption(option)
return value != 0 return value != 0
} }
func getOption(option: Int32, count: Int) throws -> String? { func getOption(_ option: Int32, count: Int) throws -> String? {
var value = [Int8](repeating: 0, count: count) var value = [Int8](repeating: 0, count: count)
var length = value.count var length = value.count
try getOption(option, value: &value, length: &length) try getOption(option, value: &value, length: &length)