From m.nemo at gmx.net Thu Oct 6 18:55:11 2011 From: m.nemo at gmx.net (MNemo) Date: Thu, 06 Oct 2011 18:55:11 +0200 Subject: [tyndur-devel] =?utf-8?q?=5BPATCH_2/2=5D_tests=3A_Test_f=C3=BCr_q?= =?utf-8?q?sort?= In-Reply-To: <1316984068-8678-3-git-send-email-kevin@tyndur.org> References: <1316984068-8678-1-git-send-email-kevin@tyndur.org> <1316984068-8678-3-git-send-email-kevin@tyndur.org> Message-ID: <4E8DDD6F.40209@gmx.net> On 25.09.2011 22:54, Kevin Wolf wrote: > diff --git a/tests/libc/qsort.c b/tests/libc/qsort.c > new file mode 100644 > index 0000000..2bcad55 > --- /dev/null > +++ b/tests/libc/qsort.c [?] > + int num; > + int* data; > + int* sorted; > +}; > + > +struct test_data test_data[] = { static wäre hier noch schön; andere wollen ihre test daten evtl. auch test_data nenen ;) > + { > + .num = 0, > + .data = (int[]) {}, > + .sorted = (int[]) {}, > + }, > + { [?] -- MNemo From m.nemo at gmx.net Thu Oct 6 19:07:22 2011 From: m.nemo at gmx.net (Andreas Freimuth) Date: Thu, 6 Oct 2011 19:07:22 +0200 Subject: [tyndur-devel] =?utf-8?q?=5BPATCH_1/2=5D_libc=3A_Bin=C3=A4resuche?= =?utf-8?q?_f=C3=BCr_bsearch?= Message-ID: <1317920843-7449-1-git-send-email-m.nemo@gmx.net> * libc/bsearch: sucht jetzt binär Signed-off-by: Andreas Freimuth --- src/lib/stdlibc/bsearch.c | 22 ++++++++++++++-------- 1 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/lib/stdlibc/bsearch.c b/src/lib/stdlibc/bsearch.c index ef64eda..39f0a9c 100644 --- a/src/lib/stdlibc/bsearch.c +++ b/src/lib/stdlibc/bsearch.c @@ -50,18 +50,24 @@ void *bsearch(const void *key, const void *base, size_t nel, size_t width, int (*compar)(const void *, const void *)) { - size_t i; const void* obj; - // FIXME Binaer suchen ginge schneller... + if (nel == 0) { + return NULL; + } + + obj = base + (width * (nel >> 1)); + int cmp = compar(key, obj); - for (i = 0; i < nel; i++) { - obj = base + (width * i); - if (compar(key, obj) == 0) { - return (void*) obj; + if (cmp == 0) { + return (void*)obj; + } else if (cmp < 0) { + if (nel >> 1 == 0) { + return NULL; } + return bsearch(key, base, nel - (nel >> 1), width, compar); + } else { + return bsearch(key, obj + width, nel - (nel >> 1) - 1, width, compar); } - - return NULL; } -- 1.7.6.4 From m.nemo at gmx.net Thu Oct 6 19:07:23 2011 From: m.nemo at gmx.net (Andreas Freimuth) Date: Thu, 6 Oct 2011 19:07:23 +0200 Subject: [tyndur-devel] =?utf-8?q?=5BPATCH_2/2=5D_tests=3A_Test_f=C3=BCr_b?= =?utf-8?q?search?= In-Reply-To: <1317920843-7449-1-git-send-email-m.nemo@gmx.net> References: <1317920843-7449-1-git-send-email-m.nemo@gmx.net> Message-ID: <1317920843-7449-2-git-send-email-m.nemo@gmx.net> + test/libc: ein paar Testfälle für bsearch Signed-off-by: Andreas Freimuth --- tests/libc/Makefile | 2 +- tests/libc/bsearch.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++++ tests/libc/main.c | 11 +++++ tests/libc/run_test.sh | 1 + 4 files changed, 110 insertions(+), 1 deletions(-) create mode 100644 tests/libc/bsearch.c diff --git a/tests/libc/Makefile b/tests/libc/Makefile index c1fc206..cd47689 100644 --- a/tests/libc/Makefile +++ b/tests/libc/Makefile @@ -12,7 +12,7 @@ LDFLAGS=-T ../../src/modules/user-i386.ld --start-group ../../src/lib/library.a qemu: main @QEMU=$(QEMU) ./run_test.sh -main: main.o qsort.o ../lib/testlib.o +main: main.o qsort.o bsearch.o ../lib/testlib.o @$(LD) $^ $(LDFLAGS) -o $@ %.o: %.c diff --git a/tests/libc/bsearch.c b/tests/libc/bsearch.c new file mode 100644 index 0000000..f279663 --- /dev/null +++ b/tests/libc/bsearch.c @@ -0,0 +1,97 @@ +/* + * Copyright (c) 2011 The tyndur Project. All rights reserved. + * + * This code is derived from software contributed to the tyndur Project + * by Kevin Wolf. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; + * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "testlib.h" + +#include +#include + +struct test_data { + int num; + int* sorted; + int lookups; + int** keys; +}; + +static struct test_data test_data[] = { + { + .num = 0, + .sorted = (int[]) {}, + .lookups= 1, + .keys = (int*[]) {(int[]){42, -1},}, + }, + { + .num = 2, + .sorted = (int[]) { 2, 5 }, + .lookups= 5, + .keys = (int*[]) { + (int[]){2, 0},(int[]){5, 1},(int[]){3, -1}, (int[]){1, -1}, + (int[]){1337, -1} + }, + }, + { + .num = 5, + .sorted = (int[]) { -21, 0, 2, 5, 7 }, + .lookups= 7, + .keys = (int*[]) { + (int[]){0, 1},(int[]){5, 3},(int[]){3, -1},(int[]){1, -1}, + (int[]){1337, -1},(int[]){7, 4},(int[]){-22, -1} + }, + }, +}; + +static int compare(const void* a, const void* b) +{ + return *(int*)a - *(int*)b; +} + +int test_bsearch(void) +{ + int i,j; + int num_tests = sizeof(test_data) / sizeof(test_data[0]); + + for (i = 0; i < num_tests; i++) { + struct test_data* t = &test_data[i]; + + for (j = 0; j < t->lookups; j++) { + int* pos = bsearch(&t->keys[j][0], t->sorted, t->num, sizeof(int), compare); + if (pos == NULL && t->keys[j][1] == -1) { + // printf("* PASS %s: Datensatz %d Lookup %d\n", test_name, i,j); + } else if (pos - t->sorted == t->keys[j][1]) { + // printf("* PASS %s: Datensatz %d Lookup %d\n", test_name, i,j); + } else { + printf("* FAIL %s: Datensatz %d Lookup %d\n", test_name, i,j); + return -1; + + } + } + printf("* PASS %s: Datensatz %d\n", test_name, i); + } + + return 0; +} diff --git a/tests/libc/main.c b/tests/libc/main.c index eb15c21..5921a1d 100644 --- a/tests/libc/main.c +++ b/tests/libc/main.c @@ -34,6 +34,7 @@ const char* test_name; extern int test_qsort(void); +extern int test_bsearch(void); static void test1(void) { @@ -41,6 +42,12 @@ static void test1(void) test_qsort(); } +static void test2(void) +{ + test_name = "bsearch"; + test_bsearch(); +} + int main(int argc, char* argv[]) { if (argc < 2) { @@ -53,6 +60,10 @@ int main(int argc, char* argv[]) test1(); break; + case 2: + test2(); + break; + default: printf("* ERROR Unbekannter Testfall\n"); break; diff --git a/tests/libc/run_test.sh b/tests/libc/run_test.sh index 72fabaf..f163cca 100755 --- a/tests/libc/run_test.sh +++ b/tests/libc/run_test.sh @@ -21,3 +21,4 @@ function run_test() } run_test main 1 +run_test main 2 -- 1.7.6.4 From kevin at tyndur.org Wed Oct 12 00:25:10 2011 From: kevin at tyndur.org (Kevin Wolf) Date: Wed, 12 Oct 2011 00:25:10 +0200 Subject: [tyndur-devel] =?iso-8859-1?q?=5BPATCH_1/2=5D_libc=3A_Bin=E4resuc?= =?iso-8859-1?q?he_f=FCr_bsearch?= In-Reply-To: <1317920843-7449-1-git-send-email-m.nemo@gmx.net> References: <1317920843-7449-1-git-send-email-m.nemo@gmx.net> Message-ID: <20111011222509.GA8994@silvanus> On Thu, Oct 06, 2011 at 07:07:22PM +0200, Andreas Freimuth wrote: > * libc/bsearch: sucht jetzt binär > > Signed-off-by: Andreas Freimuth Danke, ist jetzt beides drin. From kevin at tyndur.org Fri Oct 28 22:48:28 2011 From: kevin at tyndur.org (Kevin Wolf) Date: Fri, 28 Oct 2011 22:48:28 +0200 Subject: [tyndur-devel] [PATCH] kernel2: Kommandozeilenoption "smp" Message-ID: <1319834908-21601-1-git-send-email-kevin@tyndur.org> * kernel2: SMP wird nur initialisiert, wenn die Kernelkommandozeile die Option "smp" enthält. Standardmäßig bootet das System damit auch auf einem Mehrprozessorsystem wieder, wenn auch mit nur einem aktiven Prozessor. Signed-off-by: Kevin Wolf --- src/kernel2/src/init.c | 32 +++++++++++++++++++++++++++++++- src/kernel2/src/smp/smp.c | 6 +++++- 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/src/kernel2/src/init.c b/src/kernel2/src/init.c index 1e9c1b3..359af08 100644 --- a/src/kernel2/src/init.c +++ b/src/kernel2/src/init.c @@ -68,6 +68,36 @@ void gdt_init(void); void vm86_init(void); void panic(char* message, ...); +/** + * Liest die Kernelkommandozeile ein + * + * Als erster Teilstring wird einfach irgendwas akzeptiert, weil davon + * auszugehen ist, dass das der Kernelname ist. GRUB 2 übergibt den + * Kernelnamen allerdings nicht, deswegen werden auch an erster Position + * Parameter ausgewertet, wenn sie bekannt sind. + */ +static void parse_cmdline(char* cmdline) +{ + char* p; + extern bool enable_smp; + bool kernel_name = true; + + p = strtok(cmdline, " "); + + while (p) { + if (!strncmp(p, "debug=", 6)) { + debug_parse_cmdline(multiboot_info.mi_cmdline); + } else if (!strcmp(p, "smp")) { + enable_smp = true; + } else if (kernel_name) { + kernel_name = false; + } else { + kprintf("Unbekannte Option: '%s'\n", p); + } + + p = strtok(NULL, " "); + } +} /** * Kernel-Initialisierung erfolgt hier, @@ -98,7 +128,7 @@ void init(int multiboot_magic, struct multiboot_info *boot_info, bool bsp) // Debugparameter verarbeiten, das ist aber nur moeglich, wenn eine // Kernelkommandozeile existiert. if ((multiboot_info.mi_flags & MULTIBOOT_INFO_HAS_CMDLINE) != 0) { - debug_parse_cmdline(multiboot_info.mi_cmdline); + parse_cmdline(multiboot_info.mi_cmdline); } #if CONFIG_ARCH == ARCH_I386 diff --git a/src/kernel2/src/smp/smp.c b/src/kernel2/src/smp/smp.c index 0954960..732282b 100644 --- a/src/kernel2/src/smp/smp.c +++ b/src/kernel2/src/smp/smp.c @@ -35,6 +35,7 @@ #include #include #include +#include #include #include "lock.h" @@ -100,6 +101,9 @@ extern lock_t init_lock; /// Anzahl der Installierten CPUs extern size_t cpu_count; +/// Weitere Prozessoren werden nur mit enable_smp = true initialisiert +bool enable_smp = false; + /** * Suchen des MP-Floating pointers in einem festgelegten Bereich. Diese * Struktur wird anhand der Signatur gesucht. Wenn die Signatur uebereinstimmt, @@ -203,7 +207,7 @@ void smp_init(void) // Wenn der Floating-Pointer nicht gefunden wurde, wird abgebrochen, denn // dann wurde er entweder ueberschrieben, oder oder aber kein SMP wird // unterstuetzt. - if ((floating_pointer == NULL) || (!CONFIG_SMP)) { + if ((floating_pointer == NULL) || (!CONFIG_SMP) || !enable_smp) { // Wenn kein SMP aktiviert ist, muss der Bootstrapprozessor manuell in // die CPU-Liste eingetragen werden, damit im Rest des Codes nicht // unterschieden werden muss. -- 1.6.0.2 From m.nemo at gmx.net Sat Oct 29 11:55:43 2011 From: m.nemo at gmx.net (MNemo) Date: Sat, 29 Oct 2011 11:55:43 +0200 Subject: [tyndur-devel] [PATCH] kernel2: Kommandozeilenoption "smp" In-Reply-To: <1319834908-21601-1-git-send-email-kevin@tyndur.org> References: <1319834908-21601-1-git-send-email-kevin@tyndur.org> Message-ID: <4EABCD9F.7040007@gmx.net> On 28.10.2011 22:48, Kevin Wolf wrote: [?] > +static void parse_cmdline(char* cmdline) > +{ > + char* p; > + extern bool enable_smp; > + bool kernel_name = true; > + > + p = strtok(cmdline, " "); > + > + while (p) { > + if (!strncmp(p, "debug=", 6)) { > + debug_parse_cmdline(multiboot_info.mi_cmdline); Das tut so nicht, bzw. bestenfalls mit GRUB2 und debug also ersten Parameter. strtok macht die cmdline kaputt. debug_parse_cmdline(p); sollte aber auch ausreichen. Wenn das gefixt ist: Acked-by: Andreas Freimuth -- MNemo From kevin at tyndur.org Sat Oct 29 14:17:51 2011 From: kevin at tyndur.org (Kevin Wolf) Date: Sat, 29 Oct 2011 14:17:51 +0200 Subject: [tyndur-devel] [PATCH] kernel2: Kommandozeilenoption "smp" In-Reply-To: <4EABCD9F.7040007@gmx.net> References: <1319834908-21601-1-git-send-email-kevin@tyndur.org> <4EABCD9F.7040007@gmx.net> Message-ID: <20111029121751.GA7837@silvanus> On Sat, Oct 29, 2011 at 11:55:43AM +0200, MNemo wrote: > On 28.10.2011 22:48, Kevin Wolf wrote: > [?] > > +static void parse_cmdline(char* cmdline) > > +{ > > + char* p; > > + extern bool enable_smp; > > + bool kernel_name = true; > > + > > + p = strtok(cmdline, " "); > > + > > + while (p) { > > + if (!strncmp(p, "debug=", 6)) { > > + debug_parse_cmdline(multiboot_info.mi_cmdline); > Das tut so nicht, bzw. bestenfalls mit GRUB2 und debug also ersten > Parameter. strtok macht die cmdline kaputt. > > debug_parse_cmdline(p); > > sollte aber auch ausreichen. > > > Wenn das gefixt ist: > > Acked-by: Andreas Freimuth Ups. Danke, das muss natürlich p heißen. Ich frage mich, was ich da gestern getestet habe...