From eb2df1e7abb3a607b04a074c8817449616319b52 Mon Sep 17 00:00:00 2001
From: Yehuda Sadeh <yehuda@hq.newdream.net>
Date: Mon, 11 May 2009 10:47:50 -0700
Subject: [PATCH] class: add class name to the library list

---
 src/ceph.cc              | 2 +-
 src/include/ClassEntry.h | 1 +
 src/mon/ClassMonitor.cc  | 7 ++-----
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/ceph.cc b/src/ceph.cc
index 52a1330f6a47c..e4459037bff93 100644
--- a/src/ceph.cc
+++ b/src/ceph.cc
@@ -187,7 +187,7 @@ void handle_notify(MMonObserveNotify *notify)
 	// show the first class info
         map<string, ClassLibrary>::iterator iter = list.library_map.begin();
 	if (iter != list.library_map.end()) {
-	  dout(0) << "   class " <<  iter->first << dendl;
+	  dout(0) << "   class " <<  iter->second << dendl;
 	}
       } else {
 	ClassImpl impl;
diff --git a/src/include/ClassEntry.h b/src/include/ClassEntry.h
index f3b5ae4b32cfd..ca7044de32d9d 100644
--- a/src/include/ClassEntry.h
+++ b/src/include/ClassEntry.h
@@ -90,6 +90,7 @@ struct ClassList {
   void add(const string& name, const version_t version) {
     ClassLibrary library;
     library.version = version;
+    library.name = name;
     library_map[name] = library;
   }
 
diff --git a/src/mon/ClassMonitor.cc b/src/mon/ClassMonitor.cc
index b68d2f2e15baa..6fa4ce5f2b7d9 100644
--- a/src/mon/ClassMonitor.cc
+++ b/src/mon/ClassMonitor.cc
@@ -66,7 +66,7 @@ void ClassMonitor::create_initial(bufferlist& bl)
   dout(10) << "create_initial -- creating initial map" << dendl;
   ClassImpl i;
   i.name = "test";
-  i.version = 0;
+  i.version = 12;
   i.seq = 0;
   i.stamp = g_clock.now();
   ClassLibraryIncremental inc;
@@ -112,16 +112,13 @@ bool ClassMonitor::update_from_paxos()
 
     bufferlist::iterator p = bl.begin();
     ClassLibraryIncremental inc;
-    inc.decode(p);
+    ::decode(inc, p);
     ClassImpl impl;
     inc.decode_impl(impl);
     if (inc.add) {
       mon->store->put_bl_ss(inc.impl, "class_impl", impl.name.c_str());
       dout(0) << "adding name=" << impl.name << " version=" << impl.version << dendl;
       list.add(impl.name, impl.version);
-    map<string, ClassLibrary>::iterator iter = list.library_map.begin();
-    for (iter=list.library_map.begin(); iter != list.library_map.end(); ++iter)
-       dout(0) << "hooray: " << iter->first << dendl;
     } else {
       list.remove(impl.name, impl.version);
     }
-- 
2.39.5