Changeset 8414

Timestamp:

May 16, 2009, 5:51:52 AM (14 years ago)

Author:

charles

Message:

(trunk) add an option to the JSON generator to disable the human-readable indentations. Keep indenting the data files such as settings.json, but don't indent the messages used for RPC. This cuts the cost of deflate()ing those RPC messages by about 80%...

Location:

trunk

Files:

• daemon/daemon.c (modified) (1 diff)
• daemon/remote.c (modified) (2 diffs)
• gtk/tr-core.c (modified) (1 diff)
• libtransmission/bencode-test.c (modified) (1 diff)
• libtransmission/bencode.c (modified) (6 diffs)
• libtransmission/bencode.h (modified) (1 diff)
• libtransmission/json-test.c (modified) (1 diff)
• libtransmission/rpc-server.c (modified) (1 diff)
• libtransmission/rpcimpl.c (modified) (3 diffs)
• libtransmission/torrent.c (modified) (1 diff)
• qt/prefs.cc (modified) (1 diff)
• qt/session.cc (modified) (1 diff)

trunk/daemon/daemon.c

@@ -301 +301 @@
         struct evbuffer * buf = tr_getBuffer( );
 
-        tr_bencSaveAsJSON( &settings, buf );
+        tr_bencSaveAsJSON( &settings, buf, TRUE );
         fprintf( stderr, "%s", (char*)EVBUFFER_DATA(buf) );
 

trunk/daemon/remote.c

@@ -619 +619 @@
         {
             struct evbuffer * buf = tr_getBuffer( );
-            reqs[reqCount++] = tr_strdup( tr_bencSaveAsJSON( &top, buf ) );
+            reqs[reqCount++] = tr_strdup( tr_bencSaveAsJSON( &top, buf, FALSE ) );
             tr_releaseBuffer( buf );
         }
@@ -1262 +1262 @@
 
     if( debug )
-        fprintf( stderr, "got response:\n--------\n%*.*s\n--------\n",
-                 (int)len, (int)len, (const char*) response );
+        fprintf( stderr, "got response (len %d):\n--------\n%*.*s\n--------\n",
+                 (int)len, (int)len, (int)len, (const char*) response );
 
     if( tr_jsonParse( response, len, &top, NULL ) )

trunk/gtk/tr-core.c

