svn commit: r297413 - user/pho/stress2/misc

Peter Holm pho at FreeBSD.org
Wed Mar 30 07:29:53 UTC 2016


Author: pho
Date: Wed Mar 30 07:29:52 2016
New Revision: 297413
URL: https://svnweb.freebsd.org/changeset/base/297413

Log:
  Fix error checking in datamove3.sh and do not unmap random pages in
  datamove4.sh
  
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  user/pho/stress2/misc/datamove3.sh
  user/pho/stress2/misc/datamove4.sh

Modified: user/pho/stress2/misc/datamove3.sh
==============================================================================
--- user/pho/stress2/misc/datamove3.sh	Wed Mar 30 07:25:46 2016	(r297412)
+++ user/pho/stress2/misc/datamove3.sh	Wed Mar 30 07:29:52 2016	(r297413)
@@ -222,9 +222,9 @@ main(int argc, char *argv[], char *envp[
 	a[1].fd2 = fdA;
 
 	if ((r = pthread_create(&threads[0], NULL, mapBuffer, (void *)0)) != 0)
-		err(1, "pthread_create(): %s\n", strerror(r));
+		errc(1, r, "pthread_create()");
 	if ((r = pthread_create(&threads[1], NULL, mapBuffer, (void *)1)) != 0)
-		err(1, "pthread_create(): %s\n", strerror(r));
+		errc(1, r, "pthread_create()");
 
 	while (a[0].bp == NULL || a[1].bp == NULL)
 		pthread_yield();

Modified: user/pho/stress2/misc/datamove4.sh
==============================================================================
--- user/pho/stress2/misc/datamove4.sh	Wed Mar 30 07:25:46 2016	(r297412)
+++ user/pho/stress2/misc/datamove4.sh	Wed Mar 30 07:29:52 2016	(r297413)
@@ -184,8 +184,11 @@ unmapBuffer(char *bufferp)
 	   Program received signal SIGSEGV, Segmentation fault.
 	   free (cp=0x28070000) at /usr/src/libexec/rtld-elf/malloc.c:311
 	*/
+
+#if 0
 	if (munmap(bufferp + pagesize * 2, pagesize * 2) == -1)
 		err(1, "unmap 2. buffer");
+#endif
 }
 
 int


More information about the svn-src-user mailing list