projects
/
ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changes malloc to zmalloc
[ust.git]
/
libustcomm
/
ustcomm.c
diff --git
a/libustcomm/ustcomm.c
b/libustcomm/ustcomm.c
index 8324f21decad53d79a8659657bb2d000e90c914b..f2b7a03b9ea67f8daee033099d0dc2faea9ead1b 100644
(file)
--- a/
libustcomm/ustcomm.c
+++ b/
libustcomm/ustcomm.c
@@
-15,6
+15,8
@@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+/* API used by UST components to communicate with each other via sockets. */
+
#define _GNU_SOURCE
#include <sys/types.h>
#include <signal.h>
#define _GNU_SOURCE
#include <sys/types.h>
#include <signal.h>
@@
-44,14
+46,16
@@
static int mkdir_p(const char *path, mode_t mode)
int retval = 0;
int result;
int retval = 0;
int result;
+ mode_t old_umask;
- tmp = malloc(strlen(path) + 1);
+ tmp =
z
malloc(strlen(path) + 1);
if (tmp == NULL)
return -1;
/* skip first / */
path_p = path+1;
if (tmp == NULL)
return -1;
/* skip first / */
path_p = path+1;
+ old_umask = umask(0);
for(;;) {
while (*path_p != '/') {
if(*path_p == 0)
for(;;) {
while (*path_p != '/') {
if(*path_p == 0)
@@
-83,6
+87,7
@@
static int mkdir_p(const char *path, mode_t mode)
}
free(tmp);
}
free(tmp);
+ umask(old_umask);
return retval;
}
return retval;
}
@@
-247,9
+252,13
@@
static int recv_message_fd(int fd, char **recv_buf, int *recv_buf_size, int *rec
*recv_buf_size = 0;
return 0;
}
*recv_buf_size = 0;
return 0;
}
- /* real error */
- PERROR("recv");
- return -1;
+ else if(errno == EINTR) {
+ return -1;
+ }
+ else {
+ PERROR("recv");
+ return -1;
+ }
}
if(result == 0) {
return 0;
}
if(result == 0) {
return 0;
@@
-323,15
+332,15
@@
int ustcomm_recv_message(struct ustcomm_server *server, char **msg, struct ustco
n_fds++;
}
n_fds++;
}
- fds = (struct pollfd *) malloc(n_fds * sizeof(struct pollfd));
+ fds = (struct pollfd *)
z
malloc(n_fds * sizeof(struct pollfd));
if(fds == NULL) {
if(fds == NULL) {
- ERR("malloc returned NULL");
+ ERR("
z
malloc returned NULL");
return -1;
}
return -1;
}
- conn_table = (struct ustcomm_connection **) malloc(n_fds * sizeof(struct ustcomm_connection *));
+ conn_table = (struct ustcomm_connection **)
z
malloc(n_fds * sizeof(struct ustcomm_connection *));
if(conn_table == NULL) {
if(conn_table == NULL) {
- ERR("malloc returned NULL");
+ ERR("
z
malloc returned NULL");
retval = -1;
goto free_fds_return;
}
retval = -1;
goto free_fds_return;
}
@@
-348,15
+357,18
@@
int ustcomm_recv_message(struct ustcomm_server *server, char **msg, struct ustco
idx++;
}
idx++;
}
- while((result = poll(fds, n_fds, timeout)) == -1 && errno == EINTR)
- /* nothing */;
- if(result == -1) {
+ result = poll(fds, n_fds, timeout);
+ if(result == -1 && errno == EINTR) {
+ /* That's ok. ustd receives signals to notify it must shutdown. */
+ retval = -1;
+ goto free_conn_table_return;
+ }
+ else if(result == -1) {
PERROR("poll");
retval = -1;
goto free_conn_table_return;
}
PERROR("poll");
retval = -1;
goto free_conn_table_return;
}
-
- if(result == 0) {
+ else if(result == 0) {
retval = 0;
goto free_conn_table_return;
}
retval = 0;
goto free_conn_table_return;
}
@@
-372,9
+384,9
@@
int ustcomm_recv_message(struct ustcomm_server *server, char **msg, struct ustco
goto free_conn_table_return;
}
goto free_conn_table_return;
}
- newconn = (struct ustcomm_connection *) malloc(sizeof(struct ustcomm_connection));
+ newconn = (struct ustcomm_connection *)
z
malloc(sizeof(struct ustcomm_connection));
if(newconn == NULL) {
if(newconn == NULL) {
- ERR("malloc returned NULL");
+ ERR("
z
malloc returned NULL");
return -1;
}
return -1;
}
@@
-636,7
+648,8
@@
static int ensure_dir_exists(const char *dir)
/* ENOENT */
int result;
/* ENOENT */
int result;
- result = mkdir_p(dir, 0777);
+ /* mkdir mode to 0777 */
+ result = mkdir_p(dir, S_IRWXU | S_IRWXG | S_IRWXO);
if(result != 0) {
ERR("executing in recursive creation of directory %s", dir);
return -1;
if(result != 0) {
ERR("executing in recursive creation of directory %s", dir);
return -1;
@@
-873,9
+886,9
@@
static int process_mp_incoming_conn(void *priv, int fd, short events)
return -1;
}
return -1;
}
- newconn = (struct ustcomm_connection *) malloc(sizeof(struct ustcomm_connection));
+ newconn = (struct ustcomm_connection *)
z
malloc(sizeof(struct ustcomm_connection));
if(newconn == NULL) {
if(newconn == NULL) {
- ERR("malloc returned NULL");
+ ERR("
z
malloc returned NULL");
return -1;
}
return -1;
}
@@
-927,7
+940,7
@@
int free_ustcomm_client_poll(void *data)
return 0;
}
return 0;
}
-void ustcomm_mp_add_app_clients(struct mpentries *ent, struct ustcomm_app *app, int (*cb)(
struct ustcomm_connection *conn, char *msg
))
+void ustcomm_mp_add_app_clients(struct mpentries *ent, struct ustcomm_app *app, int (*cb)(
char *recvbuf, struct ustcomm_source *src
))
{
struct ustcomm_connection *conn;
{
struct ustcomm_connection *conn;
@@
-935,7
+948,7
@@
void ustcomm_mp_add_app_clients(struct mpentries *ent, struct ustcomm_app *app,
multipoll_add(ent, app->server.listen_fd, POLLIN, process_mp_incoming_conn, &app->server, NULL);
list_for_each_entry(conn, &app->server.connections, list) {
multipoll_add(ent, app->server.listen_fd, POLLIN, process_mp_incoming_conn, &app->server, NULL);
list_for_each_entry(conn, &app->server.connections, list) {
- struct ustcomm_multipoll_conn_info *mpinfo = (struct ustcomm_multipoll_conn_info *) malloc(sizeof(struct ustcomm_multipoll_conn_info));
+ struct ustcomm_multipoll_conn_info *mpinfo = (struct ustcomm_multipoll_conn_info *)
z
malloc(sizeof(struct ustcomm_multipoll_conn_info));
mpinfo->conn = conn;
mpinfo->cb = cb;
multipoll_add(ent, conn->fd, POLLIN, process_mp_conn_msg, mpinfo, free_ustcomm_client_poll);
mpinfo->conn = conn;
mpinfo->cb = cb;
multipoll_add(ent, conn->fd, POLLIN, process_mp_conn_msg, mpinfo, free_ustcomm_client_poll);
This page took
0.027279 seconds
and
4
git commands to generate.