[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r17678 - in gnunet/src: arm include util
From: |
gnunet |
Subject: |
[GNUnet-SVN] r17678 - in gnunet/src: arm include util |
Date: |
Sun, 23 Oct 2011 12:06:08 +0200 |
Author: grothoff
Date: 2011-10-23 12:06:07 +0200 (Sun, 23 Oct 2011)
New Revision: 17678
Modified:
gnunet/src/arm/arm_api.c
gnunet/src/arm/test_exponential_backoff.c
gnunet/src/include/gnunet_client_lib.h
gnunet/src/util/client.c
gnunet/src/util/connection.c
Log:
getting rid of unnecessary ignore_shutdown calls
Modified: gnunet/src/arm/arm_api.c
===================================================================
--- gnunet/src/arm/arm_api.c 2011-10-22 21:59:27 UTC (rev 17677)
+++ gnunet/src/arm/arm_api.c 2011-10-23 10:06:07 UTC (rev 17678)
@@ -470,7 +470,6 @@
GNUNET_CLIENT_disconnect (sc->h->client, GNUNET_NO);
sc->h->client = GNUNET_CLIENT_connect ("arm", sc->h->cfg);
GNUNET_assert (NULL != sc->h->client);
- GNUNET_CLIENT_ignore_shutdown (sc->h->client, GNUNET_YES);
if (sc->callback != NULL)
sc->callback (sc->cls, GNUNET_SYSERR);
GNUNET_free (sc);
@@ -618,7 +617,6 @@
}
LOG (GNUNET_ERROR_TYPE_DEBUG,
"arm_api, GNUNET_CLIENT_connect returned non-NULL\n");
- GNUNET_CLIENT_ignore_shutdown (client, GNUNET_YES);
h->client = client;
}
LOG (GNUNET_ERROR_TYPE_DEBUG, "arm_api, h->client non-NULL\n");
@@ -673,7 +671,6 @@
cb (cb_cls, GNUNET_SYSERR);
return;
}
- GNUNET_CLIENT_ignore_shutdown (client, GNUNET_YES);
h->client = client;
}
if (0 == strcasecmp ("arm", service_name))
Modified: gnunet/src/arm/test_exponential_backoff.c
===================================================================
--- gnunet/src/arm/test_exponential_backoff.c 2011-10-22 21:59:27 UTC (rev
17677)
+++ gnunet/src/arm/test_exponential_backoff.c 2011-10-23 10:06:07 UTC (rev
17678)
@@ -188,7 +188,7 @@
if (size < sizeof (struct GNUNET_MessageHeader))
{
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
_("Failed to transmit shutdown request to client.\n"));
shutdown_ctx->cont (shutdown_ctx->cont_cls, GNUNET_SYSERR);
GNUNET_CLIENT_disconnect (shutdown_ctx->sock, GNUNET_NO);
Modified: gnunet/src/include/gnunet_client_lib.h
===================================================================
--- gnunet/src/include/gnunet_client_lib.h 2011-10-22 21:59:27 UTC (rev
17677)
+++ gnunet/src/include/gnunet_client_lib.h 2011-10-23 10:06:07 UTC (rev
17678)
@@ -59,18 +59,6 @@
/**
- * Configure this connection to ignore shutdown signals.
- *
- * @param h client handle
- * @param do_ignore GNUNET_YES to ignore, GNUNET_NO to restore default
- */
-void
-GNUNET_CLIENT_ignore_shutdown (struct GNUNET_CLIENT_Connection *h,
- int do_ignore);
-
-
-
-/**
* Destroy connection with the service. This will automatically
* cancel any pending "receive" request (however, the handler will
* *NOT* be called, not even with a NULL message). Any pending
Modified: gnunet/src/util/client.c
===================================================================
--- gnunet/src/util/client.c 2011-10-22 21:59:27 UTC (rev 17677)
+++ gnunet/src/util/client.c 2011-10-23 10:06:07 UTC (rev 17678)
@@ -242,11 +242,6 @@
int in_receive;
/**
- * Are we ignoring shutdown signals?
- */
- int ignore_shutdown;
-
- /**
* How often have we tried to connect?
*/
unsigned int attempts;
@@ -382,22 +377,6 @@
/**
- * Configure this connection to ignore shutdown signals.
- *
- * @param h client handle
- * @param do_ignore GNUNET_YES to ignore, GNUNET_NO to restore default
- */
-void
-GNUNET_CLIENT_ignore_shutdown (struct GNUNET_CLIENT_Connection *h,
- int do_ignore)
-{
- h->ignore_shutdown = do_ignore;
- if (h->sock != NULL)
- GNUNET_CONNECTION_ignore_shutdown (h->sock, do_ignore);
-}
-
-
-/**
* Destroy connection with the service. This will automatically
* cancel any pending "receive" request (however, the handler will
* *NOT* be called, not even with a NULL message). Any pending
@@ -960,8 +939,6 @@
GNUNET_SCHEDULER_add_delayed (delay, &client_delayed_retry, th);
return;
}
- GNUNET_CONNECTION_ignore_shutdown (th->sock->sock,
- th->sock->ignore_shutdown);
th->th =
GNUNET_CONNECTION_notify_transmit_ready (th->sock->sock, th->size,
GNUNET_TIME_absolute_get_remaining
Modified: gnunet/src/util/connection.c
===================================================================
--- gnunet/src/util/connection.c 2011-10-22 21:59:27 UTC (rev 17677)
+++ gnunet/src/util/connection.c 2011-10-23 10:06:07 UTC (rev 17678)
@@ -1495,7 +1495,8 @@
GNUNET_assert (sock->nth.timeout_task == GNUNET_SCHEDULER_NO_TASK);
if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
{
- if (sock->ignore_shutdown == GNUNET_YES)
+ if ( (sock->ignore_shutdown == GNUNET_YES) &&
+ (NULL != sock->sock) )
goto SCHEDULE_WRITE; /* ignore shutdown, go again immediately */
#if DEBUG_CONNECTION
LOG (GNUNET_ERROR_TYPE_DEBUG,
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r17678 - in gnunet/src: arm include util,
gnunet <=