[PATCH] smsc_cimd2.c sleep times
Hi list,
something mysterious has happend after commiting cimd2_smsc2.c patches
written by Angel Fradejas. there were problems with sleep times and Angel
wrote the final patch (file was called cimd2_fix2.diff) and it was
commited by Stipe. recently I did cvs update and seems like most recent
fix wasn't applied or was applied incorrectly?
attached patch fixes these sleep times (it's made with older
smsc_cimd2.c).
if I'm wrong, Stipe and Angel, please correct me.
it's my first patch don't even written by myself, so corrections are
welcome :)
regards,
Dziugas BaltrunasIndex: gw/smsc/smsc_cimd2.c
===
RCS file: /home/cvs/gateway/gw/smsc/smsc_cimd2.c,v
retrieving revision 1.8
diff -u -r1.8 smsc_cimd2.c
--- gw/smsc/smsc_cimd2.c27 Mar 2003 09:09:10 - 1.8
+++ gw/smsc/smsc_cimd2.c31 Mar 2003 09:28:32 -
@@ -2068,7 +2068,7 @@
Msg *msg;
SMSCConn *conn = arg;
PrivData *pdata = conn-data;
-doublesleep;
+doublesleep = 0.0001;
/* Make sure we log into our own log-file if defined */
log_thread_to(conn-log_idx);
@@ -2097,8 +2097,6 @@
mutex_unlock(conn-flow_mutex);
}
-sleep = 0.0001;
-
/* receive messages */
do {
msg = sms_receive(conn);
@@ -2120,6 +2118,7 @@
} while (msg);
if (sleep 0) {
+
/* note that this implementations means that we sleep even
* when we fail connection.. but time is very short, anyway
*/
@@ -2131,6 +2130,9 @@
sleep *= 2;
if (sleep = 2.0)
sleep = 1.99;
+}
+else {
+sleep = 0.0001;
}
}
}
Re: [PATCH] smsc_cimd2.c sleep times
Stipe, could you revert smsc_cimd2.c to version 1.7 and then apply the second patch? done, please check. Stipe [EMAIL PROTECTED] --- Wapme Systems AG Vogelsanger Weg 80 40470 Düsseldorf Tel: +49-211-74845-0 Fax: +49-211-74845-299 E-Mail: [EMAIL PROTECTED] Internet: http://www.wapme-systems.de --- wapme.net - wherever you are
Re: [PATCH] smsc_cimd2.c sleep times
semes like the problem is related with CVS (possibly at my side). [EMAIL PROTECTED]:~/kannel/gateway/gw/smsc$ rm smsc_cimd2.c [EMAIL PROTECTED]:~/kannel/gateway/gw/smsc$ cvs update cvs server: Updating . U smsc_cimd2.c [EMAIL PROTECTED]:~/kannel/gateway/gw/smsc$ tail -n 2 CVS/Entries /smsc_cimd2.c/1.8/Mon Mar 31 16:56:21 2003//D2003.03.30.21.00.00 D so the question is - why mine cvs update didin't fetch version 1.9? according to http://www.kannel.org/cgi-bin/viewcvs.cgi/gateway/gw/smsc/smsc_cimd2.c.diff?r1=1.8r2=1.9, version 1.9 was made today, few hours ago (2003/03/31 13:25:21 UTC). regards, Dziugas Baltrunas - Original Message - From: Angel Fradejas [EMAIL PROTECTED] To: Dziugas Baltrunas [EMAIL PROTECTED] Cc: [EMAIL PROTECTED] Sent: 2003 m. kovo 31 d. 17:19 Subject: RE: [PATCH] smsc_cimd2.c sleep times I'd say definitely that you don't have the lastest CVS file. Current one have for example on line 2071 doublesleep = 0.0001; and the one you have doesn't. Angel.
Re: [PATCH] smsc_cimd2.c sleep times
here is more informative view: [EMAIL PROTECTED]:~/kannel/gateway/gw/smsc$ cvs status smsc_cimd2.c === File: smsc_cimd2.c Status: Up-to-date Working revision:1.8 Repository revision: 1.8 /home/cvs/gateway/gw/smsc/smsc_cimd2.c,v Sticky Tag: (none) Sticky Date: 2003.03.30.21.00.00 Sticky Options: (none) regards, Dziugas Baltrunas - Original Message - From: Angel Fradejas [EMAIL PROTECTED] To: Dziugas Baltrunas [EMAIL PROTECTED] Cc: [EMAIL PROTECTED] Sent: 2003 m. kovo 31 d. 17:19 Subject: RE: [PATCH] smsc_cimd2.c sleep times I'd say definitely that you don't have the lastest CVS file. Current one have for example on line 2071 doublesleep = 0.0001; and the one you have doesn't. Angel.
Re: [PATCH] smsc_cimd2.c sleep times
so the question is - why mine cvs update didin't fetch version 1.9? I guess it has still it's sticky bit on it for the revision you updated previously. Stipe [EMAIL PROTECTED] --- Wapme Systems AG Vogelsanger Weg 80 40470 Düsseldorf Tel: +49-211-74845-0 Fax: +49-211-74845-299 E-Mail: [EMAIL PROTECTED] Internet: http://www.wapme-systems.de --- wapme.net - wherever you are
Re: [PATCH] smsc_cimd2.c sleep times
yes, you were right. specifying -r1.9, then -rHEAD in the end of cvs update command solved the problem. i'm curious to know of cvs mechanism itself - is there any time which has to pass in order to say for 'cvs update' to get the most recent files, i.e. when HEAD version becomes most recent ? (yeeah, it's off-topic, sorry). here is the snip from manual: -r tag Use the revision specified by the tag argument instead of the default ``head'' revision. thanks for the help and sorry for confusing things. i think it's time to end this thread :) regards, Dziugas Baltrunas - Original Message - From: Stipe Tolj [EMAIL PROTECTED] To: Dziugas Baltrunas [EMAIL PROTECTED] Cc: Angel Fradejas [EMAIL PROTECTED]; [EMAIL PROTECTED] Sent: 2003 m. kovo 31 d. 19:02 Subject: Re: [PATCH] smsc_cimd2.c sleep times so the question is - why mine cvs update didin't fetch version 1.9? I guess it has still it's sticky bit on it for the revision you updated previously. Stipe [EMAIL PROTECTED] --- Wapme Systems AG Vogelsanger Weg 80 40470 Dsseldorf Tel: +49-211-74845-0 Fax: +49-211-74845-299 E-Mail: [EMAIL PROTECTED] Internet: http://www.wapme-systems.de --- wapme.net - wherever you are
Re: [PATCH] smsc_cimd2.c sleep times
Dziugas Baltrunas wrote: something mysterious has happend after commiting cimd2_smsc2.c patches written by Angel Fradejas. there were problems with sleep times and Angel wrote the final patch (file was called cimd2_fix2.diff) and it was commited by Stipe. recently I did cvs update and seems like most recent fix wasn't applied or was applied incorrectly? attached patch fixes these sleep times (it's made with older smsc_cimd2.c). if I'm wrong, Stipe and Angel, please correct me. Angel send 2 patches. One stating the fix and then updating that patch itself. I commited the later one. Angel, is current cvs ok from your perstecpitve? Stipe [EMAIL PROTECTED] --- Wapme Systems AG Vogelsanger Weg 80 40470 Düsseldorf Tel: +49-211-74845-0 Fax: +49-211-74845-299 E-Mail: [EMAIL PROTECTED] Internet: http://www.wapme-systems.de --- wapme.net - wherever you are
