Changeset 8179

Timestamp:

Apr 8, 2009, 5:25:17 PM (14 years ago)

Author:

charles

Message:

(trunk libT) faster serialization from tr_benc structs into json and benc formats

File:

• trunk/libtransmission/bencode.c (modified) (16 diffs)

trunk/libtransmission/bencode.c

@@ -817 +817 @@
 }
 
-#if 0
-tr_benc*
-tr_bencDictAddReal( tr_benc * dict, const char * key, double d )
-{
-    ccc
-    char buf[128];
-    char * locale;
-
-    /* the json spec requires a '.' decimal point regardless of locale */
-    locale = tr_strdup( setlocale ( LC_NUMERIC, NULL ) );
-    setlocale( LC_NUMERIC, "POSIX" );
-    tr_snprintf( buf, sizeof( buf ), "%f", d );
-    setlocale( LC_NUMERIC, locale );
-    tr_free( locale );
-
-    return tr_bencDictAddStr( dict, key, buf );
-}
-#endif
-
 tr_benc*
 tr_bencDictAddList( tr_benc *    dict,
@@ -1109 +1090 @@
 saveBoolFunc( const tr_benc * val, void * evbuf )
 {
-    evbuffer_add_printf( evbuf, "i%de", val->val.b?1:0 );
+    if( val->val.b )
+        evbuffer_add( evbuf, "i1e", 3 );
+    else
+        evbuffer_add( evbuf, "i0e", 3 );
 }
 
@@ -1145 +1129 @@
                    void *              evbuf )
 {
-    evbuffer_add_printf( evbuf, "d" );
+    evbuffer_add( evbuf, "d", 1 );
 }
 
@@ -1152 +1136 @@
                    void *              evbuf )
 {
-    evbuffer_add_printf( evbuf, "l" );
+    evbuffer_add( evbuf, "l", 1 );
 }
 
@@ -1159 +1143 @@
                       void *              evbuf )
 {
-    evbuffer_add_printf( evbuf, "e" );
+    evbuffer_add( evbuf, "e", 1 );
 }
 
@@ -1251 +1235 @@
 jsonIndent( struct jsonWalk * data )
 {
+    int i;
+    char buf[1024], *pch=buf;
     const int width = tr_list_size( data->parents ) * 4;
 
-    evbuffer_add_printf( data->out, "\n%*.*s", width, width, " " );
+    *pch++ = '\n';
+    for( i=0; i<width; ++i )
+        *pch++ = ' ';
+
+    evbuffer_add( data->out, buf, pch-buf );
 }
 
@@ -1269 +1259 @@
                 const int i = parentState->childIndex++;
                 if( !( i % 2 ) )
-                    evbuffer_add_printf( data->out, ": " );
+                    evbuffer_add( data->out, ": ", 2 );
                 else
                 {
-                    evbuffer_add_printf( data->out, ", " );
+                    evbuffer_add( data->out, ", ", 2 );
                     jsonIndent( data );
                 }
@@ -1281 +1271 @@
             {
                 ++parentState->childIndex;
-                evbuffer_add_printf( data->out, ", " );
+                evbuffer_add( data->out, ", ", 2 );
                 jsonIndent( data );
                 break;
@@ -1325 +1315 @@
     struct jsonWalk * data = vdata;
 
-    evbuffer_add_printf( data->out, "%s", (val->val.b?"true":"false") );
+    if( val->val.b )
+        evbuffer_add( data->out, "true", 4 );
+    else
+        evbuffer_add( data->out, "false", 5 );
+
     jsonChildFunc( data );
 }
@@ -1346 +1340 @@
 
 static void
-jsonStringFunc( const tr_benc * val,
-                void *          vdata )
-{
-    struct jsonWalk *    data = vdata;
+jsonStringFunc( const tr_benc * val, void * vdata )
+{
+    struct jsonWalk * data = vdata;
     const unsigned char *it, *end;
 
-    evbuffer_add_printf( data->out, "\"" );
+    evbuffer_add( data->out, "\"", 1 );
     for( it = (const unsigned char*)val->val.s.s, end = it + val->val.s.i;
          it != end; ++it )
@@ -1358 +1351 @@
         switch( *it )
         {
+            case '"':
+            case '\\':
             case '/':
-                evbuffer_add_printf( data->out, "\\/" ); break;
-
             case '\b':
-                evbuffer_add_printf( data->out, "\\b" ); break;
-
             case '\f':
-                evbuffer_add_printf( data->out, "\\f" ); break;
-
             case '\n':
-                evbuffer_add_printf( data->out, "\\n" ); break;
-
             case '\r':
-                evbuffer_add_printf( data->out, "\\r" ); break;
-
-            case '\t':
-                evbuffer_add_printf( data->out, "\\t" ); break;
-
-            case '"':
-                evbuffer_add_printf( data->out, "\\\"" ); break;
-
-            case '\\':
-                evbuffer_add_printf( data->out, "\\\\" ); break;
+            case '\t': {
+                char buf[2] = { '\\', *it };
+                evbuffer_add( data->out, buf, 2 );
+                break;
+            }
 
             default:
@@ -1386 +1368 @@
                 {
                     /*fprintf( stderr, "[%c]\n", *it );*/
-                    evbuffer_add_printf( data->out, "%c", *it );
+                    evbuffer_add( data->out, it, 1 );
                 }
                 else
@@ -1404 +1386 @@
         }
     }
-    evbuffer_add_printf( data->out, "\"" );
+    evbuffer_add( data->out, "\"", 1 );
     jsonChildFunc( data );
 }
@@ -1415 +1397 @@
 
     jsonPushParent( data, val );
-    evbuffer_add_printf( data->out, "{" );
+    evbuffer_add( data->out, "{", 1 );
     if( val->val.l.count )
         jsonIndent( data );
@@ -1428 +1410 @@
 
     jsonPushParent( data, val );
-    evbuffer_add_printf( data->out, "[" );
+    evbuffer_add( data->out, "[", 1 );
     if( nChildren )
         jsonIndent( data );
@@ -1458 +1440 @@
         jsonIndent( data );
     if( tr_bencIsDict( val ) )
-        evbuffer_add_printf( data->out, "}" );
+        evbuffer_add( data->out, "}", 1 );
     else /* list */
-        evbuffer_add_printf( data->out, "]" );
+        evbuffer_add( data->out, "]", 1 );
     jsonChildFunc( data );
 }