summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/CMakeLists.txt1
-rw-r--r--src/lib/dev.c53
-rw-r--r--src/lib/time_utils.c141
3 files changed, 172 insertions, 23 deletions
diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
index ac9b93b1..796a0b7c 100644
--- a/src/lib/CMakeLists.txt
+++ b/src/lib/CMakeLists.txt
@@ -36,6 +36,7 @@ set(SOURCE_FILES
shm_ap_rbuff.c
shm_du_map.c
sockets.c
+ time_utils.c
utils.c
)
diff --git a/src/lib/dev.c b/src/lib/dev.c
index 1332b014..4f9a00df 100644
--- a/src/lib/dev.c
+++ b/src/lib/dev.c
@@ -281,23 +281,6 @@ int flow_accept(int fd,
return -1;
}
- if (ap_name != NULL) {
- *ap_name = strdup(recv_msg->ap_name);
- if (*ap_name == NULL) {
- irm_msg__free_unpacked(recv_msg, NULL);
- return -1;
- }
- }
-
-
- if (ae_name != NULL) {
- *ae_name = strdup(recv_msg->ae_name);
- if (*ae_name == NULL) {
- irm_msg__free_unpacked(recv_msg, NULL);
- return -1;
- }
- }
-
rw_lock_rdlock(&_ap_instance->data_lock);
rw_lock_wrlock(&_ap_instance->flows_lock);
@@ -305,6 +288,7 @@ int flow_accept(int fd,
if (!bmp_is_id_valid(_ap_instance->fds, cfd)) {
rw_lock_unlock(&_ap_instance->flows_lock);
rw_lock_unlock(&_ap_instance->data_lock);
+ irm_msg__free_unpacked(recv_msg, NULL);
return -1;
}
@@ -317,6 +301,32 @@ int flow_accept(int fd,
return -1;
}
+ if (ap_name != NULL) {
+ *ap_name = strdup(recv_msg->ap_name);
+ if (*ap_name == NULL) {
+ shm_ap_rbuff_close(_ap_instance->flows[cfd].rb);
+ bmp_release(_ap_instance->fds, cfd);
+ rw_lock_unlock(&_ap_instance->flows_lock);
+ rw_lock_unlock(&_ap_instance->data_lock);
+ irm_msg__free_unpacked(recv_msg, NULL);
+ return -1;
+ }
+ }
+
+ if (ae_name != NULL) {
+ *ae_name = strdup(recv_msg->ae_name);
+ if (*ae_name == NULL) {
+ if (*ap_name != NULL)
+ free(*ap_name);
+ shm_ap_rbuff_close(_ap_instance->flows[cfd].rb);
+ bmp_release(_ap_instance->fds, cfd);
+ rw_lock_unlock(&_ap_instance->flows_lock);
+ rw_lock_unlock(&_ap_instance->data_lock);
+ irm_msg__free_unpacked(recv_msg, NULL);
+ return -1;
+ }
+ }
+
_ap_instance->flows[cfd].port_id = recv_msg->port_id;
_ap_instance->flows[cfd].oflags = FLOW_O_DEFAULT;
@@ -414,8 +424,10 @@ int flow_alloc(char * dst_name,
if (!bmp_is_id_valid(_ap_instance->fds, fd)) {
rw_lock_unlock(&_ap_instance->flows_lock);
rw_lock_unlock(&_ap_instance->data_lock);
+ irm_msg__free_unpacked(recv_msg, NULL);
return -1;
}
+
_ap_instance->flows[fd].rb = shm_ap_rbuff_open(recv_msg->pid);
if (_ap_instance->flows[fd].rb == NULL) {
bmp_release(_ap_instance->fds, fd);
@@ -442,7 +454,7 @@ int flow_alloc_res(int fd)
irm_msg_t * recv_msg = NULL;
int result = 0;
- msg.code = IRM_MSG_CODE__IRM_FLOW_ALLOC_RES;
+ msg.code = IRM_MSG_CODE__IRM_FLOW_ALLOC_RES;
msg.has_port_id = true;
rw_lock_rdlock(&_ap_instance->data_lock);
@@ -571,11 +583,6 @@ ssize_t flow_write(int fd, void * buf, size_t count)
rw_lock_unlock(&_ap_instance->data_lock);
return -EPIPE;
}
-
- rw_lock_unlock(&_ap_instance->flows_lock);
- rw_lock_unlock(&_ap_instance->data_lock);
-
- return 0;
} else {
while (shm_ap_rbuff_write(_ap_instance->flows[fd].rb, &e) < 0)
;
diff --git a/src/lib/time_utils.c b/src/lib/time_utils.c
new file mode 100644
index 00000000..2521f217
--- /dev/null
+++ b/src/lib/time_utils.c
@@ -0,0 +1,141 @@
+/*
+ * Ouroboros - Copyright (C) 2016
+ *
+ * Time utilities
+ *
+ * Dimitri Staessens <dimitri.staessens@intec.ugent.be>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <ouroboros/time_utils.h>
+#include <stddef.h>
+
+/* functions for timespecs */
+
+/* add intv to t and store it in res*/
+int ts_add(const struct timespec * t,
+ const struct timespec * intv,
+ struct timespec * res)
+{
+ long nanos = 0;
+
+ if (t == NULL || intv == NULL || res == NULL)
+ return -1;
+
+ nanos = t->tv_nsec + intv->tv_nsec;
+
+ res->tv_sec = t->tv_sec + intv->tv_sec;
+ while (nanos > BILLION) {
+ nanos -= BILLION;
+ ++(res->tv_sec);
+ }
+ res->tv_nsec = nanos;
+
+ return 0;
+}
+
+/* subtract intv from t and stores it in res */
+int ts_diff(const struct timespec * t,
+ const struct timespec * intv,
+ struct timespec * res)
+{
+ long nanos = 0;
+
+ if (t == NULL || intv == NULL || res == NULL)
+ return -1;
+
+ nanos = t->tv_nsec - intv->tv_nsec;
+
+ res->tv_sec = t->tv_sec - intv->tv_sec;
+ while (nanos < 0) {
+ nanos += BILLION;
+ --(res->tv_sec);
+ }
+ res->tv_nsec = nanos;
+
+ return 0;
+}
+
+/* functions for timevals */
+
+/* add intv to t and store it in res*/
+int tv_add(const struct timeval * t,
+ const struct timeval * intv,
+ struct timeval * res)
+{
+ long micros = 0;
+
+ if (t == NULL || intv == NULL || res == NULL)
+ return -1;
+
+ micros = t->tv_usec + intv->tv_usec;
+
+ res->tv_sec = t->tv_sec + intv->tv_sec;
+ while (micros > MILLION) {
+ micros -= MILLION;
+ --(res->tv_sec);
+ }
+ res->tv_usec = micros;
+
+ return 0;
+}
+
+/* subtract intv from t and stores it in res */
+int tv_diff(const struct timeval * t,
+ const struct timeval * intv,
+ struct timeval * res)
+{
+ long micros = 0;
+
+ if (t == NULL || intv == NULL || res == NULL)
+ return -1;
+
+ micros = t->tv_usec - intv->tv_usec;
+
+ res->tv_sec = t->tv_sec - intv->tv_sec;
+ while (micros < 0) {
+ micros += MILLION;
+ --(res->tv_sec);
+ }
+ res->tv_usec = micros;
+
+ return 0;
+}
+
+int tv_to_ts(const struct timeval * src,
+ struct timespec * dst)
+{
+ if (src == NULL || dst == NULL)
+ return -1;
+
+ dst->tv_sec = src->tv_sec;
+ dst->tv_nsec = src->tv_usec * 1000L;
+
+ return 0;
+}
+
+/* copying a timespec into a timeval (loss of resolution) */
+int ts_to_tv(const struct timespec * src,
+ struct timeval * dst)
+{
+ if (src == NULL || dst == NULL)
+ return -1;
+
+ dst->tv_sec = src->tv_sec;
+ dst->tv_usec = src->tv_nsec / 1000L;
+
+ return 0;
+}
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-06 14:35:53 +0000