Skip to content
Snippets Groups Projects
Commit 38e2db43 authored by Moe Jette's avatar Moe Jette
Browse files

Fix typo in some messages "receive" instead of "recieve".

Change some variable types for IA64 support.
Change getpagesize() to sysconf() for better IA64 support.
parent 47cc3a9a
No related branches found
No related tags found
No related merge requests found
...@@ -173,8 +173,8 @@ get_memory(uint32_t *real_memory) ...@@ -173,8 +173,8 @@ get_memory(uint32_t *real_memory)
return EINVAL; return EINVAL;
} }
*real_memory = (int)((float)pages * getpagesize() / *real_memory = (int)((float)pages * (sysconf(_SC_PAGE_SIZE) /
1048576.0); /* Megabytes of memory */ 1048576.0)); /* Megabytes of memory */
return 0; return 0;
} }
...@@ -238,7 +238,7 @@ get_tmp_disk(uint32_t *tmp_disk, char *tmp_fs) ...@@ -238,7 +238,7 @@ get_tmp_disk(uint32_t *tmp_disk, char *tmp_fs)
error_code = 0; error_code = 0;
*tmp_disk = 0; *tmp_disk = 0;
total_size = 0; total_size = 0;
page_size = (getpagesize() / 1048576.0); /* Megabytes per page */ page_size = (sysconf(_SC_PAGE_SIZE) / 1048576.0); /* MG per page */
if (tmp_fs_name == NULL) if (tmp_fs_name == NULL)
tmp_fs_name = "/tmp"; tmp_fs_name = "/tmp";
......
...@@ -309,7 +309,7 @@ io_close_all(slurmd_job_t *job) ...@@ -309,7 +309,7 @@ io_close_all(slurmd_job_t *job)
for (i = 0; i < job->ntasks; i++) for (i = 0; i < job->ntasks; i++)
_io_finalize(job->task[i]); _io_finalize(job->task[i]);
/* No more debug info will be recieved by client after this point /* No more debug info will be received by client after this point
*/ */
debug("Closing debug channel"); debug("Closing debug channel");
close(STDERR_FILENO); close(STDERR_FILENO);
......
...@@ -887,7 +887,7 @@ _shm_attach() ...@@ -887,7 +887,7 @@ _shm_attach()
if (shmi.shm_segsz != sizeof(slurmd_shm_t)) { if (shmi.shm_segsz != sizeof(slurmd_shm_t)) {
error("size for shm segment id %d is %dK, expected %dK", error("size for shm segment id %d is %dK, expected %dK",
shmid, (shmi.shm_segsz/1024), shmid, (int)(shmi.shm_segsz/1024),
(sizeof(slurmd_shm_t)/1024)); (sizeof(slurmd_shm_t)/1024));
error("You probably need to run with `-c' " error("You probably need to run with `-c' "
"or just delete old segment."); "or just delete old segment.");
......
...@@ -296,7 +296,7 @@ _reattach_handler(job_t *job, slurm_msg_t *msg) ...@@ -296,7 +296,7 @@ _reattach_handler(job_t *job, slurm_msg_t *msg)
reattach_tasks_response_msg_t *resp = msg->data; reattach_tasks_response_msg_t *resp = msg->data;
if ((resp->srun_node_id < 0) || (resp->srun_node_id >= job->nhosts)) { if ((resp->srun_node_id < 0) || (resp->srun_node_id >= job->nhosts)) {
error ("Invalid reattach response recieved~"); error ("Invalid reattach response received");
return; return;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment