Skip to content
Snippets Groups Projects
Commit cc520585 authored by FKHals's avatar FKHals
Browse files

Set agent unix domain socket address by env var

to be more flexible concerning the configuration.
parent 454cd962
No related branches found
No related tags found
No related merge requests found
......@@ -53,7 +53,6 @@
#include "ompi/dpm/dpm.h"
#include "ompi/memchecker.h"
#define SOCKET_PATH "/home/beach/Dokumente/Uni/Informatik_BA/Bachelorarbeit_MPI/sockets_mpi_test/socket"
#define FD_STDIN 0
#define BUFFLEN 64
......@@ -106,7 +105,11 @@ static int getProcessAgentRank(uint32_t jobid, uint32_t vpid, size_t size) {
}
strAddr.sun_family=AF_LOCAL; /* Unix domain */
strcpy(strAddr.sun_path, SOCKET_PATH);
const char * socket_path = getenv("DPM_AGENT_SOCKET"); // check for success
if (NULL == socket_path) {
errorExit("Could not find DPM_AGENT_SOCKET env");
}
strcpy(strAddr.sun_path, socket_path);
lenAddr=sizeof(strAddr.sun_family)+strlen(strAddr.sun_path);
if (connect(fdSock, (struct sockaddr*)&strAddr, lenAddr) !=0 ) {
errorExit("connect");
......
#!/bin/bash
export OMPI=/home/openmpi-install
export DPM_AGENT_SOCKET=$OMPI/dpm_socket_socket
export PATH=$PATH:$OMPI/bin
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$OMPI/bin
......
......@@ -15,7 +15,6 @@
#include "mpi.h"
#define SOCKET_PATH "/home/ompi/openmpi-rank-swapper-agent/socket"
#define BUFFLEN 64
/* Spawn Modes (dynamic job spawning):
......
......@@ -23,7 +23,6 @@
#include <time.h>
#include <unistd.h>
#define SOCKET_PATH "/home/ompi/openmpi-rank-swapper-agent/socket"
#define MAX_CONNECTIONS 10
#define RANK_STR_LEN 8
#define BUFFLEN 64
......@@ -134,10 +133,15 @@ int main(void) {
if ((fdSock=socket(PF_UNIX, SOCK_STREAM, 0)) < 0) {
errorExit("socket");
}
unlink (SOCKET_PATH); /* Sicherstellung, daß SOCKET_PATH nicht existiert */
// create unix domain socket in the installation directory of OpenMPI
const char * socket_path = getenv("DPM_AGENT_SOCKET"); // check for success
if (NULL == socket_path) {
errorExit("Could not find DPM_AGENT_SOCKET env");
}
unlink (socket_path); /* Make sure that socket_path does not exist yet */
strAddr.sun_family=AF_LOCAL; /* Unix Domain */
strcpy(strAddr.sun_path, SOCKET_PATH);
strcpy(strAddr.sun_path, socket_path);
lenAddr=sizeof(strAddr.sun_family)+strlen(strAddr.sun_path);
if (bind(fdSock, (struct sockaddr*)&strAddr, lenAddr) != 0) {
errorExit("bind");
......
#!/bin/bash
export OMPI=/home/openmpi-install
export DPM_AGENT_SOCKET=$OMPI/dpm_socket_socket
./locserv
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment