Changeset 18599

Timestamp:

09/02/08 00:08:33 (5 years ago)

Author:

frsyuki

Message:

lang/c/msgpack: added C++ binding

Location:

lang/c/msgpack/trunk

Files:

• cpp/Makefile (added)
• cpp/msgpack (added)
• cpp/object.hpp (added)
• cpp/test.cpp (added)
• cpp/unpack.cc (deleted)
• cpp/unpack.cpp (added)
• cpp/unpack.h (deleted)
• cpp/unpack.hpp (added)
• cpp/unpack_context.h (deleted)
• cpp/unpack_context.hpp (added)
• cpp/unpack_inline.cpp (added)
• cpp/zone.cpp (added)
• cpp/zone.hpp.erb (added)
• msgpack/pack/inline_context.h (deleted)
• msgpack/pack/inline_impl.h (modified) (18 diffs)
• msgpack/unpack/inline_context.h (modified) (2 diffs)
• msgpack/unpack/inline_impl.h (modified) (5 diffs)

lang/c/msgpack/trunk/msgpack/pack/inline_impl.h

@@ -24 +24 @@
 #ifdef __LITTLE_ENDIAN__
 
-#define STORE_16(d) \
+#define STORE_BE16(d) \
         ((char*)&d)[1], ((char*)&d)[0]
 
-#define STORE_32(d) \
+#define STORE_BE32(d) \
         ((char*)&d)[3], ((char*)&d)[2], ((char*)&d)[1], ((char*)&d)[0]
 
-#define STORE_64(d) \
+#define STORE_BE64(d) \
         ((char*)&d)[7], ((char*)&d)[6], ((char*)&d)[5], ((char*)&d)[4], \
         ((char*)&d)[3], ((char*)&d)[2], ((char*)&d)[1], ((char*)&d)[0]
@@ -36 +36 @@
 #elif __BIG_ENDIAN__
 
-#define STORE_16(d) \
-        ((char*)&d)[2], ((char*)&d)[3]
-
-#define STORE_32(d) \
+#define STORE_BE16(d) \
+        ((char*)&d)[0], ((char*)&d)[1]
+
+#define STORE_BE32(d) \
         ((char*)&d)[0], ((char*)&d)[1], ((char*)&d)[2], ((char*)&d)[3]
 
-#define STORE_32(d) \
+#define STORE_BE64(d) \
         ((char*)&d)[0], ((char*)&d)[1], ((char*)&d)[2], ((char*)&d)[3], \
         ((char*)&d)[4], ((char*)&d)[5], ((char*)&d)[6], ((char*)&d)[7]
@@ -58 +58 @@
         if(d < -32) {
                 if(d < -32768) { // signed 32
-                        const unsigned char buf[5] = {0xd2, STORE_32(d)};
+                        const unsigned char buf[5] = {0xd2, STORE_BE32(d)};
                         msgpack_pack_append_buffer(x, buf, 5);
                 } else if(d < -128) { // signed 16
-                        const unsigned char buf[3] = {0xd1, STORE_16(d)};
+                        const unsigned char buf[3] = {0xd1, STORE_BE16(d)};
                         msgpack_pack_append_buffer(x, buf, 3);
                 } else { // signed 8
@@ -76 +76 @@
                 } else if(d < 65536) {
                         // unsigned 16
-                        const unsigned char buf[3] = {0xcd, STORE_16(d)};
+                        const unsigned char buf[3] = {0xcd, STORE_BE16(d)};
                         msgpack_pack_append_buffer(x, buf, 3);
                 } else {
                         // unsigned 32
-                        const unsigned char buf[5] = {0xce, STORE_32(d)};
+                        const unsigned char buf[5] = {0xce, STORE_BE32(d)};
                         msgpack_pack_append_buffer(x, buf, 5);
                 }
@@ -98 +98 @@
         } else if(d < 65536) {
                 // unsigned 16
-                const unsigned char buf[3] = {0xcd, STORE_16(d)};
+                const unsigned char buf[3] = {0xcd, STORE_BE16(d)};
                 msgpack_pack_append_buffer(x, buf, 3);
         } else {
                 // unsigned 32
-                const unsigned char buf[5] = {0xce, STORE_32(d)};
+                const unsigned char buf[5] = {0xce, STORE_BE32(d)};
                 msgpack_pack_append_buffer(x, buf, 5);
         }
@@ -119 +119 @@
 inline void msgpack_pack_unsigned_int_16(msgpack_pack_context x, uint16_t d)
 {
-        const unsigned char buf[3] = {0xcd, STORE_16(d)};
+        const unsigned char buf[3] = {0xcd, STORE_BE16(d)};
         msgpack_pack_append_buffer(x, buf, 3);
 }
@@ -125 +125 @@
 inline void msgpack_pack_unsigned_int_32(msgpack_pack_context x, uint32_t d)
 {
-        const unsigned char buf[5] = {0xce, STORE_32(d)};
+        const unsigned char buf[5] = {0xce, STORE_BE32(d)};
         msgpack_pack_append_buffer(x, buf, 5);
 }
@@ -131 +131 @@
 inline void msgpack_pack_unsigned_int_64(msgpack_pack_context x, uint64_t d)
 {
-        // FIXME
-        const unsigned char buf[9] = {0xcf, STORE_64(d)};
+        // FIXME optimization
+        const unsigned char buf[9] = {0xcf, STORE_BE64(d)};
         msgpack_pack_append_buffer(x, buf, 9);
 }
@@ -150 +150 @@
 inline void msgpack_pack_signed_int_16(msgpack_pack_context x, int16_t d)
 {
-        const unsigned char buf[3] = {0xd1, STORE_16(d)};
+        const unsigned char buf[3] = {0xd1, STORE_BE16(d)};
         msgpack_pack_append_buffer(x, buf, 3);
 }
@@ -156 +156 @@
 inline void msgpack_pack_signed_int_32(msgpack_pack_context x, int32_t d)
 {
-        const unsigned char buf[5] = {0xd2, STORE_32(d)};
+        const unsigned char buf[5] = {0xd2, STORE_BE32(d)};
         msgpack_pack_append_buffer(x, buf, 5);
 }
@@ -162 +162 @@
 inline void msgpack_pack_signed_int_64(msgpack_pack_context x, int64_t d)
 {
-        // FIXME
-        const unsigned char buf[9] = {0xd3, STORE_64(d)};
+        // FIXME optimization
+        const unsigned char buf[9] = {0xd3, STORE_BE64(d)};
         msgpack_pack_append_buffer(x, buf, 9);
 }
@@ -175 +175 @@
 {
         uint32_t n = *((uint32_t*)&d);  // FIXME
-        const unsigned char buf[5] = {0xca, STORE_32(n)};
+        const unsigned char buf[5] = {0xca, STORE_BE32(n)};
         msgpack_pack_append_buffer(x, buf, 5);
 }
@@ -182 +182 @@
 {
         uint64_t n = *((uint64_t*)&d);  // FIXME
-        const unsigned char buf[9] = {0xcb, STORE_64(n)};
+        const unsigned char buf[9] = {0xcb, STORE_BE64(n)};
         msgpack_pack_append_buffer(x, buf, 9);
 }
@@ -201 +201 @@
  * Boolean
  */
+
 inline void msgpack_pack_true(msgpack_pack_context x)
 {
@@ -225 +226 @@
         } else if(n < 65536) {
                 uint16_t d = (uint16_t)n;
-                unsigned char buf[3] = {0xdc, STORE_16(d)};
+                unsigned char buf[3] = {0xdc, STORE_BE16(d)};
                 msgpack_pack_append_buffer(x, buf, 3);
         } else {
                 uint32_t d = (uint32_t)n;
-                unsigned char buf[5] = {0xdd, STORE_32(d)};
+                unsigned char buf[5] = {0xdd, STORE_BE32(d)};
                 msgpack_pack_append_buffer(x, buf, 5);
         }
