Making interconnect dependant things linkable with shared objects

src/slurmd/Makefile.am

@@ -4,9 +4,10 @@
 AUTOMAKE_OPTIONS = foreign
 
 sbin_PROGRAMS = slurmd
+noinst_LIBRARIES = libelan_interconnect.a libno_interconnect.a
 
 LDADD = $(top_srcdir)/src/common/libcommon.la \
-	$(SSL_LIBS)
+	$(SSL_LIBS) libno_interconnect.a
 
 
 slurmd_SOURCES = slurmd.c \
@@ -20,3 +21,6 @@ slurmd_SOURCES = slurmd.c \
 		io.c \
 		pipes.c
 
+libelan_interconnect_a_SOURCES =  elan_interconnect.c
+libno_interconnect_a_SOURCES =  no_interconnect.c
+

src/slurmd/elan_interconnect.c

+#include <src/common/slurm_protocol_api.h>
+
+int interconnect_init ( launch_tasks_request_msg_t * launch_msg ) ;
+int fan_out_task_launch ( launch_tasks_request_msg_t * launch_msg ) ;
+/* exported module funtion to launch tasks */
+/*launch_tasks should really be named launch_job_step*/
+int launch_tasks ( launch_tasks_request_msg_t * launch_msg )
+{
+	return interconnect_init ( launch_msg );
+}
+
+/* Contains interconnect specific setup instructions and then calls 
+ * fan_out_task_launch */
+int interconnect_init ( launch_tasks_request_msg_t * launch_msg )
+{
+	return fan_out_task_launch ( launch_msg ) ;
+}
+
+

src/slurmd/no_interconnect.c

+#include <src/common/slurm_protocol_api.h>
+
+int interconnect_init ( launch_tasks_request_msg_t * launch_msg ) ;
+int fan_out_task_launch ( launch_tasks_request_msg_t * launch_msg ) ;
+/* exported module funtion to launch tasks */
+/*launch_tasks should really be named launch_job_step*/
+int launch_tasks ( launch_tasks_request_msg_t * launch_msg )
+{
+	return interconnect_init ( launch_msg );
+}
+
+/* Contains interconnect specific setup instructions and then calls 
+ * fan_out_task_launch */
+int interconnect_init ( launch_tasks_request_msg_t * launch_msg )
+{
+	return fan_out_task_launch ( launch_msg ) ;
+}
+
+

src/slurmd/task_mgr.c

@@ -42,20 +42,6 @@ int send_task_exit_msg ( int task_return_code , task_start_t * task_start ) ;
  *			task_exec_thread() (pthread_create) for io piping 
  ******************************************************************/			
 
-/* exported module funtion to launch tasks */
-/*launch_tasks should really be named launch_job_step*/
-int launch_tasks ( launch_tasks_request_msg_t * launch_msg )
-{
-	return interconnect_init ( launch_msg );
-}
-
-/* Contains interconnect specific setup instructions and then calls 
- * fan_out_task_launch */
-int interconnect_init ( launch_tasks_request_msg_t * launch_msg )
-{
-	return fan_out_task_launch ( launch_msg ) ;
-}
-
 int fan_out_task_launch ( launch_tasks_request_msg_t * launch_msg )
 {
 	int i ;