removed newString proc again, reverted some unnecesary changes

This commit is contained in:
Arne Döring 2017-06-06 21:19:50 +02:00
commit ddea990a70
8 changed files with 16 additions and 38 deletions

View file

@ -54,7 +54,7 @@ proc launchSwarm(name: ptr SockAddr) {.async.} =
k = 0
while k < messagesToSend:
zeroMem(addr(buffer[0]), 16384)
zeroMem(cast[pointer](addr(saddr)), sizeof(Sockaddr_in))
zeroMem(cast[pointer](addr(saddr)), sizeof(Sockaddr_in))
var message = "Message " & $(i * messagesToSend + k)
await sendTo(sock, addr message[0], len(message),
name, sizeof(Sockaddr_in).SockLen)
@ -62,7 +62,7 @@ proc launchSwarm(name: ptr SockAddr) {.async.} =
16384, cast[ptr SockAddr](addr saddr),
addr slen)
size = 0
var grammString = $buffer
var grammString = $buffer.cstring
if grammString == message:
saveSendingPort(sockport)
inc(recvCount)
@ -84,7 +84,7 @@ proc readMessages(server: AsyncFD) {.async.} =
16384, cast[ptr SockAddr](addr(saddr)),
addr(slen))
size = 0
var grammString = $buffer
var grammString = $buffer.cstring
if grammString.startswith("Message ") and
saddr.sin_addr.s_addr == 0x100007F:
await sendTo(server, addr grammString[0], len(grammString),

View file

@ -6,9 +6,8 @@ when not defined(windows):
var buf: array[0..10, char]
while true:
var r = read(0, addr(buf), sizeof(buf)-1)
add inp, $buf
add inp, $buf.cstring
if r != sizeof(buf)-1: break
echo inp
#dafkladskölklödsaf ölksdakölfölksfklwe4iojr389wr 89uweokf sdlkf jweklr jweflksdj fioewjfsdlfsd

View file

@ -13,9 +13,6 @@ inf
nan
nil
nil
(a: 0, b: nil)
nil
ptr (a: 0, b: nil)'''
"""
echo($(@[23, 45]))
@ -49,12 +46,8 @@ type
b: string
var foo1: Foo
var foo2: ref Foo
var foo3: ptr Foo = foo1.addr
echo foo1
echo foo2
echo foo3
doAssert $foo1 == "(a: 0, b: nil)"
const
data = @['a','b', '\0', 'c','d']
@ -67,5 +60,6 @@ import strutils
# array test
let arr = ['H','e','l','l','o',' ','W','o','r','l','d','!','\0']
# not sure if this is really a good idea
doAssert startsWith($arr, "[H, e, l, l, o, , W, o, r, l, d, !,")
doAssert newString(arr) == "Hello World!"
doAssert $arr.cstring == "Hello World!"