next-fix

dmtcp · Apr 3, 2021 · 6f0a40a · 6f0a40a
1 parent ffd42c2
commit 6f0a40a
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/src/nosyscallsreal.c b/src/nosyscallsreal.c
@@ -282,11 +282,13 @@ _real_tcgetpgrp(int fd)
   REAL_FUNC_PASSTHROUGH_PID_T(tcgetpgrp) (fd);
 }
 
+#if 0
 pid_t
 _real_getpgrp(void)
 {
   REAL_FUNC_PASSTHROUGH_PID_T(getpgrp) ();
 }
+#endif
 
 pid_t
 _real_setpgrp(void)

diff --git a/src/plugin/pid/pid_syscallsreal.c b/src/plugin/pid/pid_syscallsreal.c
@@ -187,6 +187,15 @@ _real_tcgetpgrp(int fd)
   return arg;
 }
 
+// FIXME:  libdmtcp.so:_libc_getpgrp() depends on this.
+//         It should `call dmtcp_get_libc_addr() instead.
+//         Remove this _libc_getpgrp() when that works.
+pid_t
+_libc_getpgrp(void)
+{
+  REAL_FUNC_PASSTHROUGH_TYPED(pid_t, getpgrp) ();
+}
+
 LIB_PRIVATE
 pid_t
 _real_getpgrp(void)

diff --git a/src/syscallsreal.c b/src/syscallsreal.c
@@ -646,7 +646,7 @@ pid_t
 _libc_getpgrp()
 {
   // This introduces a dependence of libdmtcp.so on libdmtcp_pid.so
-  REAL_FUNC_PASSTHROUGH(_real_getpgrp) ();
+  REAL_FUNC_PASSTHROUGH(_libc_getpgrp) ();
 }
 
 LIB_PRIVATE

diff --git a/src/syscallwrappers.h b/src/syscallwrappers.h
@@ -157,7 +157,7 @@ LIB_PRIVATE extern __thread int thread_performing_dlopen_dlsym;
   MACRO(tcgetpgrp)                    \
   MACRO(tcsetpgrp)                    \
   MACRO(getpgrp)                      \
-  MACRO(_real_getpgrp) /* src/plugin/pid/pid_syscallsreal.c */    \
+  MACRO(_libc_getpgrp) /* src/plugin/pid/pid_syscallsreal.c */    \
   MACRO(setpgrp)                      \
                                       \
   MACRO(getpgid)                      \