Merge branch 'master' of ssh://router/data/git/fio
authorJens Axboe <axboe@nelson.home.kernel.dk>
Wed, 31 May 2006 08:16:18 +0000 (10:16 +0200)
committerJens Axboe <axboe@nelson.home.kernel.dk>
Wed, 31 May 2006 08:16:18 +0000 (10:16 +0200)
1  2 
fio-ini.c

diff --combined fio-ini.c
index ff121cba83e5e580db93bc632a0d947be34f8fe6,eeef3052ec08056ed1ae96829e603de39775bb1f..9b9262c9d8e0274528ce991190b01b365d86e523
+++ b/fio-ini.c
@@@ -50,7 -50,6 +50,7 @@@ int rate_quit = 0
  int write_lat_log = 0;
  int write_bw_log = 0;
  int exitall_on_terminate = 0;
 +unsigned long long mlock_size = 0;
  
  static int setup_rate(struct thread_data *td)
  {
@@@ -487,6 -486,9 +487,9 @@@ static int check_int(char *p, char *nam
  {
        char *str;
  
+       if (strncmp(p, name, strlen(name)))
+               return 1;
        str = strstr(p, name);
        if (!str)
                return 1;
@@@ -670,6 -672,7 +673,7 @@@ int parse_jobs_ini(char *file
                                continue;
                        if (strstr(p, "["))
                                break;
+                       strip_blank_front(&p);
                        strip_blank_end(p);
  
                        if (!check_int(p, "prio", &prio)) {
                                fgetpos(f, &off);
                                continue;
                        }
 +                      if (!check_strcnv(p, "lockmem", &mlock_size)) {
 +                              fgetpos(f, &off);
 +                              continue;
 +                      }
                        if (!check_strstore(p, "directory", td->directory)) {
                                fgetpos(f, &off);
                                continue;