[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r24306 - in gnunet/src: include nse regex testbed
From: |
gnunet |
Subject: |
[GNUnet-SVN] r24306 - in gnunet/src: include nse regex testbed |
Date: |
Sun, 14 Oct 2012 14:21:48 +0200 |
Author: harsha
Date: 2012-10-14 14:21:48 +0200 (Sun, 14 Oct 2012)
New Revision: 24306
Modified:
gnunet/src/include/gnunet_testbed_service.h
gnunet/src/nse/gnunet-nse-profiler.c
gnunet/src/regex/test_regex_big.c
gnunet/src/testbed/gnunet-testbed-profiler.c
gnunet/src/testbed/test_testbed_api.c
gnunet/src/testbed/test_testbed_api_2peers_1controller.c
gnunet/src/testbed/test_testbed_api_3peers_3controllers.c
gnunet/src/testbed/test_testbed_api_controllerlink.c
gnunet/src/testbed/testbed_api_peers.c
gnunet/src/testbed/testbed_api_testbed.c
Log:
operation closure in peer start
Modified: gnunet/src/include/gnunet_testbed_service.h
===================================================================
--- gnunet/src/include/gnunet_testbed_service.h 2012-10-14 10:57:13 UTC (rev
24305)
+++ gnunet/src/include/gnunet_testbed_service.h 2012-10-14 12:21:48 UTC (rev
24306)
@@ -705,13 +705,16 @@
/**
* Start the given peer.
*
+ * @param op_cls the closure for this operation; will be set in
+ * event->details.operation_finished.op_cls when this operation fails.
* @param peer peer to start
* @param pcc function to call upon completion
* @param pcc_cls closure for 'pcc'
* @return handle to the operation
*/
struct GNUNET_TESTBED_Operation *
-GNUNET_TESTBED_peer_start (struct GNUNET_TESTBED_Peer *peer,
+GNUNET_TESTBED_peer_start (void *op_cls,
+ struct GNUNET_TESTBED_Peer *peer,
GNUNET_TESTBED_PeerChurnCallback pcc,
void *pcc_cls);
Modified: gnunet/src/nse/gnunet-nse-profiler.c
===================================================================
--- gnunet/src/nse/gnunet-nse-profiler.c 2012-10-14 10:57:13 UTC (rev
24305)
+++ gnunet/src/nse/gnunet-nse-profiler.c 2012-10-14 12:21:48 UTC (rev
24306)
@@ -836,7 +836,7 @@
/* start peers if we have too few */
for (i=peers_running;i<num_peers_in_round[current_round];i++)
- GNUNET_TESTBED_peer_start (daemons[i], NULL, NULL);
+ GNUNET_TESTBED_peer_start (NULL, daemons[i], NULL, NULL);
/* stop peers if we have too many */
for (i=num_peers_in_round[current_round];i<peers_running;i++)
Modified: gnunet/src/regex/test_regex_big.c
===================================================================
--- gnunet/src/regex/test_regex_big.c 2012-10-14 10:57:13 UTC (rev 24305)
+++ gnunet/src/regex/test_regex_big.c 2012-10-14 12:21:48 UTC (rev 24306)
@@ -434,7 +434,7 @@
peer_id = i; // FIXME A * i + B
peers[peer_id] = peer;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " Peer %i created\n", peer_id);
- op[i] = GNUNET_TESTBED_peer_start (peer, peer_start_cb, (void *) i);
+ op[i] = GNUNET_TESTBED_peer_start (NULL, peer, peer_start_cb, (void *) i);
}
Modified: gnunet/src/testbed/gnunet-testbed-profiler.c
===================================================================
--- gnunet/src/testbed/gnunet-testbed-profiler.c 2012-10-14 10:57:13 UTC
(rev 24305)
+++ gnunet/src/testbed/gnunet-testbed-profiler.c 2012-10-14 12:21:48 UTC
(rev 24306)
@@ -283,7 +283,7 @@
for (peer_cnt = 0; peer_cnt < num_peers; peer_cnt++)
{
dll_op = GNUNET_malloc (sizeof (struct DLLOperation));
- dll_op->op = GNUNET_TESTBED_peer_start (peers[peer_cnt], NULL, NULL);
+ dll_op->op = GNUNET_TESTBED_peer_start (NULL, peers[peer_cnt], NULL,
NULL);
GNUNET_CONTAINER_DLL_insert_tail (dll_op_head, dll_op_tail, dll_op);
}
}
Modified: gnunet/src/testbed/test_testbed_api.c
===================================================================
--- gnunet/src/testbed/test_testbed_api.c 2012-10-14 10:57:13 UTC (rev
24305)
+++ gnunet/src/testbed/test_testbed_api.c 2012-10-14 12:21:48 UTC (rev
24306)
@@ -355,7 +355,7 @@
GNUNET_assert (NULL != peer_ptr);
*peer_ptr = peer;
GNUNET_TESTBED_operation_done (operation);
- operation = GNUNET_TESTBED_peer_start (peer, NULL, NULL);
+ operation = GNUNET_TESTBED_peer_start (NULL, peer, NULL, NULL);
GNUNET_assert (NULL != operation);
}
Modified: gnunet/src/testbed/test_testbed_api_2peers_1controller.c
===================================================================
--- gnunet/src/testbed/test_testbed_api_2peers_1controller.c 2012-10-14
10:57:13 UTC (rev 24305)
+++ gnunet/src/testbed/test_testbed_api_2peers_1controller.c 2012-10-14
12:21:48 UTC (rev 24306)
@@ -399,7 +399,7 @@
GNUNET_assert (NULL == pc->peer);
pc->peer = peer;
GNUNET_TESTBED_operation_done (pc->operation);
- pc->operation = GNUNET_TESTBED_peer_start (pc->peer, NULL, NULL);
+ pc->operation = GNUNET_TESTBED_peer_start (NULL, pc->peer, NULL, NULL);
}
Modified: gnunet/src/testbed/test_testbed_api_3peers_3controllers.c
===================================================================
--- gnunet/src/testbed/test_testbed_api_3peers_3controllers.c 2012-10-14
10:57:13 UTC (rev 24305)
+++ gnunet/src/testbed/test_testbed_api_3peers_3controllers.c 2012-10-14
12:21:48 UTC (rev 24306)
@@ -388,7 +388,7 @@
peer1.peer = peer;
GNUNET_TESTBED_operation_done (peer1.operation);
result = PEER1_CREATED;
- peer1.operation = GNUNET_TESTBED_peer_start (peer, NULL, NULL);
+ peer1.operation = GNUNET_TESTBED_peer_start (NULL, peer, NULL, NULL);
break;
case CONTROLLER2_UP:
GNUNET_assert (NULL != peer2.operation);
@@ -397,7 +397,7 @@
peer2.peer = peer;
GNUNET_TESTBED_operation_done (peer2.operation);
result = PEER2_CREATED;
- peer2.operation = GNUNET_TESTBED_peer_start (peer, NULL, NULL);
+ peer2.operation = GNUNET_TESTBED_peer_start (NULL, peer, NULL, NULL);
break;
case CONTROLLER3_UP:
GNUNET_assert (NULL != peer3.operation);
@@ -406,7 +406,7 @@
peer3.peer = peer;
GNUNET_TESTBED_operation_done (peer3.operation);
result = PEER3_CREATED;
- peer3.operation = GNUNET_TESTBED_peer_start (peer, NULL, NULL);
+ peer3.operation = GNUNET_TESTBED_peer_start (NULL, peer, NULL, NULL);
break;
default:
GNUNET_assert (0);
Modified: gnunet/src/testbed/test_testbed_api_controllerlink.c
===================================================================
--- gnunet/src/testbed/test_testbed_api_controllerlink.c 2012-10-14
10:57:13 UTC (rev 24305)
+++ gnunet/src/testbed/test_testbed_api_controllerlink.c 2012-10-14
12:21:48 UTC (rev 24306)
@@ -355,7 +355,7 @@
result = MASTER_PEER_CREATE_SUCCESS;
master_peer = peer;
GNUNET_TESTBED_operation_done (op);
- op = GNUNET_TESTBED_peer_start (master_peer, NULL, NULL);
+ op = GNUNET_TESTBED_peer_start (NULL, master_peer, NULL, NULL);
break;
case SLAVE2_LINK_SUCCESS:
result = SLAVE1_PEER_CREATE_SUCCESS;
@@ -367,7 +367,7 @@
result = SLAVE2_PEER_CREATE_SUCCESS;
slave2_peer = peer;
GNUNET_TESTBED_operation_done (op);
- op = GNUNET_TESTBED_peer_start (slave1_peer, NULL, NULL);
+ op = GNUNET_TESTBED_peer_start (NULL, slave1_peer, NULL, NULL);
break;
default:
GNUNET_assert (0);
@@ -460,7 +460,7 @@
GNUNET_assert (event->details.peer_stop.peer == slave1_peer);
GNUNET_TESTBED_operation_done (op);
result = SLAVE1_PEER_STOP_SUCCESS;
- op = GNUNET_TESTBED_peer_start (slave2_peer, NULL, NULL);
+ op = GNUNET_TESTBED_peer_start (NULL, slave2_peer, NULL, NULL);
GNUNET_assert (NULL != op);
break;
case SLAVE1_PEER_STOP_SUCCESS:
Modified: gnunet/src/testbed/testbed_api_peers.c
===================================================================
--- gnunet/src/testbed/testbed_api_peers.c 2012-10-14 10:57:13 UTC (rev
24305)
+++ gnunet/src/testbed/testbed_api_peers.c 2012-10-14 12:21:48 UTC (rev
24306)
@@ -495,13 +495,16 @@
/**
* Start the given peer.
*
+ * @param op_cls the closure for this operation; will be set in
+ * event->details.operation_finished.op_cls when this operation fails.
* @param peer peer to start
* @param pcc function to call upon completion
* @param pcc_cls closure for 'pcc'
* @return handle to the operation
*/
struct GNUNET_TESTBED_Operation *
-GNUNET_TESTBED_peer_start (struct GNUNET_TESTBED_Peer *peer,
+GNUNET_TESTBED_peer_start (void *op_cls,
+ struct GNUNET_TESTBED_Peer *peer,
GNUNET_TESTBED_PeerChurnCallback pcc,
void *pcc_cls)
{
@@ -515,6 +518,7 @@
opc = GNUNET_malloc (sizeof (struct OperationContext));
opc->c = peer->controller;
opc->data = data;
+ opc->op_cls = op_cls;
opc->id = GNUNET_TESTBED_get_next_op_id (opc->c);
opc->type = OP_PEER_START;
opc->op =
Modified: gnunet/src/testbed/testbed_api_testbed.c
===================================================================
--- gnunet/src/testbed/testbed_api_testbed.c 2012-10-14 10:57:13 UTC (rev
24305)
+++ gnunet/src/testbed/testbed_api_testbed.c 2012-10-14 12:21:48 UTC (rev
24306)
@@ -199,7 +199,7 @@
for (peer = 0; peer < rc->num_peers; peer++)
{
dll_op = GNUNET_malloc (sizeof (struct DLLOperation));
- dll_op->op = GNUNET_TESTBED_peer_start (rc->peers[peer], NULL, NULL);
+ dll_op->op = GNUNET_TESTBED_peer_start (NULL, rc->peers[peer], NULL, NULL);
dll_op->cls = rc->peers[peer];
GNUNET_CONTAINER_DLL_insert_tail (rc->dll_op_head, rc->dll_op_tail,
dll_op);
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r24306 - in gnunet/src: include nse regex testbed,
gnunet <=