[Spread-cvs] commit: r655 - in trunk: daemon examples libspread libspread-util/src
jschultz at spread.org
jschultz at spread.org
Fri Jan 17 14:24:50 EST 2014
Author: jschultz
Date: 2014-01-17 14:24:50 -0500 (Fri, 17 Jan 2014)
New Revision: 655
Modified:
trunk/daemon/configuration.c
trunk/daemon/groups.c
trunk/daemon/ip_enum.c
trunk/daemon/membership.c
trunk/daemon/membership.h
trunk/daemon/message.c
trunk/daemon/network.c
trunk/daemon/prot_body.h
trunk/daemon/protocol.c
trunk/daemon/session.c
trunk/daemon/spread.c
trunk/examples/user.c
trunk/libspread-util/src/data_link.c
trunk/libspread-util/src/events.c
trunk/libspread/fl.c
trunk/libspread/scatp.c
trunk/libspread/sp.c
Log:
Get rid of warnings from windows compile:
- un/signed comparisons
- prototypes of fcns called from event system
Modified: trunk/daemon/configuration.c
===================================================================
--- trunk/daemon/configuration.c 2014-01-17 19:23:08 UTC (rev 654)
+++ trunk/daemon/configuration.c 2014-01-17 19:24:50 UTC (rev 655)
@@ -357,7 +357,7 @@
strncat( segstr, "\n", strsize - curlen);
curlen += 1;
- if (curlen > strsize) {
+ if ((int) curlen > strsize) {
/* ran out of space in string -- should never happen. */
Alarmp( SPLOG_ERROR, CONF_SYS, "The conf hash string is too long! %d characters attemped is more then %d characters allowed", curlen, strsize);
Alarmp( SPLOG_ERROR, CONF_SYS, "The error occured when adding the version number. Successful string was: %s\n", segstr);
Modified: trunk/daemon/groups.c
===================================================================
--- trunk/daemon/groups.c 2014-01-17 19:23:08 UTC (rev 654)
+++ trunk/daemon/groups.c 2014-01-17 19:24:50 UTC (rev 655)
@@ -2142,7 +2142,7 @@
/* To have information about this group, we need to be able to fit
* its name, ID, and the number of daemons it has in this message. */
size_needed = GROUPS_BUF_GROUP_INFO_SIZE + Message_get_data_header_size();
- if( size_needed > GROUPS_BUF_SIZE - num_bytes ) break;
+ if( (int) size_needed > GROUPS_BUF_SIZE - num_bytes ) break;
memcpy( &buf[num_bytes], grp->name, MAX_GROUP_NAME );
num_bytes += MAX_GROUP_NAME;
@@ -2167,7 +2167,7 @@
size_needed = GROUPS_BUF_DAEMON_INFO_SIZE +
(stdskl_size(&dmn->MembersList) * MAX_GROUP_NAME) + Message_get_data_header_size();
/* This requires that the number of local group members be limited. */
- if( size_needed > GROUPS_BUF_SIZE - num_bytes )
+ if( (int) size_needed > GROUPS_BUF_SIZE - num_bytes )
{
couldnt_fit_daemon = 1;
break;
@@ -2315,7 +2315,7 @@
total_bytes = 0;
msg = mess_link->mess;
scat = Message_get_data_scatter(msg);
- for( i=0; i < scat->num_elements ; i++ )
+ for( i=0; i < (int) scat->num_elements ; i++ )
{
memcpy( &Temp_buf[total_bytes], scat->elements[i].buf, scat->elements[i].len );
total_bytes += scat->elements[i].len;
@@ -2341,7 +2341,7 @@
num_bytes += sset->size * sizeof(int32) ;
memcpy( &sset->proc_ids, synced_set_procs_ptr, sset->size * sizeof(int32) );
if( !Same_endian( head_ptr->type ) )
- for( i = 0; i < sset->size; ++i )
+ for( i = 0; i < (int) sset->size; ++i )
sset->proc_ids[i] = Flip_int32( sset->proc_ids[i] );
}
@@ -2700,14 +2700,14 @@
pn[proc_name_len] = '\0';
prvn = &name[1];
legal_private_name = 1;
- for( i=0; i < priv_name_len; i++ )
+ for( i=0; i < (int) priv_name_len; i++ )
if( prvn[i] <= '#' ||
prvn[i] > '~' )
{
legal_private_name = 0;
prvn[i] = '.';
}
- for( i=0; i < proc_name_len; i++ )
+ for( i=0; i < (int) proc_name_len; i++ )
if( pn[i] <= '#' ||
pn[i] > '~' )
{
@@ -2812,7 +2812,7 @@
int i, j = 0;
bool changed = FALSE;
- for( i = 0; i < s->size; ++i )
+ for( i = 0; i < (int) s->size; ++i )
if( Conf_id_in_conf( memb_p, s->proc_ids[i] ) >= 0 )
s->proc_ids[j++] = s->proc_ids[i];
/* If we lost members. */
@@ -2829,7 +2829,7 @@
int i;
proc p;
Alarmp( priority, GROUPS, "%s: Synced Set (with %u members):\n", func_name, s->size );
- for( i = 0; i < s->size; ++i ) {
+ for( i = 0; i < (int) s->size; ++i ) {
Conf_proc_by_id( s->proc_ids[i], &p );
Alarmp( priority, GROUPS, "%s: \t%s\n", func_name, p.name );
}
Modified: trunk/daemon/ip_enum.c
===================================================================
--- trunk/daemon/ip_enum.c 2014-01-17 19:23:08 UTC (rev 654)
+++ trunk/daemon/ip_enum.c 2014-01-17 19:24:50 UTC (rev 655)
@@ -34,6 +34,9 @@
#include <string.h>
+#include "ip_enum.h"
+#include "spu_alarm.h"
+
#ifndef ARCH_PC_WIN95
# include <netdb.h>
# include <net/if.h>
@@ -46,9 +49,6 @@
# include <WinSock2.h>
#endif
-#include "ip_enum.h"
-#include "spu_alarm.h"
-
#define MAX_IF 8192 /* max interfaces to look up */
#define MIN_IF 10 /* must be able to look up at least this many */
Modified: trunk/daemon/membership.c
===================================================================
--- trunk/daemon/membership.c 2014-01-17 19:23:08 UTC (rev 654)
+++ trunk/daemon/membership.c 2014-01-17 19:24:50 UTC (rev 655)
@@ -112,14 +112,14 @@
static void Memb_handle_foreign( sys_scatter *scat );
static void Memb_handle_form1 ( sys_scatter *scat );
static void Memb_handle_form2 ( sys_scatter *scat );
-static void Shift_to_op();
-static void Shift_to_seg();
-static void Gather_or_represented();
+static void Shift_to_op(int dmy, void *dmy_ptr);
+static void Shift_to_seg(int dmy, void *dmy_ptr);
+static void Gather_or_represented(int dmy, void *dmy_ptr);
static void Shift_to_gather();
static void Shift_to_represented();
-static void Form_or_fail();
-static void Scast_alive();
-static void Send_join();
+static void Form_or_fail(int dmy, void *dmy_ptr);
+static void Scast_alive(int dmy, void *dmy_ptr);
+static void Send_join(int dmy, void *dmy_ptr);
static int Insert_member( members_info *m, int32 proc_id );
static int Insert_rep( reps_info *r, rep_info rep );
static int32 Smallest_member( members_info *m, int *index );
@@ -141,7 +141,7 @@
int32 current_subnet;
int i, num_seg;
- Shift_to_op();
+ Shift_to_op(0, NULL);
GlobalStatus.membership_changes = 0;
My = Conf_my();
@@ -239,7 +239,7 @@
Send_pack.elements[0].len = sizeof(packet_header);
Send_pack.elements[0].buf = (char *)pack_ptr;
- Memb_token_loss();
+ Memb_token_loss(0, NULL);
}
void Memb_signal_conf_reload(void)
@@ -361,7 +361,7 @@
if( Conf_id_in_conf( &Membership, pack_ptr->proc_id ) != -1 )
{
/* sender belongs to my ring - my token is lost */
- Memb_token_loss();
+ Memb_token_loss(0, NULL);
/* update my F_members list */
Insert_member( &F_members, pack_ptr->proc_id );
}
@@ -390,7 +390,7 @@
if( ! Token_alive ) Insert_member( &F_members, pack_ptr->proc_id );
else if( Conf_id_in_conf( &Membership, pack_ptr->proc_id ) != -1 ){
/* sender belongs to my ring - my token is lost */
- Memb_token_loss();
+ Memb_token_loss(0, NULL);
/* update my F_members list */
Insert_member( &F_members, pack_ptr->proc_id );
}
@@ -413,7 +413,7 @@
*/
if( Conf_id_in_conf( &Future_membership, pack_ptr->proc_id ) != -1 )
{
- Memb_token_loss();
+ Memb_token_loss(0, NULL);
/* update my F_members list */
Insert_member( &F_members, pack_ptr->proc_id );
}
@@ -482,7 +482,7 @@
* packet which will force the membership change.
*/
if ( Conf_num_segments( Cn ) > 1 )
- Memb_token_loss();
+ Memb_token_loss(0, NULL);
}
break;
@@ -496,7 +496,7 @@
Shift_to_represented();
for( i=0; i < members_ptr->num_members; i++ )
if( members_ptr->members[i] == My.id ) break;
- Scast_alive( 1 );
+ Scast_alive( 1, NULL );
}else{
/* no need to remember this join */
}
@@ -517,7 +517,7 @@
E_queue( Shift_to_seg, 0, NULL, Rep_timeout );
for( i=0; i < members_ptr->num_members; i++ )
if( members_ptr->members[i] == My.id ) break;
- Scast_alive( 1 );
+ Scast_alive( 1, NULL );
}else{
/* if My_seg_rep is determined - send it to this guy */
/* My_seg_rep can be undetermined if it did not issue a join yet */
@@ -562,7 +562,7 @@
*/
if( Conf_id_in_conf( &Future_membership, pack_ptr->proc_id ) != -1 )
{
- Memb_token_loss();
+ Memb_token_loss(0, NULL);
/* update my F_members list */
Insert_member( &F_members, pack_ptr->proc_id );
}
@@ -640,7 +640,7 @@
}
if( Conf_leader( &Membership ) == My.id )
{
- Memb_lookup_new_members();
+ Memb_lookup_new_members(0, NULL);
}else if( Conf_seg_leader( &Membership, My.seg_index ) == My.id &&
(!Foreign_found) ){
/*
@@ -761,7 +761,7 @@
}
}
-void Memb_token_loss()
+void Memb_token_loss(int dmy, void *dmy_ptr)
{
rep_info temp_rep;
int i;
@@ -876,10 +876,10 @@
Conf_append_id_to_seg(&Membership.segments[My.seg_index], My.id);
Alarmp( SPLOG_WARNING, MEMB, "Memb_token_loss: ############### I lost my token, state was %d\n\n", State);
- Shift_to_seg();
+ Shift_to_seg(0, NULL);
}
-static void Shift_to_op()
+static void Shift_to_op(int dmy, void *dmy_ptr)
{
State = OP;
GlobalStatus.state = OP;
@@ -889,7 +889,7 @@
}
}
-static void Shift_to_seg()
+static void Shift_to_seg(int dmy, void *dmy_ptr)
{
State = SEG;
GlobalStatus.state = SEG;
@@ -901,7 +901,7 @@
E_queue( Gather_or_represented, 0, NULL, Seg_timeout );
}
-static void Gather_or_represented()
+static void Gather_or_represented(int dmy, void *dmy_ptr)
{
int dummy;
@@ -943,7 +943,7 @@
E_queue( Shift_to_seg, 0, NULL, Rep_timeout );
}
-static void Form_or_fail()
+static void Form_or_fail(int dmy, void *dmy_ptr)
{
rep_info temp_rep;
@@ -957,7 +957,7 @@
/* clear everything and go back to op */
E_dequeue( Send_join, 0, NULL);
E_queue( Memb_lookup_new_members, 0, NULL, Lookup_timeout );
- Shift_to_op();
+ Shift_to_op(0, NULL);
}else{
/* create and send form token */
Create_form1();
@@ -969,7 +969,7 @@
Alarm( MEMB, "Form_or_fail:failed, return to OP\n");
E_dequeue( Send_join, 0, NULL );
E_queue( Memb_lookup_new_members, 0, NULL, Lookup_timeout );
- Shift_to_op();
+ Shift_to_op(0, NULL);
}else{
Alarm( MEMB, "Form_or_fail: failed to gather\n");
/* failed to gather again */
@@ -1010,7 +1010,7 @@
E_queue( Scast_alive, 0, NULL, Alive_timeout );
}
-static void Send_join()
+static void Send_join(int dmy, void *dmy_ptr)
{
packet_header *pack_ptr;
int i;
@@ -1041,7 +1041,7 @@
E_queue( Send_join, 0, NULL, Join_timeout );
}
-void Memb_lookup_new_members()
+void Memb_lookup_new_members(int dmy, void *dmy_ptr)
{
packet_header *pack_ptr;
int num_missing;
@@ -2366,7 +2366,7 @@
printf("Membership id is ( %d, %d)\n", Membership_id.proc_id, Membership_id.time );
printf("%c", Conf_print( &Membership ) );
- Shift_to_op();
+ Shift_to_op(0, NULL);
}
void Flip_members( members_info *members_ptr )
Modified: trunk/daemon/membership.h
===================================================================
--- trunk/daemon/membership.h 2014-01-17 19:23:08 UTC (rev 654)
+++ trunk/daemon/membership.h 2014-01-17 19:24:50 UTC (rev 655)
@@ -57,8 +57,8 @@
int Memb_token_alive();
void Memb_handle_message( sys_scatter *scat );
void Memb_handle_token( sys_scatter *scat );
-void Memb_token_loss();
-void Memb_lookup_new_members();
+void Memb_token_loss(int dmy, void *dmy_ptr);
+void Memb_lookup_new_members(int dmy, void *dmy_ptr);
void Memb_signal_conf_reload();
void Memb_commit();
Modified: trunk/daemon/message.c
===================================================================
--- trunk/daemon/message.c 2014-01-17 19:23:08 UTC (rev 654)
+++ trunk/daemon/message.c 2014-01-17 19:24:50 UTC (rev 655)
@@ -57,7 +57,7 @@
{
int i;
msg->num_elements = MAX_SCATTER_ELEMENTS;
- for( i=0; i < msg->num_elements; i++ )
+ for( i=0; i < (int) msg->num_elements; i++ )
{
msg->elements[i].len = sizeof(packet_body);
msg->elements[i].buf = (char *) new(PACKET_BODY);
@@ -171,13 +171,13 @@
first_scat_index = 0;
}
/* if groups array didn't fit in first scat element, then copy it into Temp_buf */
- if( groups_bytes > scat->elements[first_scat_index].len )
+ if( groups_bytes > (int) scat->elements[first_scat_index].len )
{
num_bytes = 0;
- for( i=first_scat_index; i < scat->num_elements && num_bytes < groups_bytes; i++ )
+ for( i=first_scat_index; i < (int) scat->num_elements && num_bytes < groups_bytes; i++ )
{
int copy_bytes;
- if (groups_bytes - num_bytes < scat->elements[i].len)
+ if (groups_bytes - num_bytes < (int) scat->elements[i].len)
copy_bytes = groups_bytes - num_bytes;
else
copy_bytes = scat->elements[i].len;
@@ -253,7 +253,7 @@
packet_body *body_ptr;
int i;
- for( i=0; i < msg->num_elements; i++ )
+ for( i=0; i < (int) msg->num_elements; i++ )
{
body_ptr = (packet_body *)msg->elements[i].buf;
dispose( body_ptr );
@@ -299,7 +299,7 @@
message_obj *tmp_scat;
tmp_scat = new( SCATTER );
tmp_scat->num_elements = msg->num_elements;
- for( i=0; i < msg->num_elements; i++ )
+ for( i=0; i < (int) msg->num_elements; i++ )
{
tmp_scat->elements[i].len = msg->elements[i].len;
tmp_scat->elements[i].buf = (char *)new( PACKET_BODY );
@@ -333,11 +333,11 @@
return;
}
copied_bytes = 0;
- for( i=0; i < scat->num_elements ; i++ )
+ for( i=0; i < (int) scat->num_elements ; i++ )
{
if ( 0 == i ) {
bytes_to_copy = num_bytes;
- if( bytes_to_copy > ( sizeof( packet_body ) - head_size ) )
+ if( bytes_to_copy > (int) ( sizeof( packet_body ) - head_size ) )
bytes_to_copy = sizeof( packet_body ) - head_size ;
memcpy( &scat->elements[i].buf[head_size], &buf[ 0 ], bytes_to_copy );
scat->elements[i].len += bytes_to_copy;
@@ -427,9 +427,9 @@
{
int i, len;
len = len_sent;
- for( i=0; i < msg->num_elements; i++ )
+ for( i=0; i < (int) msg->num_elements; i++ )
{
- if( len < msg->elements[i].len ) break;
+ if( len < (int) msg->elements[i].len ) break;
len -= msg->elements[i].len;
}
cur_msg->cur_element = i;
Modified: trunk/daemon/network.c
===================================================================
--- trunk/daemon/network.c 2014-01-17 19:23:08 UTC (rev 654)
+++ trunk/daemon/network.c 2014-01-17 19:24:50 UTC (rev 655)
@@ -428,7 +428,7 @@
/* saving scat lens for another DL_recv */
save.num_elements = scat->num_elements;
- for( i=0; i < save.num_elements; i++ )
+ for( i=0; i < (int) save.num_elements; i++ )
save.elements[i].len = scat->elements[i].len;
/* computing true scat lens for sending */
@@ -436,7 +436,7 @@
i = 0;
while ( bytes_left > 0 )
{
- if( bytes_left < scat->elements[i].len )
+ if( bytes_left < (int) scat->elements[i].len )
scat->elements[i].len = bytes_left;
bytes_left -= scat->elements[i].len;
i ++;
@@ -454,7 +454,7 @@
/* restoring scat lens for another DL_recv */
scat->num_elements = save.num_elements;
- for( i=0; i < save.num_elements; i++ )
+ for( i=0; i < (int) save.num_elements; i++ )
scat->elements[i].len = save.elements[i].len;
}
Modified: trunk/daemon/prot_body.h
===================================================================
--- trunk/daemon/prot_body.h 2014-01-17 19:23:08 UTC (rev 654)
+++ trunk/daemon/prot_body.h 2014-01-17 19:24:50 UTC (rev 655)
@@ -98,7 +98,7 @@
ext sp_time Lookup_timeout;
ext int Wide_network;
-void Prot_token_hurry();
+void Prot_token_hurry(int dmy, void *dmy_ptr);
void Discard_packets();
void Prot_initiate_conf_reload( int code, void *data );
bool Prot_need_conf_reload( void );
Modified: trunk/daemon/protocol.c
===================================================================
--- trunk/daemon/protocol.c 2014-01-17 19:23:08 UTC (rev 654)
+++ trunk/daemon/protocol.c 2014-01-17 19:24:50 UTC (rev 655)
@@ -98,8 +98,8 @@
static down_queue Protocol_down_queue[2]; /* only used in spread3 */
-static void Prot_handle_bcast();
-static void Prot_handle_token();
+static void Prot_handle_bcast(int fd, int dmy, void *dmy_ptr);
+static void Prot_handle_token(int fd, int dmy, void *dmy_ptr);
static int Answer_retrans( int *ret_new_ptr, int32 *proc_id, int16 *seg_index );
static int Send_new_packets( int num_allowed );
static int Prot_queue_bcast( sys_scatter *send_pack_ptr, packet_queue *pack_queue );
@@ -390,7 +390,7 @@
processed_bytes += padding_bytes;
/* Sanity check for packet validity */
- if( processed_bytes + sizeof(fragment_header) > pack_ptr->data_len )
+ if( processed_bytes + (int) sizeof(fragment_header) > pack_ptr->data_len )
{
Alarm( PRINT, "Prot_handle_bcast: invalid packet with seq %d from %d, fragments exceed data_len %d %d\n",
pack_ptr->transmiter_id, pack_ptr->seq, processed_bytes, pack_ptr->data_len );
@@ -571,7 +571,7 @@
Alarm( PROTOCOL,
"Prot_handle_token: not leader, asked to retrans %d %d\n",
Get_arq(Token->type), val );
- Prot_token_hurry();
+ Prot_token_hurry(0, NULL);
}else{
Alarm( PROTOCOL,
"Prot_handle_token: not leader, swallow same token %d %d\n",
@@ -813,7 +813,7 @@
Alarmp( SPLOG_ERROR, PRINT, "\trtr_len: %d\n", Last_token->rtr_len );
Alarmp( SPLOG_ERROR, PRINT, "\tconf_hash: %d\n", Last_token->conf_hash );
- Memb_token_loss();
+ Memb_token_loss(0, NULL);
}
GlobalStatus.highest_seq = Highest_seq;
@@ -1094,7 +1094,7 @@
/* Advance the down queue and set the fragment index for the fragment
* just added to the packet. */
Down_queue_ptr->cur_element++;
- if( Down_queue_ptr->cur_element < scat_ptr->num_elements )
+ if( Down_queue_ptr->cur_element < (int) scat_ptr->num_elements )
{
/* not last packet in message */
frag_ptr->fragment_index = Down_queue_ptr->cur_element;
@@ -1613,7 +1613,7 @@
* so we need not to dispose them!
*/
up_ptr = &Up_queue[proc_index];
- for( i=0; i < up_ptr->mess->num_elements; i++ )
+ for( i=0; i < (int) up_ptr->mess->num_elements; i++ )
{
body_ptr = (packet_body *)up_ptr->mess->elements[i].buf;
dispose( body_ptr );
@@ -1745,12 +1745,12 @@
* to send.
*/
Token_counter = 0;
- Prot_token_hurry();
+ Prot_token_hurry(0, NULL);
}
}
}
-void Prot_token_hurry()
+void Prot_token_hurry(int dmy, void *dmy_ptr)
{
/* asked to send token again (almost lost) */
Modified: trunk/daemon/session.c
===================================================================
--- trunk/daemon/session.c 2014-01-17 19:23:08 UTC (rev 654)
+++ trunk/daemon/session.c 2014-01-17 19:24:50 UTC (rev 655)
@@ -1284,7 +1284,7 @@
{
packet_index = Sessions[ses].read.cur_element;
byte_index = Sessions[ses].read.cur_byte;
- if (packet_index >= scat->num_elements)
+ if (packet_index >= (int) scat->num_elements)
{
/* We are beginning a new fragment -- so allocate it */
assert(byte_index == 0);
@@ -1563,7 +1563,7 @@
Obj_Inc_Refcount(msg);
scat = Message_get_data_scatter(msg);
- for( total_to_send=0, i=0; i < scat->num_elements; i++ )
+ for( total_to_send=0, i=0; i < (int) scat->num_elements; i++ )
total_to_send += scat->elements[i].len;
/* since also sending message_header */
@@ -1615,7 +1615,7 @@
goto end_write;
}
/* send the message after first buffer*/
- for( i=1; i < scat->num_elements; i++ )
+ for( i=1; i < (int) scat->num_elements; i++ )
{
ret = send( Sessions[ses].mbox, scat->elements[i].buf,
scat->elements[i].len, 0);
@@ -1722,7 +1722,7 @@
{
scat = Message_get_data_scatter(msg);
for( i=Sessions[ses].write.cur_element, from=Sessions[ses].write.cur_byte;
- i < scat->num_elements;
+ i < (int) scat->num_elements;
i++, from=0 )
{
bytes_to_send = scat->elements[i].len - from;
Modified: trunk/daemon/spread.c
===================================================================
--- trunk/daemon/spread.c 2014-01-17 19:23:08 UTC (rev 654)
+++ trunk/daemon/spread.c 2014-01-17 19:24:50 UTC (rev 655)
@@ -77,7 +77,11 @@
/* acp-permit.c: */
void permit_init(void);
+#ifdef USE_SPREAD_MAIN
+int SpreadMain(int argc, char *argv[])
+#else
int main(int argc, char *argv[])
+#endif
{
#ifdef ARCH_PC_WIN95
int ret;
Modified: trunk/examples/user.c
===================================================================
--- trunk/examples/user.c 2014-01-17 19:23:08 UTC (rev 654)
+++ trunk/examples/user.c 2014-01-17 19:24:50 UTC (rev 655)
@@ -514,7 +514,7 @@
SP_error( ret );
exit( 1 );
}
- for( j = 0; j < vssets[i].num_members; j++ )
+ for( j = 0; j < (int) vssets[i].num_members; j++ )
printf("\t%s\n", members[j] );
}
}
Modified: trunk/libspread/fl.c
===================================================================
--- trunk/libspread/fl.c 2014-01-17 19:23:08 UTC (rev 654)
+++ trunk/libspread/fl.c 2014-01-17 19:24:50 UTC (rev 655)
@@ -1209,7 +1209,7 @@
if (fix_scat) { /* I modified user's scatter: I need to restore it */
--scat->num_elements;
if (ret >= 0) { /* successful return: need to adjust err to ignore appendings */
- if (ret >= scat->elements[scat->num_elements].len)
+ if (ret >= (int) scat->elements[scat->num_elements].len)
ret -= scat->elements[scat->num_elements].len;
else
stderr_output(STDERR_ABORT, 0,"(%s, %d): mbox %d: serv 0x%X: group '%s': SP_multicast returned %d\n",
@@ -1619,7 +1619,7 @@
handle_next_memb_change(conn, group, m);
}
/* if new members have already died (after they sent their floks): deliver TRANS */
- if (stdhash_size(&group->fl_view->curr_membs) < group->fl_view->orig_num_membs) {
+ if ((int) stdhash_size(&group->fl_view->curr_membs) < group->fl_view->orig_num_membs) {
DEBUG(std_stkfprintf(stderr, 0, "New view members have already died! Deliver TRANS!\n"));
assert(!group->fl_view->in_trans_memb);
group->fl_view->in_trans_memb = 1;
@@ -1634,17 +1634,17 @@
stddll_clear(&group->mess_queue); /* empty postponed vulnerable queue */
} else
assert(!spc->memb_mess_recvd ||
- stdhash_size(&spc->flok_senders) < spc->memb_info->orig_num_membs);
+ (int) stdhash_size(&spc->flok_senders) < spc->memb_info->orig_num_membs);
break;
case AUTHORIZE:
assert(group->curr_change != 0 && group->curr_change->memb_mess_recvd);
assert(!spc->memb_mess_recvd ||
- stdhash_size(&spc->flok_senders) < spc->memb_info->orig_num_membs);
+ (int) stdhash_size(&spc->flok_senders) < spc->memb_info->orig_num_membs);
break;
case STEADY: case VERIFY:
assert(group->curr_change == 0);
assert(!spc->memb_mess_recvd ||
- stdhash_size(&spc->flok_senders) < spc->memb_info->orig_num_membs);
+ (int) stdhash_size(&spc->flok_senders) < spc->memb_info->orig_num_membs);
break;
default: stderr_output(STDERR_ABORT, 0,"(%s, %d): impossible vstate %d\n", __FILE__, __LINE__, group->vstate);
}
@@ -2022,7 +2022,7 @@
stderr_output(STDERR_ABORT, 0,"(%s, %d): malloc(%d)\n", __FILE__, __LINE__, num_membs * MAX_GROUP_NAME);
err = SP_scat_get_vs_set_members( m->scat_mess, &m_info.my_vs_set, members, num_membs);
assert(err == num_membs);
- for (i = 0; i < num_membs; ++i) { /* remove members that came with me: leaves who left */
+ for (i = 0; i < (int) num_membs; ++i) { /* remove members that came with me: leaves who left */
members[i][MAX_GROUP_NAME -1] = 0;
err = stdhash_size(leavers);
stdhash_erase_key(leavers, &(members[i][0]));
Modified: trunk/libspread/scatp.c
===================================================================
--- trunk/libspread/scatp.c 2014-01-17 19:23:08 UTC (rev 654)
+++ trunk/libspread/scatp.c 2014-01-17 19:24:50 UTC (rev 655)
@@ -62,7 +62,7 @@
if (scat->num_elements > MAX_CLIENT_SCATTER_ELEMENTS)
return ILLEGAL_MESSAGE;
- for (i = 0; i < scat->num_elements && scat->elements[i].len == 0; ++i);
+ for (i = 0; i < (int) scat->num_elements && scat->elements[i].len == 0; ++i);
pos->scat = (scatter*) scat;
pos->elem_ind = i;
@@ -100,8 +100,8 @@
return (scat->num_elements <= MAX_CLIENT_SCATTER_ELEMENTS &&
(scatp_is_end(pos) ||
- (pos->elem_ind >= 0 && pos->elem_ind < scat->num_elements &&
- pos->buff_ind >= 0 && pos->buff_ind < scat->elements[pos->elem_ind].len)));
+ (pos->elem_ind >= 0 && pos->elem_ind < (int) scat->num_elements &&
+ pos->buff_ind >= 0 && pos->buff_ind < (int) scat->elements[pos->elem_ind].len)));
}
int scatp_is_not_legal(const scatp *pos)
@@ -110,8 +110,8 @@
return (scat->num_elements > MAX_CLIENT_SCATTER_ELEMENTS ||
(!scatp_is_end(pos) &&
- (pos->elem_ind < 0 || pos->elem_ind >= scat->num_elements ||
- pos->buff_ind < 0 || pos->buff_ind >= scat->elements[pos->elem_ind].len)));
+ (pos->elem_ind < 0 || pos->elem_ind >= (int) scat->num_elements ||
+ pos->buff_ind < 0 || pos->buff_ind >= (int) scat->elements[pos->elem_ind].len)));
}
int scatp_is_end(const scatp *pos)
@@ -196,7 +196,7 @@
elem_ind = pos->elem_ind + 1;
skip_bytes = num_bytes - tmp; /* how many bytes left to skip */
- for (; elem_ind < scat->num_elements; ++elem_ind) {
+ for (; elem_ind < (int) scat->num_elements; ++elem_ind) {
/* use < 0 because it jumps over any zero length buffers */
if ((skip_bytes -= scat->elements[elem_ind].len) < 0) {
skip_bytes += scat->elements[elem_ind].len; /* restore to positive */
@@ -345,7 +345,7 @@
bytes_left = num_bytes;
- while (dst_elem < dscat->num_elements && src_elem < sscat->num_elements && bytes_left) {
+ while (dst_elem < (int) dscat->num_elements && src_elem < (int) sscat->num_elements && bytes_left) {
dst_left = dst_end - dst_curr;
src_left = src_end - src_curr;
copy_size = (dst_left < src_left) ? dst_left : src_left;
@@ -362,8 +362,8 @@
if (copy_size != dst_left)
dst_curr += copy_size;
else {
- while (++dst_elem < dscat->num_elements && dscat->elements[dst_elem].len == 0);
- if (dst_elem < dscat->num_elements) {
+ while (++dst_elem < (int) dscat->num_elements && dscat->elements[dst_elem].len == 0);
+ if (dst_elem < (int) dscat->num_elements) {
dst_curr = dscat->elements[dst_elem].buf;
dst_end = dscat->elements[dst_elem].buf + dscat->elements[dst_elem].len;
}
@@ -371,8 +371,8 @@
if (copy_size != src_left)
src_curr += copy_size;
else {
- while (++src_elem < sscat->num_elements && sscat->elements[src_elem].len == 0);
- if (src_elem < sscat->num_elements) {
+ while (++src_elem < (int) sscat->num_elements && sscat->elements[src_elem].len == 0);
+ if (src_elem < (int) sscat->num_elements) {
src_curr = sscat->elements[src_elem].buf;
src_end = sscat->elements[src_elem].buf + sscat->elements[src_elem].len;
}
Modified: trunk/libspread/sp.c
===================================================================
--- trunk/libspread/sp.c 2014-01-17 19:23:08 UTC (rev 654)
+++ trunk/libspread/sp.c 2014-01-17 19:24:50 UTC (rev 655)
@@ -959,7 +959,7 @@
len = strlen( group );
if ( len == 0 ) return( ILLEGAL_GROUP );
if ( len >= MAX_GROUP_NAME ) return( ILLEGAL_GROUP );
- for( i=0; i < len; i++ )
+ for( i=0; i < (int) len; i++ )
if( group[i] < 36 || group[i] > 126 ) return( ILLEGAL_GROUP );
send_group[MAX_GROUP_NAME-1]=0;
@@ -980,8 +980,8 @@
len = strlen( group );
if ( len == 0 ) return( ILLEGAL_GROUP );
- if ( len >= MAX_GROUP_NAME ) return( ILLEGAL_GROUP );
- for( i=0; i < len; i++ )
+ if ( (int) len >= MAX_GROUP_NAME ) return( ILLEGAL_GROUP );
+ for( i=0; i < (int) len; i++ )
if( group[i] < 36 || group[i] > 126 ) return( ILLEGAL_GROUP );
send_group[MAX_GROUP_NAME-1]=0;
@@ -1098,7 +1098,7 @@
Mutex_unlock( &Struct_mutex );
- for( i=0, mess_len=0; i < scat_mess->num_elements; i++ )
+ for( i=0, mess_len=0; i < (int) scat_mess->num_elements; i++ )
{
mess_len += scat_mess->elements[i].len;
}
@@ -1120,7 +1120,7 @@
memcpy( group_ptr, groups, MAX_GROUP_NAME * num_groups );
Mutex_lock( &Sessions[ses].send_mutex );
- for ( buf_len = 0; buf_len < sizeof(message_header)+MAX_GROUP_NAME*num_groups; buf_len += ret)
+ for ( buf_len = 0; buf_len < (int) sizeof(message_header)+MAX_GROUP_NAME*num_groups; buf_len += ret)
{
while(((ret=send( mbox, &head_buf[buf_len], sizeof(message_header)+MAX_GROUP_NAME*num_groups - buf_len, 0 )) == -1)
&& ((sock_errno == EINTR) || (sock_errno == EAGAIN) || (sock_errno == EWOULDBLOCK)) )
@@ -1143,9 +1143,9 @@
return( CONNECTION_CLOSED );
}
}
- for( len=0, i=0; i < scat_mess->num_elements; len+=buf_len, i++ )
+ for( len=0, i=0; i < (int) scat_mess->num_elements; len+=buf_len, i++ )
{
- for ( buf_len = 0; buf_len < scat_mess->elements[i].len; buf_len += ret)
+ for ( buf_len = 0; buf_len < (int) scat_mess->elements[i].len; buf_len += ret)
{
while(((ret=send( mbox, &scat_mess->elements[i].buf[buf_len], scat_mess->elements[i].len - buf_len, 0 )) == -1)
&& ((sock_errno == EINTR) || (sock_errno == EAGAIN) || (sock_errno == EWOULDBLOCK)) )
@@ -1317,7 +1317,7 @@
}
}
- for( max_mess_len = 0, i=0; i < scat_mess->num_elements; i++ ) {
+ for( max_mess_len = 0, i=0; i < (int) scat_mess->num_elements; i++ ) {
max_mess_len += scat_mess->elements[i].len;
}
@@ -1543,9 +1543,9 @@
*/
/* calculate scat_index and byte_index based on ret and scat_mess */
- for( byte_index=ret, scat_index=0; scat_index < scat_mess->num_elements; scat_index++ )
+ for( byte_index=ret, scat_index=0; scat_index < (int) scat_mess->num_elements; scat_index++ )
{
- if( scat_mess->elements[scat_index].len > byte_index ) break;
+ if( (int) scat_mess->elements[scat_index].len > byte_index ) break;
byte_index -= scat_mess->elements[scat_index].len;
}
@@ -1626,7 +1626,7 @@
for( bytes_index = 0, scat = 0 ; bytes_index < flip_size ; bytes_index += bytes_to_copy )
{
bytes_to_copy = flip_size - bytes_index;
- if( bytes_to_copy > scat_mess->elements[scat].len )
+ if( bytes_to_copy > (int) scat_mess->elements[scat].len )
bytes_to_copy = scat_mess->elements[scat].len;
memcpy( &groups_buf[bytes_index], scat_mess->elements[scat].buf, bytes_to_copy );
if( bytes_to_copy == scat_mess->elements[scat].len )
@@ -1658,15 +1658,15 @@
for( bytes_index = 0, j = 0 ; bytes_index < flip_size ; j++, bytes_index += bytes_to_copy )
{
bytes_to_copy = flip_size - bytes_index;
- if( bytes_to_copy > scat_mess->elements[j].len )
+ if( bytes_to_copy > (int) scat_mess->elements[j].len )
bytes_to_copy = scat_mess->elements[j].len;
memcpy( scat_mess->elements[j].buf, &groups_buf[bytes_index], bytes_to_copy );
}
- for( i = 0; i < num_vs_sets; ++i )
+ for( i = 0; i < (int) num_vs_sets; ++i )
{
while( total_index < target_index )
{
- if( target_index - total_index < scat_mess->elements[scat].len - scat_index )
+ if( target_index - total_index < (int) scat_mess->elements[scat].len - scat_index )
{
scat_index += target_index - total_index;
total_index = target_index;
@@ -1684,7 +1684,7 @@
for( bytes_index = 0 ; bytes_index < flip_size ; bytes_index += bytes_to_copy )
{
bytes_to_copy = flip_size - bytes_index;
- if( bytes_to_copy > scat_mess->elements[scat].len - scat_index )
+ if( bytes_to_copy > (int) scat_mess->elements[scat].len - scat_index )
bytes_to_copy = scat_mess->elements[scat].len - scat_index;
memcpy( &groups_buf[bytes_index], &(scat_mess->elements[scat].buf[scat_index]),
bytes_to_copy );
@@ -1706,7 +1706,7 @@
j++, bytes_index += bytes_to_copy )
{
bytes_to_copy = flip_size - bytes_index;
- if( bytes_to_copy > scat_mess->elements[j].len - first_scat_index )
+ if( bytes_to_copy > (int) scat_mess->elements[j].len - first_scat_index )
bytes_to_copy = scat_mess->elements[j].len - first_scat_index;
memcpy( &(scat_mess->elements[j].buf[first_scat_index]),
&groups_buf[bytes_index], bytes_to_copy );
@@ -1882,14 +1882,14 @@
actual_num_vs_sets = *((int32u *)&memb_mess[SP_get_num_vs_sets_offset_memb_mess()]);
- if (num_vs_sets < actual_num_vs_sets)
+ if (num_vs_sets < (int) actual_num_vs_sets)
return(BUFFER_TOO_SHORT);
local_vs_set_offset = *((int32u *)&memb_mess[SP_get_offset_to_local_vs_set_offset()]);
local_vs_set_offset += SP_get_first_vs_set_offset_memb_mess();
memb_offset = SP_get_first_vs_set_offset_memb_mess();
- for ( i=0; i < actual_num_vs_sets; i++, vs_sets++ )
+ for ( i=0; i < (int) actual_num_vs_sets; i++, vs_sets++ )
{
if (memb_offset == local_vs_set_offset)
*my_vs_set_index = i;
@@ -1909,11 +1909,11 @@
int i;
const char *members_ptr;
- if (member_names_count < vs_set->num_members)
+ if (member_names_count < (int) vs_set->num_members)
return(BUFFER_TOO_SHORT);
members_ptr = &memb_mess[vs_set->members_offset];
- for ( i=0; i < vs_set->num_members; i++, members_ptr += MAX_GROUP_NAME )
+ for ( i=0; i < (int) vs_set->num_members; i++, members_ptr += MAX_GROUP_NAME )
{
memcpy(&member_names[i][0], members_ptr, MAX_GROUP_NAME);
}
@@ -1926,7 +1926,7 @@
scat = 0;
scat_index = 0;
- while(start_byte > msg->elements[scat].len)
+ while(start_byte > (int) msg->elements[scat].len)
{
scat++;
start_byte -= msg->elements[scat].len;
@@ -1935,7 +1935,7 @@
for( bytes_index = 0; bytes_index < copy_size ; bytes_index += bytes_to_copy )
{
bytes_to_copy = copy_size - bytes_index;
- if( bytes_to_copy > msg->elements[scat].len - scat_index )
+ if( bytes_to_copy > (int) msg->elements[scat].len - scat_index )
bytes_to_copy = msg->elements[scat].len - scat_index;
memcpy( dest_ptr, &(msg->elements[scat].buf[scat_index]), bytes_to_copy );
if( bytes_to_copy == msg->elements[scat].len - scat_index )
@@ -1994,7 +1994,7 @@
scat_read( &actual_num_vs_sets, memb_mess_scat, SP_get_num_vs_sets_offset_memb_mess(), sizeof( int32u ) );
- if (num_vs_sets < actual_num_vs_sets)
+ if (num_vs_sets < (int) actual_num_vs_sets)
return(BUFFER_TOO_SHORT);
scat_read( &local_vs_set_offset, memb_mess_scat, SP_get_offset_to_local_vs_set_offset(), sizeof( int32u ) );
@@ -2018,7 +2018,7 @@
char member_names[][MAX_GROUP_NAME],
int member_names_count)
{
- if (member_names_count < vs_set->num_members)
+ if (member_names_count < (int) vs_set->num_members)
return(BUFFER_TOO_SHORT);
scat_read( member_names, memb_mess_scat, vs_set->members_offset, vs_set->num_members * MAX_GROUP_NAME);
Modified: trunk/libspread-util/src/data_link.c
===================================================================
--- trunk/libspread-util/src/data_link.c 2014-01-17 19:23:08 UTC (rev 654)
+++ trunk/libspread-util/src/data_link.c 2014-01-17 19:24:50 UTC (rev 655)
@@ -246,7 +246,7 @@
msg.msg_accrightslen = 0;
#endif /* ARCH_SCATTER_ACCRIGHTS */
- for( i=0, total_len=0; i < scat->num_elements; i++)
+ for( i=0, total_len=0; i < (int) scat->num_elements; i++)
{
#ifdef ARCH_SCATTER_NONE
memcpy( &pseudo_scat[total_len], scat->elements[i].buf,
@@ -281,7 +281,7 @@
}
if (ret < 0)
{
- for( i=0; i < scat->num_elements; i++)
+ for( i=0; i < (int) scat->num_elements; i++)
Alarm( DATA_LINK, "DL_send: element[%d]: %d bytes\n",
i,scat->elements[i].len);
Alarm( DATA_LINK, "DL_send: error: %s\n sending %d bytes on channel %d to address " IPF "\n",
@@ -346,7 +346,7 @@
#else /* ARCH_SCATTER_NONE */
total_len = 0; /*This is for TCP, to not receive*/
- for(i=0; i<scat->num_elements; i++) /*more than one packet. */
+ for(i=0; i < (int) scat->num_elements; i++) /*more than one packet. */
total_len += scat->elements[i].len;
if(total_len>MAX_PACKET_SIZE)
Modified: trunk/libspread-util/src/events.c
===================================================================
--- trunk/libspread-util/src/events.c 2014-01-17 19:23:08 UTC (rev 654)
+++ trunk/libspread-util/src/events.c 2014-01-17 19:24:50 UTC (rev 655)
@@ -177,8 +177,8 @@
_ftime( &timebuffer );
- t.sec = timebuffer.time;
- t.usec = timebuffer.millitm;
+ t.sec = (long) timebuffer.time;
+ t.usec = (long) timebuffer.millitm;
t.usec *= 1000;
#endif /* ARCH_PC_WIN95 */
More information about the Spread-cvs
mailing list