@@ -246 +247 @@
         } else if(n < 65536) {
                 uint16_t d = (uint16_t)n;
-                unsigned char buf[3] = {0xde, STORE_16(d)};
+                unsigned char buf[3] = {0xde, STORE_BE16(d)};
                 msgpack_pack_append_buffer(x, buf, 3);
         } else {
                 uint32_t d = (uint32_t)n;
-                unsigned char buf[5] = {0xdf, STORE_32(d)};
-                msgpack_pack_append_buffer(x, buf, 5);
-        }
-}
-
-
-/*
- * String
+                unsigned char buf[5] = {0xdf, STORE_BE32(d)};
+                msgpack_pack_append_buffer(x, buf, 5);
+        }
+}
+
+
+/*
+ * Raw
  */
 
@@ -273 +274 @@
         } else if(l < 65536) {
                 uint16_t d = (uint16_t)l;
-                unsigned char buf[3] = {0xda, STORE_16(d)};
+                unsigned char buf[3] = {0xda, STORE_BE16(d)};
                 msgpack_pack_append_buffer(x, buf, 3);
         } else {
                 uint32_t d = (uint32_t)l;
-                unsigned char buf[5] = {0xdb, STORE_32(d)};
+                unsigned char buf[5] = {0xdb, STORE_BE32(d)};
                 msgpack_pack_append_buffer(x, buf, 5);
         }
@@ -284 +285 @@
 
 
+#undef STORE_BE16(d)
+#undef STORE_BE32(d)
+#undef STORE_BE64(d)
+
+
 #endif /* msgpack/pack/inline_impl.h */
 

lang/c/msgpack/trunk/msgpack/unpack/inline_context.h

@@ -26 +26 @@
 #endif
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef struct {
         msgpack_object obj;
@@ -48 +52 @@
 #define msgpack_unpacker_data(unpacker) (unpacker)->stack[0].obj
 
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* msgpack/unpack/inline_context.h */

lang/c/msgpack/trunk/msgpack/unpack/inline_impl.h

@@ -23 +23 @@
 #include <arpa/inet.h>
 /*#include <stdio.h>*/
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 // Positive FixNum  0xxxxxxx  0x00 - 0x7f
@@ -72 +76 @@
 #endif
 
-static inline uint64_t ntohll(uint64_t x) {
-#ifdef __LITTLE_ENDIAN__  // FIXME
+#define betoh16(x) ntohs(x)
+#define betoh32(x) ntohl(x)
+
+#ifdef __LITTLE_ENDIAN__
 #if defined(__bswap_64)
-        return __bswap_64(x);
+#  define betoh64(x) __bswap_64(x)
 #elif defined(__DARWIN_OSSwapInt64)
-        return __DARWIN_OSSwapInt64(x);
+#  define betoh64(x) __DARWIN_OSSwapInt64(x)
 #else
+static inline uint64_t betoh64(uint64_t x) {
         return  ((x << 56) & 0xff00000000000000ULL ) |
                         ((x << 40) & 0x00ff000000000000ULL ) |
@@ -87 +94 @@
                         ((x >> 40) & 0x000000000000ff00ULL ) |
                         ((x >> 56) & 0x00000000000000ffULL ) ;
+}
 #endif
 #else
-        return x;
-#endif
-}
+#define betoh64(x) (x)
+#endif
+
 
 typedef enum {
@@ -213 +221 @@
 
 #define PTR_CAST_8(ptr)   (*(uint8_t*)ptr)
-#define PTR_CAST_16(ptr)  ntohs(*(uint16_t*)ptr)
-#define PTR_CAST_32(ptr)  ntohl(*(uint32_t*)ptr)
-#define PTR_CAST_64(ptr)  ntohll(*(uint64_t*)ptr)
+#define PTR_CAST_16(ptr)  betoh16(*(uint16_t*)ptr)
+#define PTR_CAST_32(ptr)  betoh32(*(uint32_t*)ptr)
+#define PTR_CAST_64(ptr)  betoh64(*(uint64_t*)ptr)
 
         if(p == pe) { goto _out; }
@@ -435 +443 @@
 
 
+#ifdef betoh16(x)
+#undef betoh16(x)
+#endif
+
+#ifdef betoh32(x)
+#undef betoh32(x)
+#endif
+
+#ifdef betoh64(x)
+#undef betoh64(x)
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* msgpack/unpack/inline_impl.h */