Skip to content

Commit fb744ea

Browse files
author
rhc54
committed
Merge pull request open-mpi#1192 from ggouaillardet/topic/v1.10/pthread_atfork
Topic/v1.10/pthread atfork
2 parents aeaa542 + 3bd5759 commit fb744ea

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

config/ompi_config_pthreads.m4

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
99
dnl University of Stuttgart. All rights reserved.
1010
dnl Copyright (c) 2004-2005 The Regents of the University of California.
1111
dnl All rights reserved.
12-
dnl Copyright (c) 2012 Cisco Systems, Inc. All rights reserved.
13-
dnl Copyright (c) 2014 Research Organization for Information Science
12+
dnl Copyright (c) 2012 Cisco Systems, Inc. All rights reserved.
13+
dnl Copyright (c) 2014-2016 Research Organization for Information Science
1414
dnl and Technology (RIST). All rights reserved.
1515
dnl $COPYRIGHT$
1616
dnl
@@ -114,10 +114,11 @@ void pthreadtest_f(void)
114114
pthread_attr_t attr;
115115
116116
me = pthread_self();
117+
pthread_atfork(NULL, NULL, NULL);
117118
pthread_attr_init(&attr);
118119
pthread_cleanup_push(cleanup_routine, 0);
119120
pthread_create(&newthread, &attr, thread_main, 0);
120-
pthread_join(&newthread, 0);
121+
pthread_join(newthread, 0);
121122
pthread_cleanup_pop(0);
122123
}
123124

0 commit comments

Comments
 (0)