rpms/cld/devel cld-test.patch, 1.1.2.1, 1.1.2.2 cld.spec, 1.4.2.1, 1.4.2.2

[Pete Zaitcev]

Author: zaitcev

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

Modified Files:
      Tag: private-zaitcev-bz512560
	cld-test.patch cld.spec 
Log Message:
Test 512560 2.


cld-test.patch:
 lib/cldc.c             |   38 +++++++++++++++++++++++++++++++-------
 test/load-file-event.c |    2 +-
 2 files changed, 32 insertions(+), 8 deletions(-)

Index: cld-test.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cld/devel/Attic/cld-test.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -p -r1.1.2.1 -r1.1.2.2
--- cld-test.patch	22 Jul 2009 00:15:42 -0000	1.1.2.1
+++ cld-test.patch	22 Jul 2009 01:41:29 -0000	1.1.2.2
@@ -1,6 +1,69 @@
-diff -urp cld-0.2git/test/load-file-event.c cld-0.2git-p3/test/load-file-event.c
---- cld-0.2git/test/load-file-event.c	2009-07-20 14:30:47.000000000 -0600
-+++ cld-0.2git-p3/test/load-file-event.c	2009-07-21 17:43:49.000000000 -0600
+diff --git a/lib/cldc.c b/lib/cldc.c
+index cf70fc7..ab82b32 100644
+--- a/lib/cldc.c
++++ b/lib/cldc.c
+@@ -107,12 +107,14 @@ static int cldc_rx_generic(struct cldc_session *sess,
+ 	while (tmp) {
+ 		req = tmp->data;
+ 
++#if 0
+ 		if (sess->verbose)
+ 			sess->act_log("rx_gen: comparing req->xid (%llu) with resp->xid_in (%llu)\n",
+ 			        (unsigned long long)
+ 					GUINT64_FROM_LE(req->xid),
+ 			        (unsigned long long)
+ 					GUINT64_FROM_LE(resp->xid_in));
++#endif
+ 
+ 		if (req->xid == resp->xid_in)
+ 			break;
+@@ -409,13 +411,35 @@ int cldc_receive_pkt(struct cldc_session *sess,
+ 		return -EPROTO;
+ 	}
+ 
+-	if (sess->verbose)
+-		sess->act_log("receive pkt: len %u, "
+-			"op %s, seqid %llu, user %s\n",
+-			(unsigned int) pkt_len,
+-			opstr(msg->op),
+-			(unsigned long long) GUINT64_FROM_LE(pkt->seqid),
+-			pkt->user);
++	if (sess->verbose) {
++		if (msg->op == cmo_get) {
++			struct cld_msg_get_resp *resp;
++			resp = (struct cld_msg_get_resp *) msg;
++			sess->act_log("receive pkt: len %u, op cmo_data_c"
++				", seqid %llu, user %s, size %u\n",
++				(unsigned int) pkt_len,
++				(unsigned long long) GUINT64_FROM_LE(pkt->seqid),
++				pkt->user,
++				GUINT32_FROM_LE(resp->size));
++		} else if (msg->op == cmo_data_c) {
++			struct cld_msg_data *resp;
++			resp = (struct cld_msg_data *) msg;
++			sess->act_log("receive pkt: len %u, op cmo_get"
++				", seqid %llu, user %s, seg %u, len %u\n",
++				(unsigned int) pkt_len,
++				(unsigned long long) GUINT64_FROM_LE(pkt->seqid),
++				pkt->user,
++				GUINT32_FROM_LE(resp->seg),
++				GUINT32_FROM_LE(resp->seg_len));
++		} else {
++			sess->act_log("receive pkt: len %u, "
++				"op %s, seqid %llu, user %s\n",
++				(unsigned int) pkt_len,
++				opstr(msg->op),
++				(unsigned long long) GUINT64_FROM_LE(pkt->seqid),
++				pkt->user);
++		}
++	}
+ 
+ 	if (memcmp(pkt->magic, CLD_PKT_MAGIC, sizeof(pkt->magic))) {
+ 		if (sess->verbose)
+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;


Index: cld.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cld/devel/cld.spec,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -p -r1.4.2.1 -r1.4.2.2
--- cld.spec	22 Jul 2009 00:15:42 -0000	1.4.2.1
+++ cld.spec	22 Jul 2009 01:41:30 -0000	1.4.2.2
@@ -1,6 +1,6 @@
 Name:		cld
 Version:	0.2
-Release:	0.4.gc5b5f962.bz512560.1%{?dist}
+Release:	0.4.gc5b5f962.bz512560.2%{?dist}
 Summary:	Coarse locking daemon
 
 Group:		System Environment/Base
@@ -23,7 +23,7 @@ BuildRequires:	texlive-latex
 
 # cld is broken on big-endian... embarrassing!!!
 # FIXME: remove this when cld is fixed
-ExcludeArch: ppc ppc64
+# ExcludeArch: ppc ppc64
 
 %description
 Coarse locking daemon for cloud computing.  This software provides
@@ -107,7 +107,7 @@ fi
 
 %changelog
 * Tue Jul 21 2009 Pete Zaitcev <zaitcev at redhat.com>
-- Testing, bump to 0.2-0.4.gc5b5f962.bz512560.1
+- Testing, bump to 0.2-0.4.gc5b5f962.bz512560.2
 
 * Tue Jul 21 2009 Jeff Garzik <jgarzik at redhat.com> - 0.2-0.4.gc5b5f962
 - rebuild for koji silliness