microsoft/mscclpp
1
0
Fork 0
mirror of https://github.com/microsoft/mscclpp.git synced 2026-05-13 09:46:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

more clean up

Browse Source
This commit is contained in:
Saeed Maleki
2023-02-16 07:13:04 +00:00
parent 71fbf283d7
commit 4f3418aa77
4 changed files with 4 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -93,7 +93,7 @@ OBJDIR := obj
BINDIR := bin
LIBSRCS := $(addprefix src/,debug.cc utils.cc param.cc)
LIBSRCS += $(addprefix src/bootstrap/,init.cc bootstrap.cc socket.cc proxy.cc shmutils.cc)
LIBSRCS += $(addprefix src/bootstrap/,init.cc bootstrap.cc socket.cc proxy.cc)
LIBOBJS := $(patsubst %.cc,%.o,$(LIBSRCS))
LIBOBJTARGETS := $(LIBOBJS:%=$(BUILDDIR)/$(OBJDIR)/%)

7
src/bootstrap/init.cc
View File

@@ -1,7 +1,6 @@
#include "mscclpp.h"
#include "bootstrap.h"
#include "core.h"
#include "shmutils.h"
#include <map>
#include <sstream>
@@ -65,9 +64,9 @@ MSCCLPP_API(mscclppResult_t, mscclppCommInitRank, mscclppComm_t* comm, int nrank
mscclppResult_t mscclppCommInitRank(mscclppComm_t* comm, int nranks, int rank, const char* ip_port_pair){
mscclppResult_t res = mscclppSuccess;
mscclppComm_t _comm = NULL;
uint64_t hash = getHostHash();
uint64_t *hashes;
std::map<uint64_t, int> hashToNode;
// uint64_t hash = getHostHash();
// uint64_t *hashes;
// std::map<uint64_t, int> hashToNode;
MSCCLPPCHECKGOTO(mscclppCalloc(&_comm, 1), res, fail);
_comm->rank = rank;

80
src/bootstrap/shmutils.cc
View File

@@ -1,80 +0,0 @@
#include "shmutils.h"
#include "debug.h"
#include <fcntl.h>
#include <unistd.h>
#include <errno.h>
#include <sys/mman.h>
#define SHM_MODE 0666
// Open a shme file and create an mmap.
static mscclppResult_t shmutilsMapOpen(const char *name, size_t size, int *fd, void **map, int flag)
{
int _fd = shm_open(name, flag, SHM_MODE);
if (_fd == -1) {
WARN("Failed to open shm file %s (flag: %d)", name, flag);
return mscclppInternalError;
}
void *_map = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED, _fd, 0);
if (_map == MAP_FAILED) {
WARN("Failed to mmap shm file %s", name);
goto fail;
}
if (flag & O_CREAT) {
if (ftruncate(_fd, 0) == -1) {
WARN("Failed to ftruncate shm file %s", name);
goto fail;
}
}
if (ftruncate(_fd, size) == -1) {
WARN("Failed to ftruncate shm file %s", name);
goto fail;
}
*fd = _fd;
*map = _map;
return mscclppSuccess;
fail:
close(_fd);
shm_unlink(name);
return mscclppInternalError;
}
// Open or create a shm file.
mscclppResult_t mscclppShmutilsMapCreate(const char *name, size_t size, int *fd, void **map)
{
return shmutilsMapOpen(name, size, fd, map, O_CREAT | O_RDWR);
}
// Open an existing shm file.
mscclppResult_t mscclppShmutilsMapOpen(const char *name, size_t size, int *fd, void **map)
{
return shmutilsMapOpen(name, size, fd, map, O_RDWR);
}
// Close a shm mmap.
mscclppResult_t mscclppShmutilsMapClose(const char *name, size_t size, int fd, void *map)
{
int err = 0;
if (munmap(map, size) == -1) {
WARN("Failed to munmap shm file %s", name);
err = 1;
}
close(fd);
return err ? mscclppInternalError : mscclppSuccess;
}
// Close a shm mmap and destroy a shm file.
mscclppResult_t mscclppShmutilsMapDestroy(const char *name, size_t size, int fd, void *map)
{
int err = 0;
if (munmap(map, size) == -1) {
WARN("Failed to munmap shm file %s", name);
err = 1;
}
close(fd);
if (shm_unlink(name) == -1) {
WARN("Failed to unlink shm file %s: errno %d", name, errno);
err = 1;
}
return err ? mscclppInternalError : mscclppSuccess;
}

11
src/include/shmutils.h
View File

@@ -1,11 +0,0 @@
#ifndef MSCCLPP_SHMUTILS_H_
#define MSCCLPP_SHMUTILS_H_
#include "mscclpp.h"
mscclppResult_t mscclppShmutilsMapCreate(const char *name, size_t size, int *fd, void **map);
mscclppResult_t mscclppShmutilsMapOpen(const char *name, size_t size, int *fd, void **map);
mscclppResult_t mscclppShmutilsMapClose(const char *name, size_t size, int fd, void *map);
mscclppResult_t mscclppShmutilsMapDestroy(const char *name, size_t size, int fd, void *map);
#endif