Author: ngie
Date: Wed Jan  4 08:35:46 2017
New Revision: 311269
URL: https://svnweb.freebsd.org/changeset/base/311269

Log:
  swapcontext1: test for getcontext(3) and swapcontext(3) success properly
  
  The beforementioned libcalls both succeed if the return codes aren't -1
  
  MFC after:    3 days
  Reported by:  Coverity
  CID:          976790, 976791

Modified:
  head/contrib/netbsd-tests/lib/libpthread/t_swapcontext.c

Modified: head/contrib/netbsd-tests/lib/libpthread/t_swapcontext.c
==============================================================================
--- head/contrib/netbsd-tests/lib/libpthread/t_swapcontext.c    Wed Jan  4 
08:25:31 2017        (r311268)
+++ head/contrib/netbsd-tests/lib/libpthread/t_swapcontext.c    Wed Jan  4 
08:35:46 2017        (r311269)
@@ -30,6 +30,8 @@ __RCSID("$NetBSD");
 
 #ifdef __FreeBSD__
 #include <sys/types.h>
+#include <errno.h>
+#include <string.h>
 #endif
 #include <pthread.h>
 #include <ucontext.h>
@@ -80,7 +82,12 @@ threadfunc(void *arg)
        
        oself = (void *)pthread_self();
        printf("before swapcontext self = %p\n", oself);
+#ifdef __FreeBSD__
+       ATF_REQUIRE_MSG(swapcontext(&octx, &nctx) != -1, "swapcontext failed: 
%s",
+           strerror(errno));
+#else
        PTHREAD_REQUIRE(swapcontext(&octx, &nctx));
+#endif
 
        /* NOTREACHED */
        return NULL;
@@ -111,7 +118,12 @@ ATF_TC_BODY(swapcontext1, tc)
 
        printf("Testing if swapcontext() alters pthread_self()\n");
 
+#ifdef __FreeBSD__
+       ATF_REQUIRE_MSG(getcontext(&nctx) != -1, "getcontext failed: %s",
+           strerror(errno));
+#else
        PTHREAD_REQUIRE(getcontext(&nctx));
+#endif
        PTHREAD_REQUIRE(pthread_create(&thread, NULL, threadfunc, NULL));
        PTHREAD_REQUIRE(pthread_join(thread, NULL));
 }
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"

Reply via email to