projects
/
umurmur.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
made SSL error non fatal
[umurmur.git]
/
shm_utils
/
mon-umurmurd
/
mon-umurmurd.c
diff --git
a/shm_utils/mon-umurmurd/mon-umurmurd.c
b/shm_utils/mon-umurmurd/mon-umurmurd.c
index 931a34dcf2d54bed9f6300bafbade01e3072d7f8..7c02759df65a01b766e3b078f21917ac24810482 100644
(file)
--- a/
shm_utils/mon-umurmurd/mon-umurmurd.c
+++ b/
shm_utils/mon-umurmurd/mon-umurmurd.c
@@
-7,11
+7,15
@@
#include <sys/stat.h>
\r
#include <sys/mman.h>
\r
#include <sys/types.h>
\r
#include <sys/stat.h>
\r
#include <sys/mman.h>
\r
#include <sys/types.h>
\r
-#include "../../src/sharedmemory.h"
\r
-#include "
../../src/sharedmemory_global
.h"
\r
+
\r
+#include "
sharedmemory_struct
.h"
\r
\r
enum{ NOP_SHM, WAIT_ATTACH_SHM, TRY_ATTACH_SHM, MAT_SHM, CLEAN_UP_SHM, RUN_SHM };
\r
\r
\r
enum{ NOP_SHM, WAIT_ATTACH_SHM, TRY_ATTACH_SHM, MAT_SHM, CLEAN_UP_SHM, RUN_SHM };
\r
\r
+int shm_fd;
\r
+shm_t *shmptr = NULL;
\r
+char shm_file_name[128];
\r
+
\r
int wait = 0, opt;
\r
uint8_t last, shm_statem = TRY_ATTACH_SHM;
\r
\r
int wait = 0, opt;
\r
uint8_t last, shm_statem = TRY_ATTACH_SHM;
\r
\r
@@
-75,7
+79,7
@@
int main(int argc, char **argv)
break;
\r
case MAT_SHM:
\r
fstat( shm_fd, &buf);
\r
break;
\r
case MAT_SHM:
\r
fstat( shm_fd, &buf);
\r
- if( ( shmptr = mmap(0, buf.st_size, PROT_READ, MAP_SHARED, shm_fd, 0) ) ==
(void *) (-1) ) //MJP BUG?
\r
+ if( ( shmptr = mmap(0, buf.st_size, PROT_READ, MAP_SHARED, shm_fd, 0) ) ==
MAP_FAILED )
\r
{
\r
exit(EXIT_FAILURE);
\r
}
\r
{
\r
exit(EXIT_FAILURE);
\r
}
\r
@@
-161,4
+165,4
@@
int cc;
{
\r
exit(EXIT_FAILURE); //You dont have to exit you could just report the fact that the data is not valid
\r
}
\r
{
\r
exit(EXIT_FAILURE); //You dont have to exit you could just report the fact that the data is not valid
\r
}
\r
-}
\ No newline at end of file
+}
\r