Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 713ba400 in mainline


Ignore:
Timestamp:
2019-01-01T19:53:07Z (3 years ago)
Author:
Vojtech Horky <vojtech.horky@…>
Branches:
lfn, master
Children:
858469f
Parents:
32236e5
Message:

Refactoring in tester and perf

Use can_cast_size_t_to_int instead of the body of this function.

Also replaced "if" with assert() as the overflow (see diff) can rarely
happen and actually denotes a problem with the test itself (really,
test name longer than MAX_INT is insane).

Notice how the code from kernel was ported to userspace without changes
to the error text that would printed :-).

Location:
uspace/app
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • uspace/app/perf/perf.c

    r32236e5 r713ba400  
    3535 */
    3636
     37#include <assert.h>
    3738#include <stdio.h>
    3839#include <stddef.h>
     
    4243#include <errno.h>
    4344#include <perf.h>
     45#include <types/casting.h>
    4446#include "perf.h"
    4547#include "benchlist.h"
     
    226228        }
    227229
    228         unsigned int _len = (unsigned int) len;
    229         if ((_len != len) || (((int) _len) < 0)) {
    230                 printf("Command length overflow\n");
    231                 return;
    232         }
     230        assert(can_cast_size_t_to_int(len) && "benchmark name length overflow");
    233231
    234232        for (size_t i = 0; i < benchmark_count; i++)
    235                 printf("%-*s %s\n", _len, benchmarks[i]->name, benchmarks[i]->desc);
    236 
    237         printf("%-*s Run all benchmarks\n", _len, "*");
     233                printf("%-*s %s\n", (int) len, benchmarks[i]->name, benchmarks[i]->desc);
     234
     235        printf("%-*s Run all benchmarks\n", (int) len, "*");
    238236}
    239237
  • uspace/app/tester/tester.c

    r32236e5 r713ba400  
    3535 */
    3636
     37#include <assert.h>
    3738#include <stdio.h>
    3839#include <stddef.h>
     
    4041#include <str.h>
    4142#include <io/log.h>
     43#include <types/casting.h>
    4244#include "tester.h"
    4345
     
    144146        }
    145147
    146         unsigned int _len = (unsigned int) len;
    147         if ((_len != len) || (((int) _len) < 0)) {
    148                 printf("Command length overflow\n");
    149                 return;
    150         }
     148        assert(can_cast_size_t_to_int(len) && "test name length overflow");
    151149
    152150        for (test = tests; test->name != NULL; test++)
    153                 printf("%-*s %s%s\n", _len, test->name, test->desc,
     151                printf("%-*s %s%s\n", (int) len, test->name, test->desc,
    154152                    (test->safe ? "" : " (unsafe)"));
    155153
    156         printf("%-*s Run all safe tests\n", _len, "*");
     154        printf("%-*s Run all safe tests\n", (int) len, "*");
    157155}
    158156
Note: See TracChangeset for help on using the changeset viewer.