8000 Several small improvements by jungan · Pull Request #100 · mpickpt/mana · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Several small improvements #100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master-old
Choose a base branch
from
Open

Several small improvements #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion contrib/Makefile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ LDFLAGS += -m32 -Wl,-m32 -Wl,-melf_i386 -Wa,--32
endif

plugins =
plugins_distclean = ckptfile infiniband
plugins_distclean = ckptfile infiniband mpi-proxy-split

ifeq ($(INFINIBAND_SUPPORT),yes)
plugins += infiniband # ib2tcp
Expand Down
2 changes: 2 additions & 0 deletions contrib/mpi-proxy-split/mpi-wrappers/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
mana_p2p_update_logs
p2p-deterministic.h
15 changes: 9 additions & 6 deletions contrib/mpi-proxy-split/p2p_drain_send_recv.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,11 @@ recvMsgIntoInternalBuffer(MPI_Status status, MPI_Comm comm)
MPI_Type_size(MPI_BYTE, &size);
JASSERT(size == 1);
void *buf = JALLOC_HELPER_MALLOC(count);
MPI_Recv(buf, count, MPI_BYTE, status.MPI_SOURCE, status.MPI_TAG,
int rc = MPI_Recv(buf, count, MPI_BYTE, status.MPI_SOURCE, status.MPI_TAG,
comm, MPI_STATUS_IGNORE);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we re-indent the arguments comm, MPI_STATUS_ERROR to be underneath buf on the previous line?

if (rc != MPI_SUCCESS) {
fprintf(stderr, "MPI_Recv failed\n");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we want to use JTRACE here?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, will update the code.

}

mpi_message_t *message = (mpi_message_t *)JALLOC_HELPER_MALLOC(sizeof(mpi_message_t));
message->buf = buf;
Expand All @@ -116,7 +119,7 @@ recvMsgIntoInternalBuffer(MPI_Status status, MPI_Comm comm)

// Go through each MPI_Irecv in the g_async_calls map and try to complete
// the MPI_Irecv before checkpointing.
int
static int
completePendingIrecvs()
{
int bytesReceived = 0;
Expand All @@ -135,6 +138,7 @@ completePendingIrecvs()
call->comm);
g_recvBytesByRank[worldRank] += call->count * size;
bytesReceived += call->count * size;
JALLOC_HELPER_FREE(call);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll have to check, but IIRC, the call object couldn't be freed here because it was being referenced in some other place later. So, I had decided to live with the memory leak. I'll have to go through the code again to make sure.

Copy link
Collaborator Author
@jungan jungan Apr 18, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In this case, shall we use a shared_ptr?

it = g_async_calls.erase(it);
} else {
/* We update the iterator even if the MPI_Test fails.
Expand Down Expand Up @@ -162,7 +166,7 @@ completePendingIrecvs()
return bytesReceived;
}

int
static int
recvFromAllComms()
{
int bytesReceived = 0;
Expand Down Expand Up @@ -190,17 +194,16 @@ recvFromAllComms()
return bytesReceived;
}

void
static void
removePendingSendRequests()
{
dmtcp::map<MPI_Request, mpi_async_call_t*>::iterator it;
for (it = g_async_calls.begin(); it != g_async_calls.end();) {
MPI_Request request = it->first;
mpi_async_call_t *call = it->second;
int flag = 0;
if (call->type == ISEND_REQUEST) {
UPDATE_REQUEST_MAP(request, MPI_REQUEST_NULL);
// FIXME: We should free `call' to avoid memory leak
JALLOC_HELPER_FREE(call);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as above

it = g_async_calls.erase(it);
} else {
it++;
Expand Down
2 changes: 0 additions & 2 deletions contrib/mpi-proxy-split/p2p_drain_send_recv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,12 @@ extern dmtcp::vector<mpi_message_t*> g_message_queue;
void initialize_drain_send_recv();
void registerLocalSendsAndRecvs();
void drainSendRecv();
int recvFromAllComms(int source);
int recvMsgIntoInternalBuffer(MPI_Status status);
bool isBufferedPacket(int source, int tag, MPI_Comm comm, int *flag,
MPI_Status *status);
int consumeBufferedPacket(void *buf, int count, MPI_Datatype datatype,
int source, int tag, MPI_Comm comm,
MPI_Status *mpi_status, int size);
void removePendingSendRequests();
void resetDrainCounters();
int localRankToGlobalRank(int localRank, MPI_Comm localComm);
#endif
1 change: 0 additions & 1 deletion contrib/mpi-proxy-split/p2p_log_replay.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,6 @@ logRequestInfo(MPI_Request request, mpi_req_t req_type)
request_info_t*
lookupRequestInfo(MPI_Request request)
{
request_info_t *req_info;
std::unordered_map<MPI_Request, request_info_t*>::iterator it;
it = request_log.find(request);
if (it != request_log.end()) {
Expand Down
13 changes: 5 additions & 8 deletions contrib/mpi-proxy-split/split_process.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,12 +247,10 @@ read_lh_proxy_bits(pid_t childpid)
// NOTE: This requires same privilege as ptrace_attach (valid for child).
// Anecdotally, in containers, we've seen a case where this errors out
// with ESRCH (no such proc.); it may need CAP_SYS_PTRACE privilege??
for (int i = 0; i < IOV_SZ; i++) {
JTRACE("Reading segment from lh_proxy")
(remote_iov[i].iov_base)(remote_iov[i].iov_len);
ret = process_vm_readv(childpid, remote_iov + i, 1, remote_iov + i, 1, 0);
JASSERT(ret != -1)(JASSERT_ERRNO).Text("Error reading data from lh_proxy");
}
JTRACE("Reading segment from lh_proxy")
(remote_iov[0].iov_base)(remote_iov[0].iov_len);
ret = process_vm_readv(childpid, remote_iov, IOV_SZ, remote_iov, IOV_SZ, 0);
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rohgarg @gc00 @xuyao0127 Not sure if I understand it correctly, I tested it and works fine.
Please comment if there is anything I missed.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's the intent here?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it would be better to take the advantage of process_vm_readv?
I know it doesn't have too much difference given IOV_SZ is 2 here, I think using the standard way probably performs better than we do the loop here when IOV_SZ is large.

JASSERT(ret != -1)(JASSERT_ERRNO).Text("Error reading data from lh_proxy");

// Can remove PROT_WRITE now that we've populated the text segment.
ret = mprotect((void *)ROUND_DOWN(remote_iov[0].iov_base),
Expand Down Expand Up @@ -333,7 +331,7 @@ startProxy()
// Read from stdout of lh_proxy full lh_info struct, including orig memRange.
close(pipefd_out[1]); // close write end of pipe
// FIXME: should be a readall. Check for return error code.
if (read(pipefd_out[0], &lh_info, sizeof lh_info) < sizeof lh_info) {
if (read(pipefd_out[0], &lh_info, sizeof lh_info) < (ssize_t) sizeof lh_info) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please do not commit the change o this line.

The issue here is that read returns an int and sizeof returns a size_t. (unsigned). Some compiler complain or warn about comparing an int and unsigned int. The type ssize_t stands for "signed size", which is almost the same thing as an int. So, this cast is needed to make some compilers stop issuing warnings.

JWARNING(false)(JASSERT_ERRNO) .Text("Read fewer bytes than expected");
break;
}
Expand All @@ -352,7 +350,6 @@ findLHMemRange(MemRange_t *lh_mem_range)
bool is_set = false;

Area area;
char prev_path_name[PATH_MAX];
char next_path_name[PATH_MAX];
uint64_t prev_addr_end;
uint64_t next_addr_start;
Expand Down
0