@@ -1445 +1445 @@
 tr_core_exec( TrCore * core, const tr_benc * top )
 {
-    char * json = tr_bencToJSON( top );
+    char * json = tr_bencToJSON( top, FALSE );
     tr_core_exec_json( core, json );
     tr_free( json );

trunk/libtransmission/bencode-test.c

@@ -325 +325 @@
 
     tr_bencLoad( benc_str, strlen( benc_str ), &top, NULL );
-    serialized = tr_bencSaveAsJSON( &top, buf );
+    serialized = tr_bencSaveAsJSON( &top, buf, TRUE );
     stripWhitespace( serialized );
 #if 0

trunk/libtransmission/bencode.c

@@ -1181 +1181 @@
 struct jsonWalk
 {
-    tr_list *          parents;
+    tr_bool doIndent;
+    tr_list * parents;
     struct evbuffer *  out;
 };
@@ -1188 +1189 @@
 jsonIndent( struct jsonWalk * data )
 {
-    char buf[1024];
-    const int width = tr_list_size( data->parents ) * 4;
-
-    buf[0] = '\n';
-    memset( buf+1, ' ', width );
-    evbuffer_add( data->out, buf, 1+width );
+    if( data->doIndent )
+    {
+        char buf[1024];
+        const int width = tr_list_size( data->parents ) * 4;
+
+        buf[0] = '\n';
+        memset( buf+1, ' ', width );
+        evbuffer_add( data->out, buf, 1+width );
+    }
 }
 
@@ -1397 +1401 @@
                                             
 char*
-tr_bencSaveAsJSON( const tr_benc * top, struct evbuffer * out )
+tr_bencSaveAsJSON( const tr_benc * top, struct evbuffer * out, tr_bool doIndent )
 {
     struct jsonWalk data;
@@ -1403 +1407 @@
     evbuffer_drain( out, EVBUFFER_LENGTH( out ) );
 
+    data.doIndent = doIndent;
     data.out = out;
     data.parents = NULL;
@@ -1415 +1420 @@
 
 char*
-tr_bencToJSON( const tr_benc * top )
+tr_bencToJSON( const tr_benc * top, tr_bool doIndent )
 {
     char * ret;
     struct evbuffer * buf = evbuffer_new( );
-    tr_bencSaveAsJSON( top, buf );
+    tr_bencSaveAsJSON( top, buf, doIndent );
     ret = tr_strndup( EVBUFFER_DATA( buf ), EVBUFFER_LENGTH( buf ) );
     evbuffer_free( buf );
@@ -1562 +1567 @@
 {
     struct evbuffer * buf = tr_getBuffer( );
-    const char * json = tr_bencSaveAsJSON( b, buf );
+    const char * json = tr_bencSaveAsJSON( b, buf, TRUE );
     const int err = saveFile( filename, json, EVBUFFER_LENGTH( buf ) );
     tr_releaseBuffer( buf );

trunk/libtransmission/bencode.h

@@ -85 +85 @@
 char*     tr_bencSave( const tr_benc * val, int * len );
 
-char*     tr_bencSaveAsJSON( const tr_benc * top, struct evbuffer * out );
-
-char*     tr_bencToJSON( const tr_benc * top );
+char*     tr_bencSaveAsJSON( const tr_benc * top, struct evbuffer * out, tr_bool doIndent );
+
+char*     tr_bencToJSON( const tr_benc * top, tr_bool doIndent );
 
 int       tr_bencSaveFile( const char * filename, const tr_benc * );

trunk/libtransmission/json-test.c

@@ -75 +75 @@
     check( tr_bencDictFindStr( &top, "key", &str ) );
     check( !strcmp( str, "Letöltések" ) );
-    json = tr_bencSaveAsJSON( &top, buf );
+    json = tr_bencSaveAsJSON( &top, buf, TRUE );
     if( !err )
         tr_bencFree( &top );

trunk/libtransmission/rpc-server.c

@@ -270 +270 @@
                 tr_bencDictAddStr( args, "metainfo", b64 );
                 tr_bencDictAddBool( args, "paused", paused );
-                tr_bencSaveAsJSON( &top, json );
+                tr_bencSaveAsJSON( &top, json, FALSE );
                 tr_rpc_request_exec_json( server->session,
                                           EVBUFFER_DATA( json ),

trunk/libtransmission/rpcimpl.c

@@ -93 +93 @@
     tr_bencDictAddStr( data->response, "result", result );
 
-    tr_bencSaveAsJSON( data->response, buf );
+    tr_bencSaveAsJSON( data->response, buf, FALSE );
     (*data->callback)( data->session, (const char*)EVBUFFER_DATA(buf),
                        EVBUFFER_LENGTH(buf), data->callback_user_data );
@@ -1337 +1337 @@
         if( tr_bencDictFindInt( request, "tag", &tag ) )
             tr_bencDictAddInt( &response, "tag", tag );
-        tr_bencSaveAsJSON( &response, buf );
+        tr_bencSaveAsJSON( &response, buf, FALSE );
         (*callback)( session, (const char*)EVBUFFER_DATA(buf),
                      EVBUFFER_LENGTH( buf ), callback_user_data );
@@ -1359 +1359 @@
         if( tr_bencDictFindInt( request, "tag", &tag ) )
             tr_bencDictAddInt( &response, "tag", tag );
-        tr_bencSaveAsJSON( &response, buf );
+        tr_bencSaveAsJSON( &response, buf, FALSE );
         (*callback)( session, (const char*)EVBUFFER_DATA(buf),
                      EVBUFFER_LENGTH(buf), callback_user_data );

trunk/libtransmission/torrent.c

@@ -1065 +1065 @@
         else
         {
-            const tr_block_index_t firstBlockOfLastPiece = tr_torPieceFirstBlock( tor, f->lastPiece );
-            const tr_block_index_t lastBlockOfFirstPiece = tr_torPieceFirstBlock( tor, f->firstPiece )
-                                                         + tr_torPieceCountBlocks( tor, f->firstPiece )
-                                                         - 1;
+            int64_t b = 0;
+            const tr_block_index_t firstBlockOfLastPiece
+                       = tr_torPieceFirstBlock( tor, f->lastPiece );
+            const tr_block_index_t lastBlockOfFirstPiece
+                       = tr_torPieceFirstBlock( tor, f->firstPiece )
+                         + tr_torPieceCountBlocks( tor, f->firstPiece ) - 1;
+
             /* the rest of the first piece */
             for( i=firstBlock+1; i<lastBlock && i<=lastBlockOfFirstPiece; ++i )
                 if( tr_cpBlockIsCompleteFast( &tor->completion, i ) )
-                    total += tor->blockSize;
+                    ++b;
 
             /* the middle pieces */
-            if( f->firstPiece + 1 < f->lastPiece ) {
-                uint64_t b = tor->blockCountInPiece * ( f->lastPiece - ( f->firstPiece + 1 ) );
+            if( f->firstPiece + 1 < f->lastPiece )
                 for( i=f->firstPiece+1; i<f->lastPiece; ++i )
-                    b -= tr_cpMissingBlocksInPiece( &tor->completion, i );
-                b *= tor->blockSize;
-                total += b;
-            }
+                    b += tor->blockCountInPiece - tr_cpMissingBlocksInPiece( &tor->completion, i );
 
             /* the rest of the last piece */
             for( i=firstBlockOfLastPiece; i<lastBlock; ++i )
                 if( tr_cpBlockIsCompleteFast( &tor->completion, i ) )
-                    total += tor->blockSize;
+                    ++b;
+
+            b *= tor->blockSize;
+            total += b;
         }
 

trunk/qt/prefs.cc

@@ -218 +218 @@
 
     /* write back out the serialized preferences */
-    char * json = tr_bencToJSON( &top );
+    char * json = tr_bencToJSON( &top, TRUE );
     if( json && *json ) {
         file.open( QIODevice::WriteOnly | QIODevice::Text );

trunk/qt/session.cc

@@ -532 +532 @@
 Session :: exec( const tr_benc * request )
 {
-    char * str( tr_bencToJSON( request ) );
+    char * str( tr_bencToJSON( request, FALSE ) );
     exec( str );
     tr_free( str );