rt-app: fix compile warnings

Fix various compilation warnings in one go.

Signed-off-by: Juri Lelli <juri.lelli@arm.com>
Acked-by: Vincent Guittot <vincent.guittot@linaro.org>

6 files changed, 21 insertions, 8 deletions

diff --git a/libdl/dl_syscalls.h b/libdl/dl_syscalls.h
index 27cbfe1..ca07503 100644
--- a/libdl/dl_syscalls.h
+++ b/libdl/dl_syscalls.h
@@ -17,7 +17,9 @@
 #define __DL_SYSCALLS__
 
 #include <linux/kernel.h>
-#include <linux/unistd.h>
+#define _GNU_SOURCE
+#include <unistd.h>
+#include <sys/syscall.h>
 #include <time.h>
 #include <linux/types.h>
 
diff --git a/src/rt-app.c b/src/rt-app.c
index 5283ac7..211dd77 100644
--- a/src/rt-app.c
+++ b/src/rt-app.c
@@ -170,7 +170,7 @@ int calibrate_cpu_cycles(int clock)
 
 }
 
-static inline loadwait(unsigned long exec)
+static inline unsigned long loadwait(unsigned long exec)
 {
 	unsigned long load_count;
 
@@ -358,7 +358,7 @@ int run(int ind, phase_data_t *pdata, unsigned long *duration,
 	for (i = 0; i < nbevents; i++)
 	{
 		if (!continue_running && !lock)
-			return;
+			return perf;
 
 		log_debug("[%d] runs events %d type %d ", ind, i, events[i].type);
 		if (opts.ftrace)
diff --git a/src/rt-app_args.h b/src/rt-app_args.h
index 9bbde38..23ba50c 100644
--- a/src/rt-app_args.h
+++ b/src/rt-app_args.h
@@ -36,10 +36,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #ifdef DLSCHED
 #include "dl_syscalls.h"
 #endif
-
-#ifdef JSON
 #include "rt-app_parse_config.h"
-#endif
 
 #define DEFAULT_THREAD_PRIORITY 10
 #define PATH_LENGTH 256
diff --git a/src/rt-app_parse_config.h b/src/rt-app_parse_config.h
index 023cabd..9b0e5fa 100644
--- a/src/rt-app_parse_config.h
+++ b/src/rt-app_parse_config.h
@@ -45,5 +45,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 void
 parse_config(const char *filename, rtapp_options_t *opts);
+void
+parse_config_stdin(rtapp_options_t *opts);
 
 #endif // _RTAPP_PARSE_CONFIG_H
diff --git a/src/rt-app_utils.c b/src/rt-app_utils.c
index c4840db..887bfc8 100644
--- a/src/rt-app_utils.c
+++ b/src/rt-app_utils.c
@@ -19,6 +19,8 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
+#include <errno.h>
+#include <string.h>
 #include "rt-app_utils.h"
 
 unsigned long
@@ -253,7 +255,7 @@ resource_to_string(resource_t resource, char *resource_name)
 void ftrace_write(int mark_fd, const char *fmt, ...)
 {
 	va_list ap;
-	int n, size = BUF_SIZE;
+	int n, size = BUF_SIZE, ret;
 	char *tmp, *ntmp;
 
 	if (mark_fd < 0) {
@@ -274,8 +276,15 @@ void ftrace_write(int mark_fd, const char *fmt, ...)
 
 		/* If it worked return success */
 		if (n > -1 && n < size) {
-			write(mark_fd, tmp, n);
+			ret = write(mark_fd, tmp, n);
 			free(tmp);
+			if (ret < 0) {
+				log_error("Cannot write mark_fd: %s\n",
+						strerror(errno));
+				exit(EXIT_FAILURE);
+			} else if (ret < n) {
+				log_debug("Cannot write all bytes at once into mark_fd\n");
+			}
 			return;
 		}
 
diff --git a/src/rt-app_utils.h b/src/rt-app_utils.h
index 64f97f6..a41d8ad 100644
--- a/src/rt-app_utils.h
+++ b/src/rt-app_utils.h
@@ -28,6 +28,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <string.h>
 #include <stdarg.h>
 #include <stdlib.h>
+#define _GNU_SOURCE
+#include <unistd.h>
+#include <sys/syscall.h>
 #include "rt-app_types.h"
 
 #ifndef LOG_PREFIX