| Message ID | 6035A0D088A63A46850C3988ED045A4B665EA52D@BITCOM1.int.sbss.com.au (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
James, I’m using uuid.begin()/end() to grab the 16-byte representation of the UUID. Did you figure out how to populate a boost::uuid_t from the bytes? In particular, I’m referring to FileJournal::decode. Actually, I suppose that any Ceph usage of the 16-byte representation should be replaced using the Boost serialization of uuid_t? Thanks, -Noah On Nov 13, 2013, at 2:33 PM, James Harper <james.harper@bendigoit.com.au> wrote: > Patch follows. When I wrote it I was just thinking it would be used for win32 build, hence the #ifdef. As I said before, it compiles but I haven't tested it. I can clean it up a bit and resend it with a signed-off-by if anyone wants to pick it up and follow it through sooner than I can. I don't know how boost behaves if the uuid parse fails (exception maybe?) so that would need resolving too. > > In addition, a bunch of ceph files include the libuuid header directly, even though all the ones I've found don't appear to need it, so they need to be fixed for a clean compile under win32, and to remove dependency on libuuid. There may also be other cases that need work, in particular anything that memcpy's into the 16 byte uuid directly. See patch for MStatfsReply.h where a minor tweak was necessary. > > (if anyone is interested, I have librados and librbd compiling under mingw32, but I can't get boost to build its thread library so I don't get a clean link, and there are probably other link errors too. I've run out of time for doing much more on this for the moment) > > James > > diff --git a/src/include/uuid.h b/src/include/uuid.h > index 942b807..201ac76 100644 > --- a/src/include/uuid.h > +++ b/src/include/uuid.h > @@ -8,6 +8,70 @@ > #include "encoding.h" > #include <ostream> > > +#if defined(_WIN32) > + > +#include <boost/lexical_cast.hpp> > +#include <boost/uuid/uuid.hpp> > +#include <boost/uuid/uuid_generators.hpp> > +#include <boost/uuid/uuid_io.hpp> > +#include <string> > + > +struct uuid_d { > + boost::uuids::uuid uuid; > + > + uuid_d() { > + uuid = boost::uuids::nil_uuid(); > + } > + > + bool is_zero() const { > + return uuid.is_nil(); > + //return boost::uuids::uuid::is_nil(uuid); > + } > + > + void generate_random() { > + boost::uuids::random_generator gen; > + uuid = gen(); > + } > + > + bool parse(const char *s) { > + boost::uuids::string_generator gen; > + uuid = gen(s); > + return true; > + // what happens if parse fails? > + } > + void print(char *s) { > + std::string str = boost::lexical_cast<std::string>(uuid); > + memcpy(s, str.c_str(), 37); > + } > + > + void encode(bufferlist& bl) const { > + ::encode_raw(uuid, bl); > + } > + void decode(bufferlist::iterator& p) const { > + ::decode_raw(uuid, p); > + } > + > + uuid_d& operator=(const uuid_d& r) { > + uuid = r.uuid; > + return *this; > + } > +}; > +WRITE_CLASS_ENCODER(uuid_d) > + > +inline std::ostream& operator<<(std::ostream& out, const uuid_d& u) { > + //char b[37]; > diff --git a/src/include/uuid.h b/src/include/uuid.h > index 942b807..201ac76 100644 > --- a/src/include/uuid.h > +++ b/src/include/uuid.h > @@ -8,6 +8,70 @@ > #include "encoding.h" > #include <ostream> > > +#if defined(_WIN32) > + > +#include <boost/lexical_cast.hpp> > +#include <boost/uuid/uuid.hpp> > +#include <boost/uuid/uuid_generators.hpp> > +#include <boost/uuid/uuid_io.hpp> > +#include <string> > + > +struct uuid_d { > + boost::uuids::uuid uuid; > + > + uuid_d() { > + uuid = boost::uuids::nil_uuid(); > + } > + > + bool is_zero() const { > + return uuid.is_nil(); > + //return boost::uuids::uuid::is_nil(uuid); > + } > + > + void generate_random() { > + boost::uuids::random_generator gen; > + uuid = gen(); > + } > + > + bool parse(const char *s) { > + boost::uuids::string_generator gen; > + uuid = gen(s); > + return true; > + // what happens if parse fails? > + } > + void print(char *s) { > + std::string str = boost::lexical_cast<std::string>(uuid); > + memcpy(s, str.c_str(), 37); > + } > + > + void encode(bufferlist& bl) const { > + ::encode_raw(uuid, bl); > + } > + void decode(bufferlist::iterator& p) const { > + ::decode_raw(uuid, p); > + } > + > + uuid_d& operator=(const uuid_d& r) { > + uuid = r.uuid; > + return *this; > + } > +}; > +WRITE_CLASS_ENCODER(uuid_d) > + > +inline std::ostream& operator<<(std::ostream& out, const uuid_d& u) { > + //char b[37]; > + //uuid_unparse(u.uuid, b); > + return out << u.uuid; > +} > + > +inline bool operator==(const uuid_d& l, const uuid_d& r) { > + return l.uuid == r.uuid; > +} > + > +inline bool operator!=(const uuid_d& l, const uuid_d& r) { > + return l.uuid != r.uuid; > +} > +#else > extern "C" { > #include <uuid/uuid.h> > #include <unistd.h> > @@ -56,6 +120,6 @@ inline bool operator==(const uuid_d& l, const uuid_d& r) { > inline bool operator!=(const uuid_d& l, const uuid_d& r) { > return uuid_compare(l.uuid, r.uuid) != 0; > } > - > +#endif > > #endif > diff --git a/src/messages/MStatfsReply.h b/src/messages/MStatfsReply.h > index 8ceec9c..40a5bdd 100644 > --- a/src/messages/MStatfsReply.h > +++ b/src/messages/MStatfsReply.h > @@ -22,7 +22,7 @@ public: > > MStatfsReply() : Message(CEPH_MSG_STATFS_REPLY) {} > MStatfsReply(uuid_d &f, tid_t t, epoch_t epoch) : Message(CEPH_MSG_STATFS_REPLY) { > - memcpy(&h.fsid, f.uuid, sizeof(h.fsid)); > + memcpy(&h.fsid, &f.uuid, sizeof(h.fsid)); > header.tid = t; > h.version = epoch; > } > -- To unsubscribe from this list: send the line "unsubscribe ceph-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, 25 Nov 2013, Noah Watkins wrote: > James, > > I?m using uuid.begin()/end() to grab the 16-byte representation of the UUID. Did you figure out how to populate a boost::uuid_t from the bytes? In particular, I?m referring to FileJournal::decode. > > Actually, I suppose that any Ceph usage of the 16-byte representation should be replaced using the Boost serialization of uuid_t? I suspect it is a trivial mapping, but you should render it as a string using both the old class and the boost code to confirm it is equivalent. (For my part, I had no idea the uuid was anything other than a bunch of random bits until I looked at the boost code. Now the weird grouping of digits/dashes makes some sense.) sage > > Thanks, > -Noah > > On Nov 13, 2013, at 2:33 PM, James Harper <james.harper@bendigoit.com.au> wrote: > > > Patch follows. When I wrote it I was just thinking it would be used for win32 build, hence the #ifdef. As I said before, it compiles but I haven't tested it. I can clean it up a bit and resend it with a signed-off-by if anyone wants to pick it up and follow it through sooner than I can. I don't know how boost behaves if the uuid parse fails (exception maybe?) so that would need resolving too. > > > > In addition, a bunch of ceph files include the libuuid header directly, even though all the ones I've found don't appear to need it, so they need to be fixed for a clean compile under win32, and to remove dependency on libuuid. There may also be other cases that need work, in particular anything that memcpy's into the 16 byte uuid directly. See patch for MStatfsReply.h where a minor tweak was necessary. > > > > (if anyone is interested, I have librados and librbd compiling under mingw32, but I can't get boost to build its thread library so I don't get a clean link, and there are probably other link errors too. I've run out of time for doing much more on this for the moment) > > > > James > > > > diff --git a/src/include/uuid.h b/src/include/uuid.h > > index 942b807..201ac76 100644 > > --- a/src/include/uuid.h > > +++ b/src/include/uuid.h > > @@ -8,6 +8,70 @@ > > #include "encoding.h" > > #include <ostream> > > > > +#if defined(_WIN32) > > + > > +#include <boost/lexical_cast.hpp> > > +#include <boost/uuid/uuid.hpp> > > +#include <boost/uuid/uuid_generators.hpp> > > +#include <boost/uuid/uuid_io.hpp> > > +#include <string> > > + > > +struct uuid_d { > > + boost::uuids::uuid uuid; > > + > > + uuid_d() { > > + uuid = boost::uuids::nil_uuid(); > > + } > > + > > + bool is_zero() const { > > + return uuid.is_nil(); > > + //return boost::uuids::uuid::is_nil(uuid); > > + } > > + > > + void generate_random() { > > + boost::uuids::random_generator gen; > > + uuid = gen(); > > + } > > + > > + bool parse(const char *s) { > > + boost::uuids::string_generator gen; > > + uuid = gen(s); > > + return true; > > + // what happens if parse fails? > > + } > > + void print(char *s) { > > + std::string str = boost::lexical_cast<std::string>(uuid); > > + memcpy(s, str.c_str(), 37); > > + } > > + > > + void encode(bufferlist& bl) const { > > + ::encode_raw(uuid, bl); > > + } > > + void decode(bufferlist::iterator& p) const { > > + ::decode_raw(uuid, p); > > + } > > + > > + uuid_d& operator=(const uuid_d& r) { > > + uuid = r.uuid; > > + return *this; > > + } > > +}; > > +WRITE_CLASS_ENCODER(uuid_d) > > + > > +inline std::ostream& operator<<(std::ostream& out, const uuid_d& u) { > > + //char b[37]; > > diff --git a/src/include/uuid.h b/src/include/uuid.h > > index 942b807..201ac76 100644 > > --- a/src/include/uuid.h > > +++ b/src/include/uuid.h > > @@ -8,6 +8,70 @@ > > #include "encoding.h" > > #include <ostream> > > > > +#if defined(_WIN32) > > + > > +#include <boost/lexical_cast.hpp> > > +#include <boost/uuid/uuid.hpp> > > +#include <boost/uuid/uuid_generators.hpp> > > +#include <boost/uuid/uuid_io.hpp> > > +#include <string> > > + > > +struct uuid_d { > > + boost::uuids::uuid uuid; > > + > > + uuid_d() { > > + uuid = boost::uuids::nil_uuid(); > > + } > > + > > + bool is_zero() const { > > + return uuid.is_nil(); > > + //return boost::uuids::uuid::is_nil(uuid); > > + } > > + > > + void generate_random() { > > + boost::uuids::random_generator gen; > > + uuid = gen(); > > + } > > + > > + bool parse(const char *s) { > > + boost::uuids::string_generator gen; > > + uuid = gen(s); > > + return true; > > + // what happens if parse fails? > > + } > > + void print(char *s) { > > + std::string str = boost::lexical_cast<std::string>(uuid); > > + memcpy(s, str.c_str(), 37); > > + } > > + > > + void encode(bufferlist& bl) const { > > + ::encode_raw(uuid, bl); > > + } > > + void decode(bufferlist::iterator& p) const { > > + ::decode_raw(uuid, p); > > + } > > + > > + uuid_d& operator=(const uuid_d& r) { > > + uuid = r.uuid; > > + return *this; > > + } > > +}; > > +WRITE_CLASS_ENCODER(uuid_d) > > + > > +inline std::ostream& operator<<(std::ostream& out, const uuid_d& u) { > > + //char b[37]; > > + //uuid_unparse(u.uuid, b); > > + return out << u.uuid; > > +} > > + > > +inline bool operator==(const uuid_d& l, const uuid_d& r) { > > + return l.uuid == r.uuid; > > +} > > + > > +inline bool operator!=(const uuid_d& l, const uuid_d& r) { > > + return l.uuid != r.uuid; > > +} > > +#else > > extern "C" { > > #include <uuid/uuid.h> > > #include <unistd.h> > > @@ -56,6 +120,6 @@ inline bool operator==(const uuid_d& l, const uuid_d& r) { > > inline bool operator!=(const uuid_d& l, const uuid_d& r) { > > return uuid_compare(l.uuid, r.uuid) != 0; > > } > > - > > +#endif > > > > #endif > > diff --git a/src/messages/MStatfsReply.h b/src/messages/MStatfsReply.h > > index 8ceec9c..40a5bdd 100644 > > --- a/src/messages/MStatfsReply.h > > +++ b/src/messages/MStatfsReply.h > > @@ -22,7 +22,7 @@ public: > > > > MStatfsReply() : Message(CEPH_MSG_STATFS_REPLY) {} > > MStatfsReply(uuid_d &f, tid_t t, epoch_t epoch) : Message(CEPH_MSG_STATFS_REPLY) { > > - memcpy(&h.fsid, f.uuid, sizeof(h.fsid)); > > + memcpy(&h.fsid, &f.uuid, sizeof(h.fsid)); > > header.tid = t; > > h.version = epoch; > > } > > > > -- To unsubscribe from this list: send the line "unsubscribe ceph-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/src/include/uuid.h b/src/include/uuid.h index 942b807..201ac76 100644 --- a/src/include/uuid.h +++ b/src/include/uuid.h @@ -8,6 +8,70 @@ #include "encoding.h" #include <ostream> +#if defined(_WIN32) + +#include <boost/lexical_cast.hpp> +#include <boost/uuid/uuid.hpp> +#include <boost/uuid/uuid_generators.hpp> +#include <boost/uuid/uuid_io.hpp> +#include <string> + +struct uuid_d { + boost::uuids::uuid uuid; + + uuid_d() { + uuid = boost::uuids::nil_uuid(); + } + + bool is_zero() const { + return uuid.is_nil(); + //return boost::uuids::uuid::is_nil(uuid); + } + + void generate_random() { + boost::uuids::random_generator gen; + uuid = gen(); + } + + bool parse(const char *s) { + boost::uuids::string_generator gen; + uuid = gen(s); + return true; + // what happens if parse fails? + } + void print(char *s) { + std::string str = boost::lexical_cast<std::string>(uuid); + memcpy(s, str.c_str(), 37); + } + + void encode(bufferlist& bl) const { + ::encode_raw(uuid, bl); + } + void decode(bufferlist::iterator& p) const { + ::decode_raw(uuid, p); + } + + uuid_d& operator=(const uuid_d& r) { + uuid = r.uuid; + return *this; + } +}; +WRITE_CLASS_ENCODER(uuid_d) + +inline std::ostream& operator<<(std::ostream& out, const uuid_d& u) { + //char b[37]; diff --git a/src/include/uuid.h b/src/include/uuid.h index 942b807..201ac76 100644 --- a/src/include/uuid.h +++ b/src/include/uuid.h @@ -8,6 +8,70 @@ #include "encoding.h" #include <ostream> +#if defined(_WIN32) + +#include <boost/lexical_cast.hpp> +#include <boost/uuid/uuid.hpp> +#include <boost/uuid/uuid_generators.hpp> +#include <boost/uuid/uuid_io.hpp> +#include <string> + +struct uuid_d { + boost::uuids::uuid uuid; + + uuid_d() { + uuid = boost::uuids::nil_uuid(); + } + + bool is_zero() const { + return uuid.is_nil(); + //return boost::uuids::uuid::is_nil(uuid); + } + + void generate_random() { + boost::uuids::random_generator gen; + uuid = gen(); + } + + bool parse(const char *s) { + boost::uuids::string_generator gen; + uuid = gen(s); + return true; + // what happens if parse fails? + } + void print(char *s) { + std::string str = boost::lexical_cast<std::string>(uuid); + memcpy(s, str.c_str(), 37); + } + + void encode(bufferlist& bl) const { + ::encode_raw(uuid, bl); + } + void decode(bufferlist::iterator& p) const { + ::decode_raw(uuid, p); + } + + uuid_d& operator=(const uuid_d& r) { + uuid = r.uuid; + return *this; + } +}; +WRITE_CLASS_ENCODER(uuid_d) + +inline std::ostream& operator<<(std::ostream& out, const uuid_d& u) { + //char b[37]; + //uuid_unparse(u.uuid, b); + return out << u.uuid; +} + +inline bool operator==(const uuid_d& l, const uuid_d& r) { + return l.uuid == r.uuid; +} + +inline bool operator!=(const uuid_d& l, const uuid_d& r) { + return l.uuid != r.uuid; +} +#else extern "C" { #include <uuid/uuid.h> #include <unistd.h> @@ -56,6 +120,6 @@ inline bool operator==(const uuid_d& l, const uuid_d& r) { inline bool operator!=(const uuid_d& l, const uuid_d& r) { return uuid_compare(l.uuid, r.uuid) != 0; } - +#endif #endif diff --git a/src/messages/MStatfsReply.h b/src/messages/MStatfsReply.h index 8ceec9c..40a5bdd 100644 --- a/src/messages/MStatfsReply.h +++ b/src/messages/MStatfsReply.h @@ -22,7 +22,7 @@ public: MStatfsReply() : Message(CEPH_MSG_STATFS_REPLY) {} MStatfsReply(uuid_d &f, tid_t t, epoch_t epoch) : Message(CEPH_MSG_STATFS_REPLY) { - memcpy(&h.fsid, f.uuid, sizeof(h.fsid)); + memcpy(&h.fsid, &f.uuid, sizeof(h.fsid)); header.tid = t; h.version = epoch; }