Index: uspace/app/logset/Makefile =================================================================== --- uspace/app/logset/Makefile (revision 9ab27144f671d13ed76e2e885acabcdcd64ce303) +++ uspace/app/logset/Makefile (revision 9ab27144f671d13ed76e2e885acabcdcd64ce303) @@ -0,0 +1,35 @@ +# +# Copyright (c) 2012 Vojtech Horky +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - 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. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. +# + +USPACE_PREFIX = ../.. +BINARY = logset + +SOURCES = \ + main.c + +include $(USPACE_PREFIX)/Makefile.common Index: uspace/app/logset/main.c =================================================================== --- uspace/app/logset/main.c (revision 9ab27144f671d13ed76e2e885acabcdcd64ce303) +++ uspace/app/logset/main.c (revision 9ab27144f671d13ed76e2e885acabcdcd64ce303) @@ -0,0 +1,89 @@ +/* + * Copyright (c) 2012 Vojtech Horky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - 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. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. + */ + +/** @addtogroup logset + * @{ + */ +/** @file Change logger behavior. + */ +#include +#include +#include +#include +#include + +static log_level_t parse_log_level_or_die(const char *log_level) +{ + log_level_t result; + int rc = log_level_from_str(log_level, &result); + if (rc != EOK) { + fprintf(stderr, "Unrecognised log level '%s': %s.\n", + log_level, str_error(rc)); + exit(2); + } + return result; +} + +static void usage(const char *progname) +{ + fprintf(stderr, "Usage:\n"); + fprintf(stderr, " %s \n", progname); + fprintf(stderr, " %s \n", progname); +} + +int main(int argc, char *argv[]) +{ + if (argc == 2) { + log_level_t new_default_level = parse_log_level_or_die(argv[1]); + int rc = logctl_set_default_level(new_default_level); + + if (rc != EOK) { + fprintf(stderr, "Failed to change default logging level: %s.\n", + str_error(rc)); + return 2; + } + } else if (argc == 3) { + log_level_t new_level = parse_log_level_or_die(argv[2]); + const char *logname = argv[1]; + int rc = logctl_set_log_level(logname, new_level); + + if (rc != EOK) { + fprintf(stderr, "Failed to change logging level: %s.\n", + str_error(rc)); + return 2; + } + } else { + usage(argv[0]); + return 1; + } + + return 0; +} + +/** @} + */ Index: uspace/app/tester/Makefile =================================================================== --- uspace/app/tester/Makefile (revision 0d911ee88ccc7cd4c00535c1e496c7b387ca25ae) +++ uspace/app/tester/Makefile (revision 9ab27144f671d13ed76e2e885acabcdcd64ce303) @@ -29,6 +29,6 @@ USPACE_PREFIX = ../.. -LIBS = $(LIBEXT2_PREFIX)/libext2.a $(LIBBLOCK_PREFIX)/libblock.a -EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX) -I$(LIBEXT2_PREFIX) +LIBS = $(LIBEXT2_PREFIX)/libext2.a $(LIBBLOCK_PREFIX)/libblock.a $(LIBSOFTFLOAT_PREFIX)/libsoftfloat.a +EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX) -I$(LIBEXT2_PREFIX) -I$(LIBSOFTFLOAT_PREFIX) BINARY = tester @@ -45,7 +45,11 @@ stdio/stdio1.c \ stdio/stdio2.c \ + stdio/logger1.c \ + stdio/logger2.c \ fault/fault1.c \ fault/fault2.c \ fault/fault3.c \ + float/float1.c \ + float/softfloat1.c \ vfs/vfs1.c \ ipc/ping_pong.c \ @@ -59,5 +63,5 @@ hw/misc/virtchar1.c \ hw/serial/serial1.c \ - libext2/libext2_1.c + ext2/ext2_1.c include $(USPACE_PREFIX)/Makefile.common Index: uspace/app/tester/ext2/ext2_1.c =================================================================== --- uspace/app/tester/ext2/ext2_1.c (revision 9ab27144f671d13ed76e2e885acabcdcd64ce303) +++ uspace/app/tester/ext2/ext2_1.c (revision 9ab27144f671d13ed76e2e885acabcdcd64ce303) @@ -0,0 +1,106 @@ +/* + * Copyright (c) 2011 Martin Sucha + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - 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. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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 +#include +#include "../tester.h" +#include "../util.h" +#include +#include + +static ext2_superblock_t *fake_superblock1() +{ + uint8_t *buf; + int i; + + buf = malloc(EXT2_SUPERBLOCK_SIZE); + if (buf == NULL) { + return NULL; + } + + for (i = 0; i < EXT2_SUPERBLOCK_SIZE; i++) { + buf[i] = i % 256; + } + + return (ext2_superblock_t *) buf; +} + +const char *test_ext2_1(void) +{ + ext2_superblock_t *fake1; + + TPRINTF("Testing ext2 superblock getters...\n"); + TPRINTF("Simple test for correct position and byte order\n"); + + fake1 = fake_superblock1(); + if (fake1 == NULL) { + return "Failed allocating memory for test superblock 1"; + } + + ASSERT_EQ_32(0x03020100, ext2_superblock_get_total_inode_count(fake1), + "Failed getting total inode count"); + ASSERT_EQ_32(0x07060504, ext2_superblock_get_total_block_count(fake1), + "Failed getting total block count"); + ASSERT_EQ_32(0x0B0A0908, ext2_superblock_get_reserved_block_count(fake1), + "Failed getting reserved block count"); + ASSERT_EQ_32(0x0F0E0D0C, ext2_superblock_get_free_block_count(fake1), + "Failed getting free block count"); + ASSERT_EQ_32(0x13121110, ext2_superblock_get_free_inode_count(fake1), + "Failed getting free inode count"); + ASSERT_EQ_32(0x17161514, ext2_superblock_get_first_block(fake1), + "Failed getting first block number"); + ASSERT_EQ_32(0x1B1A1918, ext2_superblock_get_block_size_log2(fake1), + "Failed getting log block size"); + ASSERT_EQ_32(0x1F1E1D1C, ext2_superblock_get_fragment_size_log2(fake1), + "Failed getting log fragment size"); + ASSERT_EQ_32(0x23222120, ext2_superblock_get_blocks_per_group(fake1), + "Failed getting blocks per group"); + ASSERT_EQ_32(0x27262524, ext2_superblock_get_fragments_per_group(fake1), + "Failed getting fragments per group"); + ASSERT_EQ_32(0x2B2A2928, ext2_superblock_get_inodes_per_group(fake1), + "Failed getting inodes per group"); + ASSERT_EQ_16(0x3938, ext2_superblock_get_magic(fake1), + "Failed getting magic number"); + ASSERT_EQ_16(0x3B3A, ext2_superblock_get_state(fake1), + "Failed getting state"); + ASSERT_EQ_16(0x3F3E, ext2_superblock_get_rev_minor(fake1), + "Failed getting minor revision number"); + ASSERT_EQ_32(0x4B4A4948, ext2_superblock_get_os(fake1), + "Failed getting OS"); + ASSERT_EQ_32(0x4F4E4D4C, ext2_superblock_get_rev_major(fake1), + "Failed getting major revision number"); + ASSERT_EQ_32(0x57565554, ext2_superblock_get_first_inode(fake1), + "Failed getting first inode number"); + ASSERT_EQ_16(0x5958, ext2_superblock_get_inode_size(fake1), + "Failed getting size"); + ASSERT_EQ_8(0x68, fake1->uuid[0], "UUID position is incorrect"); + ASSERT_EQ_8(0x78, fake1->volume_name[0], + "Volume name position is incorrect"); + + return NULL; +} Index: uspace/app/tester/ext2/ext2_1.def =================================================================== --- uspace/app/tester/ext2/ext2_1.def (revision 9ab27144f671d13ed76e2e885acabcdcd64ce303) +++ uspace/app/tester/ext2/ext2_1.def (revision 9ab27144f671d13ed76e2e885acabcdcd64ce303) @@ -0,0 +1,6 @@ +{ + "ext2_1", + "Superblock getters test", + &test_ext2_1, + true +}, Index: uspace/app/tester/float/float1.c =================================================================== --- uspace/app/tester/float/float1.c (revision 9ab27144f671d13ed76e2e885acabcdcd64ce303) +++ uspace/app/tester/float/float1.c (revision 9ab27144f671d13ed76e2e885acabcdcd64ce303) @@ -0,0 +1,97 @@ +/* + * Copyright (c) 2005 Jakub Vana + * Copyright (c) 2005 Jakub Jermar + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - 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. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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 +#include +#include +#include +#include +#include "../tester.h" + +#define THREADS 150 +#define ATTEMPTS 100 + +#define E_10E8 UINT32_C(271828182) +#define PRECISION 100000000 + +static atomic_t threads_finished; +static atomic_t threads_fault; + +static void e(void *data) +{ + for (unsigned int i = 0; i < ATTEMPTS; i++) { + double le = -1; + double e = 0; + double f = 1; + + for (double d = 1; e != le; d *= f, f += 1) { + le = e; + e = e + 1 / d; + } + + if ((uint32_t) (e * PRECISION) != E_10E8) { + atomic_inc(&threads_fault); + break; + } + } + + atomic_inc(&threads_finished); +} + +const char *test_float1(void) +{ + atomic_count_t total = 0; + + atomic_set(&threads_finished, 0); + atomic_set(&threads_fault, 0); + + TPRINTF("Creating threads"); + for (unsigned int i = 0; i < THREADS; i++) { + if (thread_create(e, NULL, "e", NULL) < 0) { + TPRINTF("\nCould not create thread %u\n", i); + break; + } + + TPRINTF("."); + total++; + } + + TPRINTF("\n"); + + while (atomic_get(&threads_finished) < total) { + TPRINTF("Threads left: %" PRIua "\n", + total - atomic_get(&threads_finished)); + sleep(1); + } + + if (atomic_get(&threads_fault) == 0) + return NULL; + + return "Test failed"; +} Index: uspace/app/tester/float/float1.def =================================================================== --- uspace/app/tester/float/float1.def (revision 9ab27144f671d13ed76e2e885acabcdcd64ce303) +++ uspace/app/tester/float/float1.def (revision 9ab27144f671d13ed76e2e885acabcdcd64ce303) @@ -0,0 +1,6 @@ +{ + "float1", + "Floating point computation", + &test_float1, + true +}, Index: uspace/app/tester/float/softfloat1.c =================================================================== --- uspace/app/tester/float/softfloat1.c (revision 9ab27144f671d13ed76e2e885acabcdcd64ce303) +++ uspace/app/tester/float/softfloat1.c (revision 9ab27144f671d13ed76e2e885acabcdcd64ce303) @@ -0,0 +1,95 @@ +/* + * Copyright (c) 2012 Martin Decky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - 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. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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 +#include +#include +#include +#include +#include "../tester.h" + +#define OPERANDS 5 +#define PRECISION 10000 + +#define PRIdCMPTYPE PRId32 + +typedef int32_t cmptype_t; + +static float float_op_a[OPERANDS] = + {3.5, -2.1, 100.0, 50.0, -1024.0}; + +static float float_op_b[OPERANDS] = + {-2.1, 100.0, 50.0, -1024.0, 3.5}; + +static cmptype_t cmpabs(cmptype_t a) +{ + if (a >= 0) + return a; + + return -a; +} + +static bool test_float_add(void) +{ + bool correct = true; + + for (unsigned int i = 0; i < OPERANDS; i++) { + for (unsigned int j = 0; j < OPERANDS; j++) { + float a = float_op_a[i]; + float b = float_op_b[j]; + float c = a + b; + + float_t sa; + float_t sb; + float_t sc; + + sa.val = float_op_a[i]; + sb.val = float_op_b[i]; + sc.data = add_float(sa.data, sb.data); + + cmptype_t ic = (cmptype_t) (c * PRECISION); + cmptype_t isc = (cmptype_t) (sc.val * PRECISION); + cmptype_t diff = cmpabs(ic - isc); + + if (diff != 0) { + TPRINTF("i=%u, j=%u diff=%" PRIdCMPTYPE "\n", i, j, diff); + correct = false; + } + } + } + + return correct; +} + +const char *test_softfloat1(void) +{ + if (!test_float_add()) + return "Float addition failed"; + + return NULL; +} Index: uspace/app/tester/float/softfloat1.def =================================================================== --- uspace/app/tester/float/softfloat1.def (revision 9ab27144f671d13ed76e2e885acabcdcd64ce303) +++ uspace/app/tester/float/softfloat1.def (revision 9ab27144f671d13ed76e2e885acabcdcd64ce303) @@ -0,0 +1,6 @@ +{ + "softfloat1", + "Software floating point computation", + &test_softfloat1, + true +}, Index: uspace/app/tester/libext2/libext2_1.c =================================================================== --- uspace/app/tester/libext2/libext2_1.c (revision 0d911ee88ccc7cd4c00535c1e496c7b387ca25ae) +++ (revision ) @@ -1,106 +1,0 @@ -/* - * Copyright (c) 2011 Martin Sucha - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - 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. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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 -#include -#include "../tester.h" -#include "../util.h" -#include -#include - -static ext2_superblock_t *fake_superblock1() -{ - uint8_t *buf; - int i; - - buf = malloc(EXT2_SUPERBLOCK_SIZE); - if (buf == NULL) { - return NULL; - } - - for (i = 0; i < EXT2_SUPERBLOCK_SIZE; i++) { - buf[i] = i % 256; - } - - return (ext2_superblock_t *) buf; -} - -const char *test_libext2_1(void) -{ - ext2_superblock_t *fake1; - - TPRINTF("Testing libext2 superblock getters...\n"); - TPRINTF("Simple test for correct position and byte order\n"); - - fake1 = fake_superblock1(); - if (fake1 == NULL) { - return "Failed allocating memory for test superblock 1"; - } - - ASSERT_EQ_32(0x03020100, ext2_superblock_get_total_inode_count(fake1), - "Failed getting total inode count"); - ASSERT_EQ_32(0x07060504, ext2_superblock_get_total_block_count(fake1), - "Failed getting total block count"); - ASSERT_EQ_32(0x0B0A0908, ext2_superblock_get_reserved_block_count(fake1), - "Failed getting reserved block count"); - ASSERT_EQ_32(0x0F0E0D0C, ext2_superblock_get_free_block_count(fake1), - "Failed getting free block count"); - ASSERT_EQ_32(0x13121110, ext2_superblock_get_free_inode_count(fake1), - "Failed getting free inode count"); - ASSERT_EQ_32(0x17161514, ext2_superblock_get_first_block(fake1), - "Failed getting first block number"); - ASSERT_EQ_32(0x1B1A1918, ext2_superblock_get_block_size_log2(fake1), - "Failed getting log block size"); - ASSERT_EQ_32(0x1F1E1D1C, ext2_superblock_get_fragment_size_log2(fake1), - "Failed getting log fragment size"); - ASSERT_EQ_32(0x23222120, ext2_superblock_get_blocks_per_group(fake1), - "Failed getting blocks per group"); - ASSERT_EQ_32(0x27262524, ext2_superblock_get_fragments_per_group(fake1), - "Failed getting fragments per group"); - ASSERT_EQ_32(0x2B2A2928, ext2_superblock_get_inodes_per_group(fake1), - "Failed getting inodes per group"); - ASSERT_EQ_16(0x3938, ext2_superblock_get_magic(fake1), - "Failed getting magic number"); - ASSERT_EQ_16(0x3B3A, ext2_superblock_get_state(fake1), - "Failed getting state"); - ASSERT_EQ_16(0x3F3E, ext2_superblock_get_rev_minor(fake1), - "Failed getting minor revision number"); - ASSERT_EQ_32(0x4B4A4948, ext2_superblock_get_os(fake1), - "Failed getting OS"); - ASSERT_EQ_32(0x4F4E4D4C, ext2_superblock_get_rev_major(fake1), - "Failed getting major revision number"); - ASSERT_EQ_32(0x57565554, ext2_superblock_get_first_inode(fake1), - "Failed getting first inode number"); - ASSERT_EQ_16(0x5958, ext2_superblock_get_inode_size(fake1), - "Failed getting size"); - ASSERT_EQ_8(0x68, fake1->uuid[0], "UUID position is incorrect"); - ASSERT_EQ_8(0x78, fake1->volume_name[0], - "Volume name position is incorrect"); - - return NULL; -} Index: uspace/app/tester/libext2/libext2_1.def =================================================================== --- uspace/app/tester/libext2/libext2_1.def (revision 0d911ee88ccc7cd4c00535c1e496c7b387ca25ae) +++ (revision ) @@ -1,6 +1,0 @@ -{ - "libext2_1", - "Superblock getters test", - &test_libext2_1, - true -}, Index: uspace/app/tester/stdio/logger1.c =================================================================== --- uspace/app/tester/stdio/logger1.c (revision 9ab27144f671d13ed76e2e885acabcdcd64ce303) +++ uspace/app/tester/stdio/logger1.c (revision 9ab27144f671d13ed76e2e885acabcdcd64ce303) @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2012 Vojtech Horky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - 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. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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 +#include +#include +#include +#include "../tester.h" + +const char *test_logger1(void) +{ + for (log_level_t level = 0; level < LVL_LIMIT; level++) { + log_msg(LOG_DEFAULT, level, "Testing logger, level %d.", (int) level); + } + + return NULL; +} Index: uspace/app/tester/stdio/logger1.def =================================================================== --- uspace/app/tester/stdio/logger1.def (revision 9ab27144f671d13ed76e2e885acabcdcd64ce303) +++ uspace/app/tester/stdio/logger1.def (revision 9ab27144f671d13ed76e2e885acabcdcd64ce303) @@ -0,0 +1,6 @@ +{ + "logger1", + "Logger printing test", + &test_logger1, + true +}, Index: uspace/app/tester/stdio/logger2.c =================================================================== --- uspace/app/tester/stdio/logger2.c (revision 9ab27144f671d13ed76e2e885acabcdcd64ce303) +++ uspace/app/tester/stdio/logger2.c (revision 9ab27144f671d13ed76e2e885acabcdcd64ce303) @@ -0,0 +1,63 @@ +/* + * Copyright (c) 2012 Vojtech Horky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - 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. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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 +#include +#include +#include +#include +#include "../tester.h" + +const char *test_logger2(void) +{ + log_t log_alpha = log_create("alpha", LOG_DEFAULT); + log_t log_bravo = log_create("bravo", log_alpha); + + TPRINTF("Alpha is %" PRIlogctx ".\n", log_alpha); + TPRINTF("Bravo is %" PRIlogctx ".\n", log_bravo); + + while (true) { + /* + * Intentionally skipping FATAL to allow muting + * the output completely by setting visible level to FATAL. + */ + for (log_level_t level = LVL_ERROR; level < LVL_LIMIT; level++) { + log_msg(LOG_DEFAULT, level, "Printing level %d (%s).", + (int) level, log_level_str(level)); + log_msg(log_alpha, level, + "Printing level %d (%s) into alpha log.", + (int) level, log_level_str(level)); + log_msg(log_bravo, level, + "Printing level %d (%s) into bravo sub-log.", + (int) level, log_level_str(level)); + async_usleep(1000 * 100); + } + } + + return NULL; +} Index: uspace/app/tester/stdio/logger2.def =================================================================== --- uspace/app/tester/stdio/logger2.def (revision 9ab27144f671d13ed76e2e885acabcdcd64ce303) +++ uspace/app/tester/stdio/logger2.def (revision 9ab27144f671d13ed76e2e885acabcdcd64ce303) @@ -0,0 +1,6 @@ +{ + "logger2", + "Logger endless test", + &test_logger2, + false +}, Index: uspace/app/tester/tester.c =================================================================== --- uspace/app/tester/tester.c (revision 0d911ee88ccc7cd4c00535c1e496c7b387ca25ae) +++ uspace/app/tester/tester.c (revision 9ab27144f671d13ed76e2e885acabcdcd64ce303) @@ -39,4 +39,5 @@ #include #include +#include #include "tester.h" @@ -55,7 +56,11 @@ #include "stdio/stdio1.def" #include "stdio/stdio2.def" +#include "stdio/logger1.def" +#include "stdio/logger2.def" #include "fault/fault1.def" #include "fault/fault2.def" #include "fault/fault3.def" +#include "float/float1.def" +#include "float/softfloat1.def" #include "vfs/vfs1.def" #include "ipc/ping_pong.def" @@ -68,5 +73,5 @@ #include "hw/serial/serial1.def" #include "hw/misc/virtchar1.def" -#include "libext2/libext2_1.def" +#include "ext2/ext2_1.def" {NULL, NULL, NULL, false} }; @@ -138,4 +143,6 @@ } + log_init("tester"); + test_quiet = false; test_argc = argc - 2; Index: uspace/app/tester/tester.h =================================================================== --- uspace/app/tester/tester.h (revision 0d911ee88ccc7cd4c00535c1e496c7b387ca25ae) +++ uspace/app/tester/tester.h (revision 9ab27144f671d13ed76e2e885acabcdcd64ce303) @@ -88,7 +88,11 @@ extern const char *test_stdio1(void); extern const char *test_stdio2(void); +extern const char *test_logger1(void); +extern const char *test_logger2(void); extern const char *test_fault1(void); extern const char *test_fault2(void); extern const char *test_fault3(void); +extern const char *test_float1(void); +extern const char *test_softfloat1(void); extern const char *test_vfs1(void); extern const char *test_ping_pong(void); @@ -101,5 +105,5 @@ extern const char *test_serial1(void); extern const char *test_virtchar1(void); -extern const char *test_libext2_1(void); +extern const char *test_ext2_1(void); extern const char *test_devman1(void); extern const char *test_devman2(void); Index: uspace/app/vuhid/main.c =================================================================== --- uspace/app/vuhid/main.c (revision 0d911ee88ccc7cd4c00535c1e496c7b387ca25ae) +++ uspace/app/vuhid/main.c (revision 9ab27144f671d13ed76e2e885acabcdcd64ce303) @@ -155,5 +155,5 @@ int rc; - usb_log_enable(USB_LOG_LEVEL_DEBUG2, "vusbhid"); + log_init("vuhid"); fibril_mutex_initialize(&vuhid_data.iface_count_mutex);