rpms/cld/devel cld-test.patch, 1.1.2.3, 1.1.2.4 cld.spec, 1.4.2.3, 1.4.2.4
Pete Zaitcev
zaitcev at fedoraproject.org
Wed Jul 22 05:19:13 UTC 2009
- Previous message (by thread): rpms/kernel/F-11 drm-nouveau.patch, 1.58, 1.59 kernel.spec, 1.1675, 1.1676
- Next message (by thread): rpms/ibus/devel .cvsignore, 1.34, 1.35 ibus.spec, 1.73, 1.74 sources, 1.39, 1.40
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: zaitcev
Update of /cvs/pkgs/rpms/cld/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22390
Modified Files:
Tag: private-zaitcev-bz512560
cld-test.patch cld.spec
Log Message:
Test 4
cld-test.patch:
lib/cldc.c | 38 +++++++++++++++++----
server/cld.h | 1
server/cldb.c | 15 +++-----
server/msg.c | 60 +++++++++++++++++++++++++++-------
server/server.c | 86 +++++++++++++++++++++++++++++++++++--------------
server/session.c | 21 ++++++-----
server/util.c | 17 +++++----
test/load-file-event.c | 2 -
test/start-daemon | 2 -
9 files changed, 171 insertions(+), 71 deletions(-)
Index: cld-test.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cld/devel/Attic/cld-test.patch,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -p -r1.1.2.3 -r1.1.2.4
--- cld-test.patch 22 Jul 2009 03:33:14 -0000 1.1.2.3
+++ cld-test.patch 22 Jul 2009 05:19:13 -0000 1.1.2.4
@@ -1,5 +1,5 @@
diff --git a/lib/cldc.c b/lib/cldc.c
-index ab3a2a4..f0dc086 100644
+index ab3a2a4..9ed26fd 100644
--- a/lib/cldc.c
+++ b/lib/cldc.c
@@ -133,12 +133,14 @@ static int cldc_rx_generic(struct cldc_session *sess,
@@ -30,24 +30,24 @@ index ab3a2a4..f0dc086 100644
- pkt->user);
+ if (sess->verbose) {
+ if (msg->op == cmo_get) {
-+ struct cld_msg_get_resp *resp;
-+ resp = (struct cld_msg_get_resp *) msg;
++ struct cld_msg_get_resp *dp;
++ dp = (struct cld_msg_get_resp *) msg;
+ sess->act_log("receive pkt: len %u, op cmo_get"
+ ", 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));
++ GUINT32_FROM_LE(dp->size));
+ } else if (msg->op == cmo_data_c) {
-+ struct cld_msg_data *resp;
-+ resp = (struct cld_msg_data *) msg;
++ struct cld_msg_data *dp;
++ dp = (struct cld_msg_data *) msg;
+ sess->act_log("receive pkt: len %u, op cmo_data_c"
+ ", 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));
++ GUINT32_FROM_LE(dp->seg),
++ GUINT32_FROM_LE(dp->seg_len));
+ } else {
+ sess->act_log("receive pkt: len %u, "
+ "op %s, seqid %llu, user %s\n",
@@ -106,11 +106,36 @@ index cb73523..cef9092 100644
}
void cldb_fini(struct cldb *cldb)
+@@ -655,8 +652,10 @@ struct raw_inode *cldb_inode_mem(const char *name, size_t name_len,
+ ino = mem;
+ ino->inum = cldino_to_le(new_inum);
+ ino->ino_len = GUINT32_TO_LE(name_len);
++#if 0
+ ino->time_create =
+ ino->time_modify = GUINT64_TO_LE(current_time.tv_sec);
++#endif
+ ino->flags = GUINT32_TO_LE(flags);
+
+ memcpy(mem + sizeof(*ino), name, name_len);
+@@ -677,12 +676,10 @@ int cldb_data_get(DB_TXN *txn, cldino_t inum,
+ *data_out = NULL;
+
+ memset(&key, 0, sizeof(key));
+- memset(&val, 0, sizeof(val));
+-
+- /* key: inode number */
+ key.data = &inum_le;
+ key.size = sizeof(inum_le);
+
++ memset(&val, 0, sizeof(val));
+ val.flags = DB_DBT_MALLOC;
+
+ rc = db_data->get(db_data, txn, &key, &val, rmw ? DB_RMW : 0);
diff --git a/server/msg.c b/server/msg.c
-index 2877348..5ace380 100644
+index 2877348..bb46fca 100644
--- a/server/msg.c
+++ b/server/msg.c
-@@ -31,6 +31,21 @@ enum {
+@@ -31,6 +31,23 @@ enum {
CLD_MAX_UDP_SEG = 1024,
};
@@ -120,19 +145,21 @@ index 2877348..5ace380 100644
+ char *p;
+ uint64_t n;
+ int l;
++ unsigned m;
+
+ l = GUINT32_FROM_LE(inode->ino_len);
+ p = strndup((char *)inode + sizeof(struct raw_inode), l);
+ n = GUINT64_FROM_LE(inode->inum);
-+ cldlog(LOG_INFO, "%s>inode.%s 0x%016llx %s[%d]\n", tag, act,
-+ (long long)n, p, l);
++ m = GUINT32_FROM_LE(inode->size);
++ cldlog(LOG_INFO, "%s>inode.%s 0x%016llx %s[%d] %u\n", tag, act,
++ (long long)n, p, l, m);
+ free(p);
+}
+
struct pathname_info {
const char *dir;
size_t dir_len;
-@@ -168,7 +183,8 @@ static bool dirdata_append(void **data, size_t *data_len,
+@@ -168,7 +185,8 @@ static bool dirdata_append(void **data, size_t *data_len,
mem = realloc(*data, new_len);
if (!mem) {
@@ -142,7 +169,7 @@ index 2877348..5ace380 100644
return false;
}
-@@ -236,14 +252,14 @@ static int inode_notify(DB_TXN *txn, cldino_t inum, bool deleted)
+@@ -236,14 +254,14 @@ static int inode_notify(DB_TXN *txn, cldino_t inum, bool deleted)
sess = g_hash_table_lookup(cld_srv.sessions, h.sid);
if (!sess) {
@@ -160,7 +187,7 @@ index 2877348..5ace380 100644
SIDARG(sess->sid), (long long) inum);
continue;
}
-@@ -360,7 +376,7 @@ int inode_lock_rescan(DB_TXN *txn, cldino_t inum)
+@@ -360,7 +378,7 @@ int inode_lock_rescan(DB_TXN *txn, cldino_t inum)
sess = g_hash_table_lookup(cld_srv.sessions, lock.sid);
if (!sess) {
@@ -169,7 +196,7 @@ index 2877348..5ace380 100644
break;
}
-@@ -370,8 +386,8 @@ int inode_lock_rescan(DB_TXN *txn, cldino_t inum)
+@@ -370,8 +388,8 @@ int inode_lock_rescan(DB_TXN *txn, cldino_t inum)
if (!sess->sock) { /* Freshly recovered session */
if (debugging)
@@ -180,7 +207,7 @@ index 2877348..5ace380 100644
SIDARG(sess->sid), (long long) inum);
continue;
}
-@@ -592,6 +608,19 @@ void msg_open(struct msg_params *mp)
+@@ -592,6 +610,19 @@ void msg_open(struct msg_params *mp)
/* read inode from db, if it exists */
rc = cldb_inode_get_byname(txn, name, name_len, &inode, false, DB_RMW);
@@ -200,7 +227,7 @@ index 2877348..5ace380 100644
if (rc && (rc != DB_NOTFOUND)) {
resp_rc = CLE_DB_ERR;
goto err_out;
-@@ -621,10 +650,11 @@ void msg_open(struct msg_params *mp)
+@@ -621,10 +652,11 @@ void msg_open(struct msg_params *mp)
/* create new in-memory inode */
inode = cldb_inode_new(txn, name, name_len, 0);
if (!inode) {
@@ -213,7 +240,7 @@ index 2877348..5ace380 100644
if (do_dir)
inode->flags = GUINT32_TO_LE(
-@@ -666,6 +696,7 @@ void msg_open(struct msg_params *mp)
+@@ -666,6 +698,7 @@ void msg_open(struct msg_params *mp)
parent->size = GUINT32_TO_LE(parent_len);
@@ -221,7 +248,7 @@ index 2877348..5ace380 100644
rc = inode_touch(txn, parent);
if (rc) {
resp_rc = CLE_DB_ERR;
-@@ -678,7 +709,7 @@ void msg_open(struct msg_params *mp)
+@@ -678,7 +711,7 @@ void msg_open(struct msg_params *mp)
/* alloc & init new handle; updates session's next_fh */
h = cldb_handle_new(mp->sess, inum, msg_mode, msg_events);
if (!h) {
@@ -230,7 +257,7 @@ index 2877348..5ace380 100644
resp_rc = CLE_OOM;
goto err_out;
}
-@@ -694,6 +725,7 @@ void msg_open(struct msg_params *mp)
+@@ -694,6 +727,7 @@ void msg_open(struct msg_params *mp)
if (create) {
/* write inode */
@@ -238,7 +265,7 @@ index 2877348..5ace380 100644
rc = inode_touch(txn, inode);
if (rc) {
-@@ -706,7 +738,7 @@ void msg_open(struct msg_params *mp)
+@@ -706,7 +740,7 @@ void msg_open(struct msg_params *mp)
raw_sess = session_new_raw(mp->sess);
if (!raw_sess) {
@@ -247,7 +274,7 @@ index 2877348..5ace380 100644
resp_rc = CLE_OOM;
goto err_out;
}
-@@ -913,6 +945,7 @@ static void try_commit_data(struct msg_params *mp,
+@@ -913,6 +947,7 @@ static void try_commit_data(struct msg_params *mp,
inode->size = GUINT32_TO_LE(data_size);
/* update inode */
@@ -255,7 +282,7 @@ index 2877348..5ace380 100644
rc = inode_touch(txn, inode);
if (rc) {
resp_rc = CLE_DB_ERR;
-@@ -1221,6 +1254,7 @@ void msg_del(struct msg_params *mp)
+@@ -1221,6 +1256,7 @@ void msg_del(struct msg_params *mp)
resp_rc = CLE_DB_ERR;
goto err_out;
}
@@ -263,7 +290,7 @@ index 2877348..5ace380 100644
/* read parent inode data */
rc = cldb_data_get(txn, cldino_from_le(parent->inum),
-@@ -1239,6 +1273,7 @@ void msg_del(struct msg_params *mp)
+@@ -1239,6 +1275,7 @@ void msg_del(struct msg_params *mp)
resp_rc = CLE_DB_ERR;
goto err_out;
}
@@ -271,7 +298,7 @@ index 2877348..5ace380 100644
/* prevent deletion of non-empty dirs */
if (GUINT32_FROM_LE(ino->flags) & CIFL_DIR) {
-@@ -1311,7 +1346,7 @@ void msg_del(struct msg_params *mp)
+@@ -1311,7 +1348,7 @@ void msg_del(struct msg_params *mp)
/* remove record from inode's directory data */
if (!dirdata_delete(&parent_data, &parent_len,
pinfo.base, pinfo.base_len)) {
@@ -280,7 +307,7 @@ index 2877348..5ace380 100644
resp_rc = CLE_DB_ERR;
goto err_out;
}
-@@ -1327,6 +1362,7 @@ void msg_del(struct msg_params *mp)
+@@ -1327,6 +1364,7 @@ void msg_del(struct msg_params *mp)
parent->size = GUINT32_TO_LE(parent_len);
/* update parent dir inode */
@@ -289,7 +316,7 @@ index 2877348..5ace380 100644
if (rc) {
resp_rc = CLE_DB_ERR;
diff --git a/server/server.c b/server/server.c
-index e4b027d..3540d4e 100644
+index e4b027d..fbad5c1 100644
--- a/server/server.c
+++ b/server/server.c
@@ -51,6 +51,8 @@ static struct argp_option options[] = {
@@ -346,16 +373,41 @@ index e4b027d..3540d4e 100644
memcpy(buf + pkt_len - SHA_DIGEST_LENGTH, md, SHA_DIGEST_LENGTH);
-@@ -278,7 +293,7 @@ static void udp_rx(struct server_socket *sock,
+@@ -277,10 +292,29 @@ static void udp_rx(struct server_socket *sock,
+ mp.msg = msg;
mp.msg_len = pkt_len - sizeof(*pkt);
- if (debugging)
+- if (debugging)
- syslog(LOG_DEBUG, " msg op %s, seqid %llu",
-+ cldlog(LOG_DEBUG, " msg op %s, seqid %llu\n",
- opstr(msg->op),
- (unsigned long long) GUINT64_FROM_LE(pkt->seqid));
+- opstr(msg->op),
+- (unsigned long long) GUINT64_FROM_LE(pkt->seqid));
++ if (debugging) {
++ if (msg->op == cmo_data_s) {
++ struct cld_msg_data *dp = (struct cld_msg_data *) msg;
++ cldlog(LOG_DEBUG,
++ " msg op %s, seqid %llu, seg %u, len %u\n",
++ opstr(msg->op),
++ (unsigned long long) GUINT64_FROM_LE(pkt->seqid),
++ GUINT32_FROM_LE(dp->seg),
++ GUINT32_FROM_LE(dp->seg_len));
++ } else if (msg->op == cmo_put) {
++ struct cld_msg_put *dp = (struct cld_msg_put *) msg;
++ cldlog(LOG_DEBUG,
++ " msg op %s, seqid %llu, size %u\n",
++ opstr(msg->op),
++ (unsigned long long) GUINT64_FROM_LE(pkt->seqid),
++ dp->data_size);
++ } else {
++ cldlog(LOG_DEBUG,
++ " msg op %s, seqid %llu\n",
++ opstr(msg->op),
++ (unsigned long long) GUINT64_FROM_LE(pkt->seqid));
++ }
++ }
-@@ -295,7 +310,7 @@ static void udp_rx(struct server_socket *sock,
+ if (msg->op != cmo_new_sess) {
+ if (!sess) {
+@@ -295,7 +329,7 @@ static void udp_rx(struct server_socket *sock,
/* eliminate duplicates; do not return any response */
if (GUINT64_FROM_LE(pkt->seqid) != sess->next_seqid_in) {
if (debugging)
@@ -364,7 +416,7 @@ index e4b027d..3540d4e 100644
return;
}
-@@ -307,7 +322,7 @@ static void udp_rx(struct server_socket *sock,
+@@ -307,7 +341,7 @@ static void udp_rx(struct server_socket *sock,
/* eliminate duplicates; do not return any response */
if (GUINT64_FROM_LE(pkt->seqid) != sess->next_seqid_in) {
if (debugging)
@@ -373,7 +425,7 @@ index e4b027d..3540d4e 100644
return;
}
-@@ -334,8 +349,8 @@ err_out:
+@@ -334,8 +368,8 @@ err_out:
authsign(outpkt, alloc_len);
if (debugging)
@@ -384,7 +436,7 @@ index e4b027d..3540d4e 100644
SIDARG(outpkt->sid),
opstr(resp->hdr.op),
(unsigned long long) GUINT64_FROM_LE(outpkt->seqid),
-@@ -384,7 +399,7 @@ static bool udp_srv_event(int fd, short events, void *userdata)
+@@ -384,7 +418,7 @@ static bool udp_srv_event(int fd, short events, void *userdata)
strcpy(cli.addr_host, host);
if (debugging)
@@ -393,7 +445,7 @@ index e4b027d..3540d4e 100644
host, (int) rrc);
if (cld_srv.cldb.is_master && cld_srv.cldb.up)
-@@ -429,7 +444,7 @@ static void cldb_checkpoint(struct timer *timer)
+@@ -429,7 +463,7 @@ static void cldb_checkpoint(struct timer *timer)
gettimeofday(¤t_time, NULL);
if (debugging)
@@ -402,7 +454,7 @@ index e4b027d..3540d4e 100644
/* flush logs to db, if log files >= 1MB */
rc = dbenv->txn_checkpoint(dbenv, 1024, 0, 0);
-@@ -453,7 +468,7 @@ static int net_open(void)
+@@ -453,7 +487,7 @@ static int net_open(void)
rc = getaddrinfo(NULL, cld_srv.port, &hints, &res0);
if (rc) {
@@ -411,7 +463,7 @@ index e4b027d..3540d4e 100644
cld_srv.port, gai_strerror(rc));
rc = -EINVAL;
goto err_addr;
-@@ -533,7 +548,7 @@ err_addr:
+@@ -533,7 +567,7 @@ err_addr:
static void segv_signal(int signal)
{
@@ -420,7 +472,7 @@ index e4b027d..3540d4e 100644
exit(1);
}
-@@ -548,7 +563,7 @@ static void stats_signal(int signal)
+@@ -548,7 +582,7 @@ static void stats_signal(int signal)
}
#define X(stat) \
@@ -429,7 +481,7 @@ index e4b027d..3540d4e 100644
static void stats_dump(void)
{
-@@ -572,6 +587,9 @@ static error_t parse_opt (int key, char *arg, struct argp_state *state)
+@@ -572,6 +606,9 @@ static error_t parse_opt (int key, char *arg, struct argp_state *state)
argp_usage(state);
}
break;
@@ -439,7 +491,7 @@ index e4b027d..3540d4e 100644
case 'F':
cld_srv.flags |= SFL_FOREGROUND;
break;
-@@ -624,9 +642,10 @@ int main (int argc, char *argv[])
+@@ -624,9 +661,10 @@ int main (int argc, char *argv[])
* open syslog, background outselves, write PID file ASAP
*/
@@ -452,7 +504,7 @@ index e4b027d..3540d4e 100644
syslogerr("daemon");
goto err_out;
}
-@@ -647,7 +666,7 @@ int main (int argc, char *argv[])
+@@ -647,7 +685,7 @@ int main (int argc, char *argv[])
if (cldb_init(&cld_srv.cldb, cld_srv.data_dir, NULL,
DB_CREATE | DB_THREAD | DB_RECOVER,
@@ -461,7 +513,7 @@ index e4b027d..3540d4e 100644
DB_CREATE | DB_THREAD, NULL))
exit(1);
-@@ -675,7 +694,7 @@ int main (int argc, char *argv[])
+@@ -675,7 +713,7 @@ int main (int argc, char *argv[])
if (rc)
goto err_out_pid;
@@ -470,7 +522,7 @@ index e4b027d..3540d4e 100644
cld_srv.port,
debugging);
-@@ -742,7 +761,7 @@ int main (int argc, char *argv[])
+@@ -742,7 +780,7 @@ int main (int argc, char *argv[])
next_timeout = timers_run();
}
@@ -479,7 +531,7 @@ index e4b027d..3540d4e 100644
if (cld_srv.cldb.up)
cldb_down(&cld_srv.cldb);
-@@ -777,12 +796,12 @@ static void ensure_root()
+@@ -777,12 +815,12 @@ static void ensure_root()
rc = cldb_inode_get_byname(txn, "/", sizeof("/")-1, &inode, false, 0);
if (rc == 0) {
if (debugging)
@@ -494,7 +546,7 @@ index e4b027d..3540d4e 100644
goto err_;
}
-@@ -793,12 +812,12 @@ static void ensure_root()
+@@ -793,12 +831,12 @@ static void ensure_root()
rc = cldb_inode_put(txn, inode, 0);
if (rc) {
free(inode);
@@ -683,7 +735,7 @@ index d23c501..5846052 100644
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..4cb9fd7 100755
+index 6124ff4..010f7db 100755
--- a/test/start-daemon
+++ b/test/start-daemon
@@ -6,7 +6,7 @@ then
@@ -691,7 +743,7 @@ index 6124ff4..4cb9fd7 100755
fi
-../server/cld -P cld.pid -d "$PWD/data" -p 18181
-+../server/cld -P cld.pid -d "$PWD/data" -p 18181 -E
++../server/cld -P cld.pid -d "$PWD/data" -p 18181 -E -D 2
sleep 3
Index: cld.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cld/devel/cld.spec,v
retrieving revision 1.4.2.3
retrieving revision 1.4.2.4
diff -u -p -r1.4.2.3 -r1.4.2.4
--- cld.spec 22 Jul 2009 03:33:14 -0000 1.4.2.3
+++ cld.spec 22 Jul 2009 05:19:13 -0000 1.4.2.4
@@ -1,6 +1,6 @@
Name: cld
Version: 0.2
-Release: 0.4.gc5b5f962.bz512560.3%{?dist}
+Release: 0.4.gc5b5f962.bz512560.4%{?dist}
Summary: Coarse locking daemon
Group: System Environment/Base
@@ -103,7 +103,7 @@ fi
%changelog
* Tue Jul 21 2009 Pete Zaitcev <zaitcev at redhat.com>
-- Testing, bump to 0.2-0.4.gc5b5f962.bz512560.3
+- Testing, bump to 0.2-0.4.gc5b5f962.bz512560.4
* Tue Jul 21 2009 Jeff Garzik <jgarzik at redhat.com> - 0.2-0.4.gc5b5f962
- rebuild for koji silliness
- Previous message (by thread): rpms/kernel/F-11 drm-nouveau.patch, 1.58, 1.59 kernel.spec, 1.1675, 1.1676
- Next message (by thread): rpms/ibus/devel .cvsignore, 1.34, 1.35 ibus.spec, 1.73, 1.74 sources, 1.39, 1.40
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list