Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add config option to use dlmalloc instead of mheap
[vpp.git]
/
src
/
vppinfra
/
serialize.c
diff --git
a/src/vppinfra/serialize.c
b/src/vppinfra/serialize.c
index
5d401a0
..
a098aa2
100644
(file)
--- a/
src/vppinfra/serialize.c
+++ b/
src/vppinfra/serialize.c
@@
-313,7
+313,7
@@
unserialize_vector_ha (serialize_main_t * m,
if (l > max_length)
serialize_error (&m->header,
clib_error_create ("bad vector length %d", l));
if (l > max_length)
serialize_error (&m->header,
clib_error_create ("bad vector length %d", l));
- p = v = _vec_resize (0, l, (uword) l * elt_bytes, header_bytes,
+ p = v = _vec_resize (
(void *)
0, l, (uword) l * elt_bytes, header_bytes,
/* align */ align);
while (l != 0)
/* align */ align);
while (l != 0)
@@
-444,7
+444,8
@@
unserialize_pool_helper (serialize_main_t * m,
return 0;
}
return 0;
}
- v = _vec_resize (0, l, (uword) l * elt_bytes, sizeof (p[0]), align);
+ v = _vec_resize ((void *) 0, l, (uword) l * elt_bytes, sizeof (p[0]),
+ align);
p = pool_header (v);
vec_unserialize (m, &p->free_indices, unserialize_vec_32);
p = pool_header (v);
vec_unserialize (m, &p->free_indices, unserialize_vec_32);
@@
-1147,7
+1148,7
@@
unserialize_multiple_4 (serialize_main_t * m,
#include <fcntl.h>
static void
#include <fcntl.h>
static void
-
unix
_file_write (serialize_main_header_t * m, serialize_stream_t * s)
+
clib
_file_write (serialize_main_header_t * m, serialize_stream_t * s)
{
int fd, n;
{
int fd, n;
@@
-1168,7
+1169,7
@@
unix_file_write (serialize_main_header_t * m, serialize_stream_t * s)
}
static void
}
static void
-
unix
_file_read (serialize_main_header_t * m, serialize_stream_t * s)
+
clib
_file_read (serialize_main_header_t * m, serialize_stream_t * s)
{
int fd, n;
{
int fd, n;
@@
-1188,7
+1189,7
@@
unix_file_read (serialize_main_header_t * m, serialize_stream_t * s)
}
static void
}
static void
-serialize_open_
unix
_file_descriptor_helper (serialize_main_t * m, int fd,
+serialize_open_
clib
_file_descriptor_helper (serialize_main_t * m, int fd,
uword is_read)
{
memset (m, 0, sizeof (m[0]));
uword is_read)
{
memset (m, 0, sizeof (m[0]));
@@
-1200,24
+1201,24
@@
serialize_open_unix_file_descriptor_helper (serialize_main_t * m, int fd,
_vec_len (m->stream.buffer) = 0;
}
_vec_len (m->stream.buffer) = 0;
}
- m->header.data_function = is_read ?
unix_file_read : unix
_file_write;
+ m->header.data_function = is_read ?
clib_file_read : clib
_file_write;
m->stream.data_function_opaque = fd;
}
void
m->stream.data_function_opaque = fd;
}
void
-serialize_open_
unix
_file_descriptor (serialize_main_t * m, int fd)
+serialize_open_
clib
_file_descriptor (serialize_main_t * m, int fd)
{
{
- serialize_open_
unix
_file_descriptor_helper (m, fd, /* is_read */ 0);
+ serialize_open_
clib
_file_descriptor_helper (m, fd, /* is_read */ 0);
}
void
}
void
-unserialize_open_
unix
_file_descriptor (serialize_main_t * m, int fd)
+unserialize_open_
clib
_file_descriptor (serialize_main_t * m, int fd)
{
{
- serialize_open_
unix
_file_descriptor_helper (m, fd, /* is_read */ 1);
+ serialize_open_
clib
_file_descriptor_helper (m, fd, /* is_read */ 1);
}
static clib_error_t *
}
static clib_error_t *
-serialize_open_
unix
_file_helper (serialize_main_t * m, char *file,
+serialize_open_
clib
_file_helper (serialize_main_t * m, char *file,
uword is_read)
{
int fd, mode;
uword is_read)
{
int fd, mode;
@@
-1227,20
+1228,20
@@
serialize_open_unix_file_helper (serialize_main_t * m, char *file,
if (fd < 0)
return clib_error_return_unix (0, "open `%s'", file);
if (fd < 0)
return clib_error_return_unix (0, "open `%s'", file);
- serialize_open_
unix
_file_descriptor_helper (m, fd, is_read);
+ serialize_open_
clib
_file_descriptor_helper (m, fd, is_read);
return 0;
}
clib_error_t *
return 0;
}
clib_error_t *
-serialize_open_
unix
_file (serialize_main_t * m, char *file)
+serialize_open_
clib
_file (serialize_main_t * m, char *file)
{
{
- return serialize_open_
unix
_file_helper (m, file, /* is_read */ 0);
+ return serialize_open_
clib
_file_helper (m, file, /* is_read */ 0);
}
clib_error_t *
}
clib_error_t *
-unserialize_open_
unix
_file (serialize_main_t * m, char *file)
+unserialize_open_
clib
_file (serialize_main_t * m, char *file)
{
{
- return serialize_open_
unix
_file_helper (m, file, /* is_read */ 1);
+ return serialize_open_
clib
_file_helper (m, file, /* is_read */ 1);
}
#endif /* CLIB_UNIX */
}
#endif /* CLIB_UNIX */