steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixing unresolved conflict

db4
Daniel Ehrenberg 2008-03-04 17:52:32 -06:00
parent c5eec0ba10
commit ffc3b8078c
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
extra/benchmark/sockets/sockets.factor
View File

@ -23,21 +23,11 @@ SYMBOL: counter
] curry "Client handler" spawn drop server-loop ; ] curry "Client handler" spawn drop server-loop ;
: simple-server ( -- ) : simple-server ( -- )
<<<<<<< HEAD:extra/benchmark/sockets/sockets.factor
7777 local-server "benchmark.sockets" ascii [
read1 CHAR: x = [
stop-server
] [
20 [ read1 write1 flush ] times
] if
] with-server ;
=======
[ [
server-addr <server> dup "server" set [ server-addr ascii <server> dup "server" set [
server-loop server-loop
] with-disposal ] with-disposal
] ignore-errors ; ] ignore-errors ;
>>>>>>> b80434b2e394480fa317348955b1f7b89e284bde:extra/benchmark/sockets/sockets.factor
: simple-client ( -- ) : simple-client ( -- )
server-addr <client> [ server-addr <client> [