From 48699fe1e754d34b8f4ed96a34defb63c606cb4b Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Sat, 28 Nov 2009 17:16:40 +0100 Subject: [PATCH] Let BFQ do its best without any hint We do not bind disk vres as the code is buggy. Lets's see whether it helps. --- build/recorder/Makefile.omk | 2 +- build/recorder/ffmpeg.c | 4 ++-- src/frsh_forb | 2 +- src/streamer | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build/recorder/Makefile.omk b/build/recorder/Makefile.omk index 647a453..99813d6 100644 --- a/build/recorder/Makefile.omk +++ b/build/recorder/Makefile.omk @@ -9,7 +9,7 @@ CFLAGS += -Wall CFLAGS += -Wno-switch -Wdisabled-optimization -Wpointer-arith -Wredundant-decls CFLAGS += -Wno-pointer-sign CFLAGS += -I /usr/local/include -CFLAGS += -g -O0 +CFLAGS += -g -O1 # ifdef CONFIG_AQUOSA # CPPFLAGS += -I$(AQUOSA)/include diff --git a/build/recorder/ffmpeg.c b/build/recorder/ffmpeg.c index 291f2a9..f4feb17 100644 --- a/build/recorder/ffmpeg.c +++ b/build/recorder/ffmpeg.c @@ -3949,7 +3949,7 @@ void *av_encode_thread(void *arg) /* bind this thread to vres */ thread_id = fosa_thread_self(); - PXW(frsh_thread_bind(disk_vres, thread_id)); + /* PXW(frsh_thread_bind(disk_vres, thread_id)); */ ret = av_encode(output_files, nb_output_files, input_files, nb_input_files, @@ -3978,7 +3978,7 @@ int frsh_stuff() /* #define DISK_THROUGHPUT 20277LLU /\* units??? probably MB/s *\/ */ /* disk_budget = fosa_nsec_to_rel_time(1000000000LLU/\*nsec/s*\/ * 500000 /\*bytes/s*\/ */ /* / (DISK_THROUGHPUT*1000000) /\* bytes *\/); // is this correct? */ - disk_budget = fosa_msec_to_rel_time(2); + disk_budget = fosa_msec_to_rel_time(1); disk_period = fosa_msec_to_rel_time(1000/50); /* Contract negotiation for CPU */ diff --git a/src/frsh_forb b/src/frsh_forb index 2b7d0a8..6e4d7a6 160000 --- a/src/frsh_forb +++ b/src/frsh_forb @@ -1 +1 @@ -Subproject commit 2b7d0a84e50d47e86582fd77dc1409c4d06afd4a +Subproject commit 6e4d7a62fc3bd32670db9c47d246a3f69360ac78 diff --git a/src/streamer b/src/streamer index 598c358..743edce 160000 --- a/src/streamer +++ b/src/streamer @@ -1 +1 @@ -Subproject commit 598c35885266e592779e6521fe9f78517caf2dfa +Subproject commit 743edce97bef0897644164f379c085b7e03c3d0a -- 2.39.2