Changeset 8180

Timestamp:

Apr 8, 2009, 5:37:56 PM (14 years ago)

Author:

charles

Message:

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

File:

• branches/1.5x/libtransmission/bencode.c (modified) (13 diffs)

branches/1.5x/libtransmission/bencode.c

@@ -1017 +1017 @@
                    void *              evbuf )
 {
-    evbuffer_add_printf( evbuf, "d" );
+    evbuffer_add( evbuf, "d", 1 );
 }
 
@@ -1024 +1024 @@
                    void *              evbuf )
 {
-    evbuffer_add_printf( evbuf, "l" );
+    evbuffer_add( evbuf, "l", 1 );
 }
 
@@ -1031 +1031 @@
                       void *              evbuf )
 {
-    evbuffer_add_printf( evbuf, "e" );
+    evbuffer_add( evbuf, "e", 1 );
 }
 
@@ -1119 +1119 @@
 jsonIndent( struct jsonWalk * data )
 {
+    char buf[1024];
     const int width = tr_list_size( data->parents ) * 4;
 
-    evbuffer_add_printf( data->out, "\n%*.*s", width, width, " " );
+    buf[0] = '\n';
+    memset( buf+1, ' ', width );
+    evbuffer_add( data->out, buf, 1+width );
 }
 
@@ -1137 +1140 @@
                 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 );
                 }
@@ -1149 +1152 @@
             {
                 ++parentState->childIndex;
-                evbuffer_add_printf( data->out, ", " );
+                evbuffer_add( data->out, ", ", 2 );
                 jsonIndent( data );
                 break;
@@ -1195 +1198 @@
     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 )
@@ -1202 +1205 @@
         {
             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 '\\': {
+                char buf[2] = { '\\', *it };
+                evbuffer_add( data->out, buf, 2 );
+                break;
+            }
 
             default:
@@ -1229 +1221 @@
                 {
                     /*fprintf( stderr, "[%c]\n", *it );*/
-                    evbuffer_add_printf( data->out, "%c", *it );
+                    evbuffer_add( data->out, it, 1 );
                 }
                 else
@@ -1247 +1239 @@
         }
     }
-    evbuffer_add_printf( data->out, "\"" );
+    evbuffer_add( data->out, "\"", 1 );
     jsonChildFunc( data );
 }
@@ -1258 +1250 @@
 
     jsonPushParent( data, val );
-    evbuffer_add_printf( data->out, "{" );
+    evbuffer_add( data->out, "{", 1 );
     if( val->val.l.count )
         jsonIndent( data );
@@ -1271 +1263 @@
 
     jsonPushParent( data, val );
-    evbuffer_add_printf( data->out, "[" );
+    evbuffer_add( data->out, "[", 1 );
     if( nChildren )
         jsonIndent( data );
@@ -1301 +1293 @@
         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 );
 }