[Assorted-commits] SF.net SVN: assorted:[1256] ydb/trunk/src

[<yan...@us...>]

Revision: 1256
          http://assorted.svn.sourceforge.net/assorted/?rev=1256&view=rev
Author:   yangzhang
Date:     2009-03-06 02:32:19 +0000 (Fri, 06 Mar 2009)

Log Message:
-----------
pb_types -> pb_traits, rb_types -> rb_traits

Modified Paths:
--------------
    ydb/trunk/src/main.lzz.clamp
    ydb/trunk/src/ser.cc
    ydb/trunk/src/ser.h

Modified: ydb/trunk/src/main.lzz.clamp
===================================================================
--- ydb/trunk/src/main.lzz.clamp	2009-03-05 23:16:46 UTC (rev 1255)
+++ ydb/trunk/src/main.lzz.clamp	2009-03-06 02:32:19 UTC (rev 1256)
@@ -652,7 +652,7 @@
         --seqno;
         r.reset_range(txn_start, w.cur());
         if (!Types::is_pb()) txn.Clear();
-        process_txn<Types, pb_types>(g_map, txn, seqno, nullptr);
+        process_txn<Types, pb_traits>(g_map, txn, seqno, nullptr);
       }
 
       // Checkpoint.
@@ -1571,7 +1571,7 @@
           batch.Clear();
           for (int t = 0; t < batch.txn_size(); ++t) {
             const Txn &txn = batch.txn(t);
-            process_txn<rb_types, rb_types>(map, txn, seqno, nullptr);
+            process_txn<rb_traits, rb_traits>(map, txn, seqno, nullptr);
             if (fake_exec && !Types::is_pb()) {
               reader.skip(txn.op_size() * Op_Size);
             }
@@ -1592,7 +1592,7 @@
       while (!backlog.empty()) {
         using pb::Txn;
         shared_ptr<Txn> p = backlog.take();
-        process_txn<pb_types, pb_types>(map, *p, seqno, nullptr);
+        process_txn<pb_traits, pb_traits>(map, *p, seqno, nullptr);
         if (check_interval(p->seqno(), catch_up_display)) {
           cout << "processed txn " << p->seqno() << " off the backlog; "
                << "backlog.size = " << backlog.queue().size() << endl;
@@ -1885,29 +1885,29 @@
     if (is_leader) {
       if (use_pb) {
         if (use_pb_res) {
-          run_leader<pb_types, pb_types>(minreps, leader_port);
+          run_leader<pb_traits, pb_traits>(minreps, leader_port);
         } else {
-          run_leader<pb_types, rb_types>(minreps, leader_port);
+          run_leader<pb_traits, rb_traits>(minreps, leader_port);
         }
       } else {
         if (use_pb_res) {
-          run_leader<rb_types, pb_types>(minreps, leader_port);
+          run_leader<rb_traits, pb_traits>(minreps, leader_port);
         } else {
-          run_leader<rb_types, rb_types>(minreps, leader_port);
+          run_leader<rb_traits, rb_traits>(minreps, leader_port);
         }
       }
     } else {
       if (use_pb) {
         if (use_pb_res) {
-          run_replica<pb_types, pb_types>(leader_host, leader_port, listen_port);
+          run_replica<pb_traits, pb_traits>(leader_host, leader_port, listen_port);
         } else {
-          run_replica<pb_types, rb_types>(leader_host, leader_port, listen_port);
+          run_replica<pb_traits, rb_traits>(leader_host, leader_port, listen_port);
         }
       } else {
         if (use_pb_res) {
-          run_replica<rb_types, pb_types>(leader_host, leader_port, listen_port);
+          run_replica<rb_traits, pb_traits>(leader_host, leader_port, listen_port);
         } else {
-          run_replica<rb_types, rb_types>(leader_host, leader_port, listen_port);
+          run_replica<rb_traits, rb_traits>(leader_host, leader_port, listen_port);
         }
       }
     }

Modified: ydb/trunk/src/ser.cc
===================================================================
--- ydb/trunk/src/ser.cc	2009-03-05 23:16:46 UTC (rev 1255)
+++ ydb/trunk/src/ser.cc	2009-03-06 02:32:19 UTC (rev 1256)
@@ -138,15 +138,15 @@
     st_netfd_t dst = checkerr(st_accept(listener, nullptr, nullptr,
                                         ST_UTIME_NO_TIMEOUT));
     if (use_pb)
-      producer<pb_types>(dst);
+      producer<pb_traits>(dst);
     else
-      producer<rb_types>(dst);
+      producer<rb_traits>(dst);
   } else {
     st_netfd_t src = st_tcp_connect(argv[use_pb ? 2 : 1], 7654, ST_UTIME_NO_TIMEOUT);
     if (use_pb)
-      consumer<pb_types>(src);
+      consumer<pb_traits>(src);
     else
-      consumer<rb_types>(src);
+      consumer<rb_traits>(src);
   }
   return 0;
 }

Modified: ydb/trunk/src/ser.h
===================================================================
--- ydb/trunk/src/ser.h	2009-03-05 23:16:46 UTC (rev 1255)
+++ ydb/trunk/src/ser.h	2009-03-06 02:32:19 UTC (rev 1256)
@@ -43,7 +43,7 @@
     int ByteSize() const { throw_operation_not_supported(); } \
 
 #define MAKE_TYPE_BATCH(name, ns, b) \
-  struct name##_types { \
+  struct name##_traits { \
     typedef ydb::ns::TxnBatch TxnBatch; \
     typedef ydb::ns::Txn Txn; \
     typedef ydb::ns::Op Op; \


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.