Commit 812fa6de authored by bernd's avatar bernd

Move \!time to log class

parent 3ff4bfb6
......@@ -115,8 +115,7 @@ previous
[: .time ." Download test: 1 text file and 2 photos" cr ;] $err
net2o-code
expect-reply
!time
log .time s" Download test " $, type 1 ulit, . pi float, f. cr endwith
log !time .time s" Download test " $, type 1 ulit, . pi float, f. cr endwith
get-ip 0 ulit,
$400 blocksize! $400 blockalign! stat( request-stats )
"net2o.fs" "net2o.fs" >cache n2o:copy
......
......@@ -11,6 +11,7 @@ and related or neighboring rights to the source code in this file.
http://creativecommons.org/publicdomain/zero/1.0/
*/
typedef unsigned int STATEI;
#include <string.h>
#include "brg_endian.h"
#include "KeccakF-1600-opt32-settings.h"
......
#define Unrolling 2
#ifndef UseSSE
#define UseBebigokimisa
#endif
//#define UseSSE
//#define UseOnlySIMD64
//#define UseMMX
......
......@@ -11,6 +11,7 @@ and related or neighboring rights to the source code in this file.
http://creativecommons.org/publicdomain/zero/1.0/
*/
typedef unsigned long long int STATEI;
#include <string.h>
#include "brg_endian.h"
#include "KeccakF-1600-opt64-settings.h"
......
......@@ -7,7 +7,8 @@ typedef unsigned char UINT8;
typedef unsigned short UINT16;
typedef unsigned int UINT32;
typedef unsigned long long int UINT64;
typedef unsigned long keccak_state[25*sizeof(UINT64)/sizeof(unsigned long)];
typedef STATEI keccak_state[25*sizeof(UINT64)/sizeof(STATEI)];
// typedef UINT64 keccak_state[25];
void KeccakInitialize();
void KeccakF(keccak_state state);
......
......@@ -13,14 +13,17 @@ LT_INIT
AC_CHECK_SIZEOF(void *)
case "$ac_cv_sizeof_void_p" in
4)
ws=32
ws=${ws-32}
;;
8)
ws=64
ws=${ws-64}
;;
esac
LIBTOOL=${CC%gcc}libtool
#x86 on x86_64 plattforms:
#./configure CC="gcc -m32 -mssse3 -DUseSSE" ws=64
LIBTOOL=${CC%gcc*}libtool
AC_SUBST(ws)
AC_SUBST(LIBTOOL)
AC_CONFIG_FILES([Makefile])
......
......@@ -518,6 +518,8 @@ $20 net2o: emit ( xc -- ) \ emit character on server log
F cr ;
+net2o: .time ( -- ) \ print timer to server log
F .time .packets profile( .times ) ;
+net2o: !time ( -- ) \ start timer
F !time init-timer ;
gen-table $freeze
......@@ -758,10 +760,7 @@ net2o' emit net2o: ack-addrtime ( utime addr -- ) \ packet at addr received at t
gen-table $freeze
' context-table is gen-table
$60 net2o: !time ( -- ) \ start timer
F !time init-timer ;
+net2o: set-ip ( $:string -- ) \ set address information
$60 net2o: set-ip ( $:string -- ) \ set address information
$> setip-xt perform ;
+net2o: get-ip ( -- ) \ request address information
>sockaddr $, set-ip [: $, set-ip ;] n2oaddrs ;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment