[GNUnet-SVN] r23010 - gnunet/src/testbed

[gnunet]

Author: harsha
Date: 2012-07-31 09:57:48 +0200 (Tue, 31 Jul 2012)
New Revision: 23010

Modified:
   gnunet/src/testbed/test_testbed_api_operations.c
   gnunet/src/testbed/testbed_api_operations.c
   gnunet/src/testbed/testbed_api_operations.h
Log:
-removed operation type

Modified: gnunet/src/testbed/test_testbed_api_operations.c
===================================================================
--- gnunet/src/testbed/test_testbed_api_operations.c    2012-07-31 07:38:37 UTC 
(rev 23009)
+++ gnunet/src/testbed/test_testbed_api_operations.c    2012-07-31 07:57:48 UTC 
(rev 23010)
@@ -190,16 +190,9 @@
   GNUNET_assert (NULL != q1);
   q2 = GNUNET_TESTBED_operation_queue_create_ (2);
   GNUNET_assert (NULL != q2);
-  op1 = GNUNET_TESTBED_operation_create_ (&op1,
-                                          start_cb,
-                                          release_cb,
-                                          OP_PEER_CREATE);
-                                          
+  op1 = GNUNET_TESTBED_operation_create_ (&op1, start_cb, release_cb);  
   GNUNET_assert (NULL != op1);
-  op2 = GNUNET_TESTBED_operation_create_ (&op2,
-                                          start_cb,
-                                          release_cb,
-                                          OP_PEER_CREATE);
+  op2 = GNUNET_TESTBED_operation_create_ (&op2, start_cb, release_cb);
   GNUNET_TESTBED_operation_queue_insert_ (q1, op1);
   GNUNET_TESTBED_operation_queue_insert_ (q2, op1);
   GNUNET_TESTBED_operation_queue_insert_ (q1, op2);

Modified: gnunet/src/testbed/testbed_api_operations.c
===================================================================
--- gnunet/src/testbed/testbed_api_operations.c 2012-07-31 07:38:37 UTC (rev 
23009)
+++ gnunet/src/testbed/testbed_api_operations.c 2012-07-31 07:57:48 UTC (rev 
23010)
@@ -116,11 +116,6 @@
   struct OperationQueue **queues;
 
   /**
-   * The Operation ID
-   */
-  uint64_t id;  
-
-  /**
    * The id of the task which calls OperationStart for this operation
    */
   GNUNET_SCHEDULER_TaskIdentifier start_task_id;
@@ -135,11 +130,6 @@
    */
   enum OperationState state;  
   
-  /**
-   * The type of the operation
-   */
-  enum OperationType type;
-  
 };
 
 
@@ -193,14 +183,12 @@
  * @param cls closure for the callbacks
  * @param start function to call to start the operation
  * @param release function to call to close down the operation
- * @param type the type of the operation
  * @return handle to the operation
  */
 struct GNUNET_TESTBED_Operation *
 GNUNET_TESTBED_operation_create_ (void *cls,
                                  OperationStart start,
-                                 OperationRelease release,
-                                 enum OperationType type)
+                                 OperationRelease release)
 {
   struct GNUNET_TESTBED_Operation *op;
 
@@ -208,7 +196,6 @@
   op->start = start;
   op->release = release;
   op->cb_cls = cls;
-  op->type = type;
   return op;  
 }
 

Modified: gnunet/src/testbed/testbed_api_operations.h
===================================================================
--- gnunet/src/testbed/testbed_api_operations.h 2012-07-31 07:38:37 UTC (rev 
23009)
+++ gnunet/src/testbed/testbed_api_operations.h 2012-07-31 07:57:48 UTC (rev 
23010)
@@ -38,44 +38,6 @@
 
 
 /**
- * Enumeration of operation types
- */
-enum OperationType
-  {
-    /**
-     * Peer create operation
-     */
-    OP_PEER_CREATE,
-    
-    /**
-     * Peer start operation
-     */
-    OP_PEER_START,
-
-    /**
-     * Peer stop operation
-     */
-    OP_PEER_STOP,
-
-    /**
-     * Peer destroy operation
-     */
-    OP_PEER_DESTROY,
-
-    /**
-     * Get peer information operation
-     */
-    OP_PEER_INFO,
-
-    /**
-     * Overlay connection operation
-     */
-    OP_OVERLAY_CONNECT,
-
-  };
-
-
-/**
  * Create an operation queue.
  *
  * @param max_active maximum number of operations in this
@@ -160,15 +122,12 @@
  * @param cls closure for the callbacks
  * @param start function to call to start the operation
  * @param release function to call to close down the operation
- * @param type the type of the operation
- * @param data operation's relavant data
  * @return handle to the operation
  */
 struct GNUNET_TESTBED_Operation *
 GNUNET_TESTBED_operation_create_ (void *cls,
                                  OperationStart start,
-                                 OperationRelease release,
-                                 enum OperationType type);
+                                 OperationRelease release);
 
 
 /**