Author: gonzalo
Date: 2005-05-10 14:27:18 -0400 (Tue, 10 May 2005)
New Revision: 44340
Modified:
branches/mono-1-1-7/mono/mono/io-layer/ChangeLog
branches/mono-1-1-7/mono/mono/io-layer/shared.c
Log:
2005-05-10 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
* shared.c: don't display warnings after reboots.
Modified: branches/mono-1-1-7/mono/mono/io-layer/ChangeLog
===================================================================
--- branches/mono-1-1-7/mono/mono/io-layer/ChangeLog 2005-05-10 17:38:32 UTC
(rev 44339)
+++ branches/mono-1-1-7/mono/mono/io-layer/ChangeLog 2005-05-10 18:27:18 UTC
(rev 44340)
@@ -1,3 +1,7 @@
+2005-05-10 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
+
+ * shared.c: don't display warnings after reboots.
+
2005-05-07 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
* sockets.c: on windows, getsockopt/setsockopt for send/receive timeout
Modified: branches/mono-1-1-7/mono/mono/io-layer/shared.c
===================================================================
--- branches/mono-1-1-7/mono/mono/io-layer/shared.c 2005-05-10 17:38:32 UTC
(rev 44339)
+++ branches/mono-1-1-7/mono/mono/io-layer/shared.c 2005-05-10 18:27:18 UTC
(rev 44340)
@@ -246,6 +246,7 @@
} defs;
ushort def_vals[_WAPI_SHARED_SEM_COUNT];
int i;
+ int retries = 0;
for (i = 0; i < _WAPI_SHARED_SEM_COUNT; i++) {
def_vals[i] = 1;
@@ -253,6 +254,7 @@
defs.array = def_vals;
again:
+ retries++;
oldkey = _wapi_shared_layout->sem_key;
if (oldkey == 0) {
@@ -268,7 +270,9 @@
while ((_wapi_sem_id = semget (key, _WAPI_SHARED_SEM_COUNT,
IPC_CREAT | IPC_EXCL | 0600)) ==
-1) {
if (errno != EEXIST) {
- g_warning ("%s: semget error: %s key 0x%x -
trying again", __func__, g_strerror (errno), key);
+ if (retries > 3)
+ g_warning ("%s: semget error: %s key
0x%x - trying again", __func__,
+ g_strerror (errno),
key);
}
key++;
@@ -282,7 +286,8 @@
*/
if (semctl (_wapi_sem_id, 0, SETALL, defs) == -1) {
- g_warning ("%s: semctl init error: %s - trying again",
__func__, g_strerror (errno));
+ if (retries > 3)
+ g_warning ("%s: semctl init error: %s - trying
again", __func__, g_strerror (errno));
/* Something went horribly wrong, so try
* getting a new set from scratch
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
