Minix/minix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Alignement on netbsd types, part 1

Browse Source 
The following types are modified (old -> new):
 * _BSD_USECONDS_T_ int       -> unsigned int
 * __socklen_t      __int32_t -> __uint32_t
 * blksize_t        uint32_t  -> int32_t
 * rlim_t           uint32_t  -> uint64_t
On ARM:
 * _BSD_CLOCK_T_    int       -> unsigned int
On Intel:
 * _BSD_CLOCK_T_    int       -> unsigned long

bin/cat is also updated in order to fix warnings.

_BSD_TIMER_T_ has still to be aligned.

Change-Id: I2b4fda024125a19901120546c4e22e443ba5e9d7
This commit is contained in:
sambuc
2014-02-18 11:25:01 +01:00
parent e8e506f2a0
commit 744378194d
28 changed files with 130 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files
servers/inet/clock.c
+4 -4
View File
@@ -14,8 +14,8 @@ THIS_FILE
int clck_call_expire;
static time_t curr_time;
static time_t prev_time;
static clock_t curr_time;
static clock_t prev_time;
static timer_t *timer_chain;
static time_t next_timeout;
@@ -43,7 +43,7 @@ time_t get_time()
}
void set_time (tim)
time_t tim;
clock_t tim;
{
if (!curr_time && tim >= prev_time)
{
@@ -54,7 +54,7 @@ time_t tim;
}
else if (!curr_time)
{
DBLOCK(0x20, printf("set_time: new time %i < prev_time %i\n",
DBLOCK(0x20, printf("set_time: new time %lu < prev_time %lu\n",
tim, prev_time));
}
}
servers/inet/generic/clock.h
+1 -1
View File
@@ -23,7 +23,7 @@ typedef struct timer
extern int clck_call_expire; /* Call clck_expire_timer from the mainloop */
void clck_init ARGS(( void ));
void set_time ARGS(( time_t time ));
void set_time ARGS(( clock_t time ));
time_t get_time ARGS(( void ));
void reset_time ARGS(( void ));
/* set a timer to go off at the time specified by timeout */
servers/inet/generic/tcp_send.c
+12 -11
View File
@@ -576,9 +576,10 @@ void tcp_release_retrans(
artt= tcp_conn->tc_artt;
artt= ((TCP_RTT_SMOOTH-1)*artt+srtt)/TCP_RTT_SMOOTH;
srtt -= artt;
if (srtt < 0)
srtt= -srtt;
if (srtt < artt)
srtt = artt - srtt;
else
srtt -= artt;
drtt= tcp_conn->tc_drtt;
drtt= ((TCP_RTT_SMOOTH-1)*drtt+srtt)/TCP_RTT_SMOOTH;
@@ -603,13 +604,13 @@ void tcp_release_retrans(
rtt= TCP_RTT_MAX;
}
DBLOCK(0x10, printf(
"tcp_release_retrans, conn[%i]: retrans_time= %i ms, rtt = %i ms\n",
"tcp_release_retrans, conn[%i]: retrans_time= %lu ms, rtt = %lu ms\n",
tcp_conn-tcp_conn_table,
retrans_time*1000/HZ,
rtt*1000/HZ));
DBLOCK(0x10, printf(
"tcp_release_retrans: artt= %i -> %i, drtt= %i -> %i\n",
"tcp_release_retrans: artt= %lu -> %lu, drtt= %lu -> %lu\n",
tcp_conn->tc_artt, artt,
tcp_conn->tc_drtt, drtt));
@@ -864,7 +865,7 @@ struct timer *timer;
tcp_conn->tc_ka_snd= tcp_conn->tc_SND_NXT;
tcp_conn->tc_ka_rcv= tcp_conn->tc_RCV_NXT;
DBLOCK(0x20, printf(
"tcp_send_timeout: conn[%i] setting keepalive timer (+%i ms)\n",
"tcp_send_timeout: conn[%i] setting keepalive timer (+%lu ms)\n",
tcp_conn-tcp_conn_table,
tcp_conn->tc_ka_time*1000/HZ));
clck_timer(&tcp_conn->tc_transmit_timer,
@@ -919,7 +920,7 @@ struct timer *timer;
tcp_conn->tc_0wnd_to= 0;
DBLOCK(0x20, printf(
"tcp_send_timeout: conn[%i] setting timer to %i ms (+%i ms)\n",
"tcp_send_timeout: conn[%i] setting timer to %lu ms (+%lu ms)\n",
tcp_conn-tcp_conn_table,
(curr_time+rtt)*1000/HZ, rtt*1000/HZ));
@@ -954,7 +955,7 @@ struct timer *timer;
tcp_conn->tc_rt_seq= 0;
DBLOCK(0x10, printf(
"tcp_send_timeout: conn[%i] setting timer to %i ms (+%i ms)\n",
"tcp_send_timeout: conn[%i] setting timer to %lu ms (+%lu ms)\n",
tcp_conn-tcp_conn_table,
(curr_time+tcp_conn->tc_0wnd_to)*1000/HZ,
tcp_conn->tc_0wnd_to*1000/HZ));
@@ -974,7 +975,7 @@ struct timer *timer;
* probe, which is almost the same.
*/
DBLOCK(0x20, printf("tcp_send_timeout: conn[%i] una= %lu, rtt= %ims\n",
DBLOCK(0x20, printf("tcp_send_timeout: conn[%i] una= %lu, rtt= %lu ms\n",
tcp_conn-tcp_conn_table,
(unsigned long)tcp_conn->tc_SND_UNA, rtt*1000/HZ));
@@ -1030,7 +1031,7 @@ struct timer *timer;
timeout += curr_time;
DBLOCK(0x20, printf(
"tcp_send_timeout: conn[%i] setting timer to %i ms (+%i ms)\n",
"tcp_send_timeout: conn[%i] setting timer to %lu ms (+%lu ms)\n",
tcp_conn-tcp_conn_table, timeout*1000/HZ,
(timeout-curr_time)*1000/HZ));
@@ -1285,7 +1286,7 @@ tcp_conn_t *tcp_conn;
rtt= tcp_conn->tc_rtt;
DBLOCK(0x20, printf(
"tcp_set_send_timer: conn[%i] setting timer to %i ms (+%i ms)\n",
"tcp_set_send_timer: conn[%i] setting timer to %lu ms (+%lu ms)\n",
tcp_conn-tcp_conn_table,
(curr_time+rtt)*1000/HZ, rtt*1000/HZ));