- Handling of HUP and other poll errors improved in saAmfDispatch.

- Termination of testamf1 when saAmfDispatch returns an error.



git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@1171 fd59a12c-fef9-0310-b244-a6a79926bd2f

lib/amf.c

@@ -191,13 +191,16 @@ saAmfDispatch (
 	struct res_lib_amf_healthcheckcallback *res_lib_amf_healthcheckcallback;
 	struct res_lib_amf_csiremovecallback *res_lib_amf_csiremovecallback;
 	struct res_lib_amf_componentterminatecallback *res_lib_amf_componentterminatecallback;
-
-	/*
-	struct res_lib_amf_protectiongrouptrackcallback *res_lib_amf_protectiongrouptrackcallback;
-	*/
 	SaAmfCallbacksT callbacks;
 	struct res_overlay dispatch_data;
 
+	if (dispatchFlags != SA_DISPATCH_ONE &&
+		dispatchFlags != SA_DISPATCH_ALL &&
+		dispatchFlags != SA_DISPATCH_BLOCKING) {
+
+		return (SA_AIS_ERR_INVALID_PARAM);
+	}
+
 	error = saHandleInstanceGet (&amfHandleDatabase, amfHandle,
 		(void *)&amfInstance);
 	if (error != SA_AIS_OK) {
@@ -221,23 +224,21 @@ saAmfDispatch (
 
 		error = saPollRetry (&ufds, 1, timeout);
 		if (error != SA_AIS_OK) {
-			goto error_nounlock;
+			goto error_put;
 		}
 
 		pthread_mutex_lock (&amfInstance->dispatch_mutex);
 
-		error = saPollRetry (&ufds, 1, 0);
-		if (error != SA_AIS_OK) {
-			goto error_nounlock;
-		}
-
 		/*
 		 * Handle has been finalized in another thread
 		 */
 		if (amfInstance->finalize == 1) {
 			error = SA_AIS_OK;
-			pthread_mutex_unlock (&amfInstance->dispatch_mutex);
+			goto error_unlock;
+		}
 
+		if ((ufds.revents & (POLLERR|POLLHUP|POLLNVAL)) != 0) {
+			error = SA_AIS_ERR_BAD_HANDLE;
 			goto error_unlock;
 		}
 
@@ -378,7 +379,7 @@ saAmfDispatch (
 			break;
 		default:
 			error = SA_AIS_ERR_LIBRARY;	
-			goto error_nounlock;
+			goto error_put;
 			break;
 		}
 
@@ -397,8 +398,10 @@ saAmfDispatch (
 	} while (cont);
 
 error_unlock:
+	pthread_mutex_unlock (&amfInstance->dispatch_mutex);
+error_put:
 	saHandleInstancePut (&amfHandleDatabase, amfHandle);
-error_nounlock:
+
 	return (error);
 }
 

test/testamf1.c

@@ -370,9 +370,14 @@ int main (int argc, char **argv) {
 
 	do {
 		select (select_fd + 1, &read_fds, 0, 0, 0);
-		saAmfDispatch (handle, SA_DISPATCH_ALL);
+		result = saAmfDispatch (handle, SA_DISPATCH_ALL);
+
+		if (result != SA_AIS_OK) {
+			exit (-1);
+		}
 	} while (result && stop == 0);
 
+
 	printf ("healthchecks stopped for 5 seconds\n");
 	sleep (5);
 	result = saAmfHealthcheckStart (handle,
@@ -383,7 +388,7 @@ int main (int argc, char **argv) {
 
 	do {
 		select (select_fd + 1, &read_fds, 0, 0, 0);
-		saAmfDispatch (handle, SA_DISPATCH_ALL);
+		result = saAmfDispatch (handle, SA_DISPATCH_ALL);
 	} while (result);
 
 	saAmfFinalize (handle);