kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

switch_xml: Remove commented out mmap. With the changes in the past 2 year, mmap can't really be put back in it current state.

This commit is contained in:
Marc Olivier Chouinard 2011-03-18 16:45:37 -04:00
parent 471bd6df1a
commit 34bd0e5e79
1 changed files with 10 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/switch_xml.c
View File

@ -95,13 +95,6 @@ typedef struct {
int glob(const char *, int, int (*)(const char *, int), glob_t *); int glob(const char *, int, int (*)(const char *, int), glob_t *);
void globfree(glob_t *); void globfree(glob_t *);
#endif
#undef HAVE_MMAP
#ifdef HAVE_MMAP
#include <sys/mman.h>
#ifdef __sun
extern int madvise(caddr_t, size_t, int);
#endif
#endif #endif
#define SWITCH_XML_WS "\t\r\n " /* whitespace */ #define SWITCH_XML_WS "\t\r\n " /* whitespace */
@ -114,7 +107,7 @@ struct switch_xml_root { /* additional data for the root tag */
struct switch_xml xml; /* is a super-struct built on top of switch_xml struct */ struct switch_xml xml; /* is a super-struct built on top of switch_xml struct */
switch_xml_t cur; /* current xml tree insertion point */ switch_xml_t cur; /* current xml tree insertion point */
char *m; /* original xml string */ char *m; /* original xml string */
switch_size_t len; /* length of allocated memory for mmap */ switch_size_t len; /* length of allocated memory */
uint8_t dynamic; /* Free the original string when calling switch_xml_free */ uint8_t dynamic; /* Free the original string when calling switch_xml_free */
char *u; /* UTF-8 conversion of string if original was UTF-16 */ char *u; /* UTF-8 conversion of string if original was UTF-16 */
char *s; /* start of work area */ char *s; /* start of work area */
@ -1166,16 +1159,6 @@ SWITCH_DECLARE(switch_xml_t) switch_xml_parse_fd(int fd)
return NULL; return NULL;
} }
#ifdef HAVE_MMAP
l = (st.st_size + sysconf(_SC_PAGESIZE) - 1) & ~(sysconf(_SC_PAGESIZE) - 1);
if ((m = mmap(NULL, l, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0)) != MAP_FAILED) {
madvise(m, l, MADV_SEQUENTIAL); /* optimize for sequential access */
if (!(root = (switch_xml_root_t) switch_xml_parse_str(m, st.st_size))) {
munmap(m, l);
}
madvise(m, root->len = l, MADV_NORMAL); /* put it back to normal */
} else { /* mmap failed, read file into memory */
#endif /* HAVE_MMAP */
m = malloc(st.st_size); m = malloc(st.st_size);
if (!m) if (!m)
return NULL; return NULL;
@ -1185,9 +1168,7 @@ SWITCH_DECLARE(switch_xml_t) switch_xml_parse_fd(int fd)
return NULL; return NULL;
} }
root->dynamic = 1; /* so we know to free s in switch_xml_free() */ root->dynamic = 1; /* so we know to free s in switch_xml_free() */
#ifdef HAVE_MMAP
}
#endif /* HAVE_MMAP */
return &root->xml; return &root->xml;
} }
@ -2461,10 +2442,6 @@ SWITCH_DECLARE(void) switch_xml_free(switch_xml_t xml)
if (root->dynamic == 1) if (root->dynamic == 1)
free(root->m); /* malloced xml data */ free(root->m); /* malloced xml data */
#ifdef HAVE_MMAP
else if (root->len)
munmap(root->m, root->len); /* mem mapped xml data */
#endif /* HAVE_MMAP */
if (root->u) if (root->u)
free(root->u); /* utf8 conversion */ free(root->u); /* utf8 conversion */
} }