rpms/cld/devel cld-test.patch, 1.1.2.5, 1.1.2.6 cld.spec, 1.4.2.5, 1.4.2.6

[Pete Zaitcev]

Author: zaitcev

Update of /cvs/pkgs/rpms/cld/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4057

Modified Files:
      Tag: private-zaitcev-bz512560
	cld-test.patch cld.spec 
Log Message:
Test (hopefuly final -- switching extra debugging off)


cld-test.patch:
 lib/cldc.c        |   40 ++++++++++++++++++++-----
 server/cld.h      |    1 
 server/cldb.c     |   15 +++------
 server/msg.c      |   69 ++++++++++++++++++++++++++++++++++++-------
 server/server.c   |   86 ++++++++++++++++++++++++++++++++++++++----------------
 server/session.c  |   56 ++++++++++++++++++++++++++---------
 server/util.c     |   17 +++++-----
 test/start-daemon |    2 -
 8 files changed, 211 insertions(+), 75 deletions(-)

Index: cld-test.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cld/devel/Attic/cld-test.patch,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -p -r1.1.2.5 -r1.1.2.6
--- cld-test.patch	22 Jul 2009 18:47:38 -0000	1.1.2.5
+++ cld-test.patch	22 Jul 2009 19:15:43 -0000	1.1.2.6
@@ -1,5 +1,5 @@
 diff --git a/lib/cldc.c b/lib/cldc.c
-index ab3a2a4..9ed26fd 100644
+index ab3a2a4..add106f 100644
 --- a/lib/cldc.c
 +++ b/lib/cldc.c
 @@ -133,12 +133,14 @@ static int cldc_rx_generic(struct cldc_session *sess,
@@ -60,6 +60,15 @@ index ab3a2a4..9ed26fd 100644
  
  	if (memcmp(pkt->magic, CLD_PKT_MAGIC, sizeof(pkt->magic))) {
  		if (sess->verbose)
+@@ -1086,7 +1110,7 @@ int cldc_put(struct cldc_fh *fh, const struct cldc_call_opts *copts,
+ 	put = (struct cld_msg_put *) msg->data;
+ 	put->fh = fh->fh_le;
+ 	__cld_rand64(&put->strid);
+-	put->data_size = data_len;
++	put->data_size = GUINT32_TO_LE(data_len);
+ 
+ 	memset(datamsg, 0, sizeof(datamsg));
+ 
 diff --git a/server/cld.h b/server/cld.h
 index 2b14060..21f103d 100644
 --- a/server/cld.h
@@ -339,7 +348,7 @@ index 2877348..12c6a90 100644
  	if (rc) {
  		resp_rc = CLE_DB_ERR;
 diff --git a/server/server.c b/server/server.c
-index e4b027d..fbad5c1 100644
+index e4b027d..ad331cf 100644
 --- a/server/server.c
 +++ b/server/server.c
 @@ -51,6 +51,8 @@ static struct argp_option options[] = {
@@ -419,7 +428,7 @@ index e4b027d..fbad5c1 100644
 +			       "    msg op %s, seqid %llu, size %u\n",
 +			       opstr(msg->op),
 +			       (unsigned long long) GUINT64_FROM_LE(pkt->seqid),
-+			       dp->data_size);
++			       GUINT32_FROM_LE(dp->data_size));
 +		} else {
 +			cldlog(LOG_DEBUG,
 +			       "    msg op %s, seqid %llu\n",
@@ -779,21 +788,8 @@ index 2392595..02bf3af 100644
  			rc = -errno;
  		}
  
-diff --git a/test/load-file-event.c b/test/load-file-event.c
-index d23c501..5846052 100644
---- a/test/load-file-event.c
-+++ b/test/load-file-event.c
-@@ -212,7 +212,7 @@ static int init(char *name)
- 	if (rc)
- 		return rc;
- 
--	// run.udp->sess->verbose = true;
-+	run.udp->sess->verbose = true;
- 
- 	event_set(&run.udp_ev, run.udp->fd, EV_READ | EV_PERSIST,
- 		  udp_event, &run);
 diff --git a/test/start-daemon b/test/start-daemon
-index 6124ff4..010f7db 100755
+index 6124ff4..4cb9fd7 100755
 --- a/test/start-daemon
 +++ b/test/start-daemon
 @@ -6,7 +6,7 @@ then
@@ -801,7 +797,7 @@ index 6124ff4..010f7db 100755
  fi
  
 -../server/cld -P cld.pid -d "$PWD/data" -p 18181
-+../server/cld -P cld.pid -d "$PWD/data" -p 18181 -E -D 2
++../server/cld -P cld.pid -d "$PWD/data" -p 18181 -E
  
  sleep 3
  


Index: cld.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cld/devel/cld.spec,v
retrieving revision 1.4.2.5
retrieving revision 1.4.2.6
diff -u -p -r1.4.2.5 -r1.4.2.6
--- cld.spec	22 Jul 2009 18:47:39 -0000	1.4.2.5
+++ cld.spec	22 Jul 2009 19:15:43 -0000	1.4.2.6
@@ -1,6 +1,6 @@
 Name:		cld
 Version:	0.2
-Release:	0.4.gc5b5f962.bz512560.5%{?dist}
+Release:	0.4.gc5b5f962.bz512560.6%{?dist}
 Summary:	Coarse locking daemon
 
 Group:		System Environment/Base
@@ -103,7 +103,7 @@ fi
 
 %changelog
 * Wed Jul 22 2009 Pete Zaitcev <zaitcev at redhat.com>
-- Testing, bump to 0.2-0.4.gc5b5f962.bz512560.5
+- Testing, bump to 0.2-0.4.gc5b5f962.bz512560.6
 
 * Tue Jul 21 2009 Jeff Garzik <jgarzik at redhat.com> - 0.2-0.4.gc5b5f962
 - rebuild for koji silliness