Skip to content

lpyleo/pintos

Folders and files

NameName
Last commit message
Last commit date

Latest commit

 

History

3 Commits
 
 
 
 
 
 

Repository files navigation

OS课程设计

Project 1 Shell

Add suport for cd and pwd

1.cd实现

对解析的cmdline参数分析,如果为“”或者“~”则使用getenv获取HOME路径作为目标路径,否则参数即位目标路径。调用chdir函数访问目标路径,若失败则输出相关内容,成功则通过getcwd获取当前路径并输出

int cmd_cd(struct tokens *tokens) {
  char *targ_dir = tokens_get_token(tokens, 1);
  if (targ_dir == NULL || strcmp(targ_dir, "~") == 0) {
    targ_dir = getenv("HOME");
    if (targ_dir == NULL) {
      printf("Error changing directory\n");
      return -1;
    }
  }
  int success = chdir(targ_dir);
  if (success == -1) {
    printf("Error changing directory\n");
  }
  char cwd[MAX_SIZE];
  if (getcwd(cwd, sizeof(cwd)) != NULL) {
        printf("%s\n", cwd);
    }
  return success;
}

2.pwd实现

通过getcwd获取当前路径并输出

int cmd_pwd(unused struct tokens *tokens) {
  char cur_dir[4096];
  if (getcwd(cur_dir, 4096) == NULL) {
    printf("Error printing current directory\n");
  }
  printf("%s\n", cur_dir);
  return 1;
}

Program execution

通过fork函数开启一个新线程来执行程序,对cmdline解析后的参数进行分析,如果存在>或者<则进行重定向,否则就向execv指定指令和参数进行执行。

int run_program(struct tokens *tokens) {
  int length = tokens_get_length(tokens);
  if (length == 0) {
    // user pressed return
    return 0;
  }
  int run_bg = length > 1 && strcmp(tokens_get_token(tokens, length - 1), "&") == 0;
  int pid = fork();
  int status = 0;
  if (pid == 0) {
    // process tokens into args array for exec, and redirect stdin/stdout
    char *args[length + 1];
    int redirect_stdin = 0, redirect_stdout = 0, num_args = 0;
    for (int i = 0; i < length; i++) {
      char *token = tokens_get_token(tokens, i);
      if (redirect_stdin) {
        int fd = open(token, O_RDONLY);
        if (redirect(fd, STDIN_FILENO) == -1) {
          printf("Error with input %s\n", token);
          exit(-1);
        }
        redirect_stdin = 0;
      } else if (redirect_stdout) {
        int fd = creat(token, S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH);
        if (redirect(fd, STDOUT_FILENO) == -1) {
          printf("Error with input %s\n", token);
          exit(-1);
        }
        redirect_stdout = 0;
      } else if (strcmp(token, "<") == 0) {
        redirect_stdin = 1;
      } else if (strcmp(token, ">") == 0) {
        redirect_stdout = 1;
      } else if (!(i == length - 1 && run_bg)) {
        args[num_args++] = token;
      }
    }
    args[num_args] = (char *) NULL;
    char *prog = args[0];

    // move process to own process group
    setpgid(0, 0);
    if (!run_bg) {
      // move to foreground if input doesn't end with "&"
      tcsetpgrp(shell_terminal, getpgrp());
    }

    // override ignored signal handlers from shell to default signal handlers
    for (int i = 0; i < sizeof(ignore_signals) / sizeof(int); i++) {
      signal(ignore_signals[i], SIG_DFL);
    }
    // execute new program in child process, searching thru path env var if needed
    if (execv(prog, args) == -1 && run_program_thru_path(prog, args) == -1) {
      printf("Error executing program %s\n", prog);
      exit(-1);
    }
  } else {
    int no_hang = run_bg ? WNOHANG : 0;
    waitpid(pid, &status, WUNTRACED|no_hang);
    tcsetpgrp(shell_terminal, shell_pgid);
  }
  return status;
}

Path resolution

对于需要环境变量的命令,在执行run_program时通过run_program_thru_path执行命令,函数内通过getenv获取PATH环境变量地址,通过遍历尝试是否存在此命令,存在则通过execv指定命令地址和参数运行。

int run_program_thru_path(char *prog, char *args[]) {
  char *PATH = getenv("PATH");
  if (PATH == NULL) {
    return -1;
  }
  char prog_path[4096];
  char *path_dir = strtok(PATH, ":");
  while (path_dir != NULL) {
    sprintf(prog_path, "%s/%s", path_dir, prog);
    if (access(prog_path, F_OK) != -1) {
      return execv(prog_path, args);
    }
    path_dir = strtok(NULL, ":");
  }
  return -1;
}

Input/Output Redirection

run_program函数中对cmdline的参数遍历,查询是否存在>或者<符号,存在则进行重定向。

int redirect_stdin = 0, redirect_stdout = 0, num_args = 0;
    for (int i = 0; i < length; i++) {
      char *token = tokens_get_token(tokens, i);
      if (redirect_stdin) {
        int fd = open(token, O_RDONLY);
        if (redirect(fd, STDIN_FILENO) == -1) {
          printf("Error with input %s\n", token);
          exit(-1);
        }
        redirect_stdin = 0;
      } else if (redirect_stdout) {
        int fd = creat(token, S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH);
        if (redirect(fd, STDOUT_FILENO) == -1) {
          printf("Error with input %s\n", token);
          exit(-1);
        }
        redirect_stdout = 0;
      } else if (strcmp(token, "<") == 0) {
        redirect_stdin = 1;
      } else if (strcmp(token, ">") == 0) {
        redirect_stdout = 1;
      } else if (!(i == length - 1 && run_bg)) {
        args[num_args++] = token;
      }
    }

redirect函数中通过调用dup2实现重定向功能

int redirect(int old_fd, int new_fd) {
  if (old_fd == -1 || dup2(old_fd, new_fd) == -1 || close(old_fd) == -1) {
    return -1;
  }
  return 1;
}

Signal Handling and Terminal Control

使用signal函数对信号量进行控制,在初始化Shell时忽略信号量

/* Intialization procedures for this shell */
void init_shell() {
  /* Our shell is connected to standard input. */
  shell_terminal = STDIN_FILENO;

  /* Check if we are running interactively */
  shell_is_interactive = isatty(shell_terminal);

  if (shell_is_interactive) {
    /* If the shell is not currently in the foreground, we must pause the shell until it becomes a
     * foreground process. We use SIGTTIN to pause the shell. When the shell gets moved to the
     * foreground, we'll receive a SIGCONT. */
    while (tcgetpgrp(shell_terminal) != (shell_pgid = getpgrp()))
      kill(-shell_pgid, SIGTTIN);

    /* Saves the shell's process id */
    shell_pgid = getpid();

    /* Take control of the terminal */
    tcsetpgrp(shell_terminal, shell_pgid);

    /* Save the current termios to a variable, so it can be restored later. */
    tcgetattr(shell_terminal, &shell_tmodes);
  }
  //忽略信号(SIG_IGN):忽略信号,即使没有意义,代码执行仍将继续。
  for (int i = 0; i < sizeof(ignore_signals) / sizeof(int); i++) {
    signal(ignore_signals[i], SIG_IGN);
  }
}

在使用run_program调用fork创建新的线程时,在新线程内打开信号量默认处理方式

int run_program(struct tokens *tokens) {
  int length = tokens_get_length(tokens);
  if (length == 0) {
    // user pressed return
    return 0;
  }
  int run_bg = length > 1 && strcmp(tokens_get_token(tokens, length - 1), "&") == 0;
  int pid = fork();
  int status = 0;
  if (pid == 0) {
    ···
    for (int i = 0; i < sizeof(ignore_signals) / sizeof(int); i++) {
      signal(ignore_signals[i], SIG_DFL);
    }
    ···
  } else {
    int no_hang = run_bg ? WNOHANG : 0;
    waitpid(pid, &status, WUNTRACED|no_hang);
    tcsetpgrp(shell_terminal, shell_pgid);
  }
  return status;
}

Background processing

使用系统调用wait函数一般用在父进程中等待回收子进程的资源,而防止僵尸进程的产生。

int cmd_wait(unused struct tokens *tokens) {
  int status, pid;
  while ((pid = wait(&status))) {
    if (pid == -1) {
      break;
    }
  }
  return 1;
}

Project 2 THREADS

一. 设计概览

pintos 的第一个项目是实现线程,主要实现了以下部分:

  • 修改 timer_sleep 函数,设置thread阻塞时间。
  • 实现优先级调度,完成抢占机制功能和优先级捐赠功能。
  • 实现多级反馈调度,更新线程的优先级。

二. 设计细节

1. Timer_sleep

基本思想:

设置阻塞时间,阻塞线程

结构设计:

struct thread
{
    ···
    int64_t blocking_ticks;                /* Ticks that the thread to block. */
    ···
}; 
static void thread_blocking_ticks_handler(struct thread *t, void *args UNUSED);
  1. thread 类中添加成员变量 blocking_ticks 来记录线程的剩余阻塞时间。
  2. 增加 thread_blocking_ticks_handler 函数用来更新 blocking_ticks

算法设计: 调用 timer_sleep 函数时设置阻塞时间把线程阻塞, 在系统自身的timer_interrupt函数中加入对线程状态的检测函数thread_timer

void timer_sleep(int64_t ticks)
{
  if (ticks <= 0)
  {
    return;
  }
  ASSERT(intr_get_level() == INTR_ON);
  enum intr_level old_level = intr_disable();
  struct thread *current_thread = thread_current();
  current_thread->blocking_ticks = ticks;
  thread_block();
  intr_set_level(old_level);
}
static void
timer_interrupt(struct intr_frame *args UNUSED)
{
  ticks++;
  enum intr_level old_level = intr_disable();
  thread_timer(timer_ticks() % TIMER_FREQ == 0);
  intr_set_level(old_level);
  thread_tick ();
}

每次检测时通过thread_foreach调用 thread_blocking_ticks_handler 函数更新所有线程的blocking_ticks,若 blocking_ticks 为零则唤醒这个线程。

void
thread_timer(bool full_second){
  if (thread_mlfqs){
    thread_add_recent_cpu();
    if (full_second){
      thread_update_load_avg();
      thread_foreach(thread_update_recent_cpu, NULL);
      thread_foreach(thread_update_priority, NULL);
      thread_ready_list_sort();
    }
  }
  thread_foreach(thread_blocking_ticks_handler, NULL);
}

2. Priority

1)Preemption

基本思想: 维护就绪队列为一个优先级队列**,**且正在运行的进程的优先级是最高的。

结构设计:

bool thread_priority_cmp (const struct list_elem *a_, const struct list_elem *b_,
                           void *aux UNUSED);
void thread_insert_ready_list (struct list_elem *elem);
  1. 增加thread_priority_cmp函数比较优先级大小
  2. 增加thread_insert_ready_list插入线程到就绪队列

算法设计:

通过获取thread结构体下的priority变量进行比较

bool
thread_priority_cmp (const struct list_elem *a_, const struct list_elem *b_,
                      void *aux UNUSED)
{
  const struct thread *a = list_entry (a_, struct thread, elem);
  const struct thread *b = list_entry (b_, struct thread, elem);

  return thread_get_certain_priority (a) > thread_get_certain_priority (b);
}

使用list的list_instert_ordered函数有序插入线程,通过thread_priority_cmp函数比较线程优先级。

void
thread_insert_ready_list (struct list_elem *elem)
{
  if (!list_empty (&ready_list))
    list_insert_ordered (&ready_list, elem, thread_priority_cmp, NULL);
  else
    list_push_back (&ready_list, elem);
}

考虑一个进程在以下两种情况下进入就绪队列:

  1. thread_unblock

    void
    thread_unblock (struct thread *t)
    {
      enum intr_level old_level;
    
      ASSERT (is_thread (t));
    
      old_level = intr_disable ();
      ASSERT (t->status == THREAD_BLOCKED);
      thread_insert_ready_list (&t->elem);
      t->status = THREAD_READY;
      intr_set_level (old_level);
    }
  2. thread_yield

    void
    thread_yield (void)
    {
      struct thread *cur = thread_current ();
      enum intr_level old_level;
    
      ASSERT (!intr_context ());
    
      old_level = intr_disable ();
      if (cur != idle_thread)
        thread_insert_ready_list (&cur->elem);
      cur->status = THREAD_READY;
      schedule ();
      intr_set_level (old_level);
    }
    

因此在这两个函数内使用thread_insert_ready_list

2)Donation

基本思想: 当高优先级的线程因为低优先级线程占用资源而阻塞时,就将低优先级线程的优先级提升到等待它所占有资源的最高优先级线程的优先级。

结构设计:

struct lock
  {
    struct thread *holder;      /* Thread holding lock (for debugging). */
    struct semaphore semaphore; /* Binary semaphore controlling access. */
    int max_donate;             /* Max donation. */
    struct list donaters;       /* Donater list. */
    struct list_elem elem;      /* List element for lock list. */
  };
struct thread
{
    ···
    struct list lock_list;              /* Locks owned by this thread. */
    int priority_to_set;                /* Priority to be set. */
    int max_donate;                     /* Max Donation. */
    struct thread *father;              /* Thread who locks this thread. */
    struct list_elem donate_elem;       /* List element for donation list of locks. */
    ···
};
  1. look类内增加整型max_donate记录最大捐赠的优先级,链表donaters,elem记录捐赠队列和等待队列。
  2. thread 类加入lock_list队列记录获得的锁,priority_to_set整型记录临时优先级,整型max_donate记录最大捐赠的优先级,father指针记录当前占用lock的线程,donate_elem记录捐赠队列
  3. 重写 lock_acquire, lock_release 函数修改最大捐赠值,并修改优先级。
  4. 增加 thread_update_priority 函数更新优先级。

算法设计:

  1. 在一个线程申请获取一个锁的时候, 如果拥有这个锁的线程优先级比自己低就提高它的优先级,使用father指针记录当前占有锁的线程,通过list_push_back函数把新线程放入捐赠队列中,并且如果这个锁还被别的锁锁着, 将会递归地捐赠优先级即调用notify_father函数,。

    void
    lock_acquire (struct lock *lock)
    {
      ASSERT (lock != NULL);
      ASSERT (!intr_context ());
      ASSERT (!lock_held_by_current_thread (lock));
    
      /* The lock has been locked, so deal with the waiting relation and donation stuff. */
      if (lock->holder != NULL && thread_get_priority () > lock->holder->priority)
        {
          int delta = thread_get_priority () - lock->holder->priority;
          struct thread *t = thread_current ();
          t->father = lock->holder;
    
          list_push_back (&lock->donaters, &t->donate_elem);
    
          if (delta > lock->max_donate)
            {
              lock->max_donate = delta;
            }
    
          if (delta > lock->holder->max_donate)
            {
              lock->holder->max_donate = delta;
              notify_father (lock->holder);
            }
    
        }
    
      sema_down (&lock->semaphore);
      lock->holder = thread_current ();
    
      /* Got the new lock successfully. Initialize it. */
      list_push_back (&lock->holder->lock_list, &lock->elem);
    }
  2. 使用迭代法遍历,如果不存在father则停止,否则就判断当前线程被捐赠的最大优先级是否小于等待队列中的优先级,若持有锁的线程优先级低,则把等待队列中最高优先级的优先级捐赠给持有锁的当前线程。

    void
    notify_father (struct thread *t)
    {
      if (t == NULL)
        return;
      struct thread *father = t->father;
      if (father == NULL)
        return;
      int old_donate = father->max_donate;
    
      struct list_elem *el, *ed;
      struct lock *l;
      struct thread *tmp;
      for (el = list_begin (&father->lock_list); el != list_end (&father->lock_list); el = list_next (el))
        {
          l = list_entry (el, struct lock, elem);
          for (ed = list_begin (&l->donaters); ed != list_end (&l->donaters); ed = list_next (ed))
            {
              tmp = list_entry (ed, struct thread, donate_elem);
              if (tmp->priority + tmp->max_donate - father->priority > l->max_donate)
                l->max_donate = tmp->priority + tmp->max_donate - father->priority;
            }
          if (l->max_donate > father->max_donate)
            father->max_donate = l->max_donate;
        }
      if (father->max_donate != old_donate)
        notify_father (father);
    }
    
  3. 遍历捐赠队列,使其father均指向NULL,并清空此队列。在释放锁对一个锁优先级有改变的时候应考虑其余被捐赠优先级和当前优先级。为保证优先队列在释放资源后调用thread_revolt来激活线程。

    void
    lock_release (struct lock *lock)
    {
      ASSERT (lock != NULL);
      ASSERT (lock_held_by_current_thread (lock));
    
      struct thread *t = lock->holder;
    
      /* Cut down the donation. */
      struct list_elem *e;
      for (e = list_begin (&lock->donaters); e != list_end (&lock->donaters); e = list_next (e))
        {
          struct thread *son = list_entry (e, struct thread, donate_elem);
          son->father = NULL;
        }
      while (!list_empty (&lock->donaters))
        list_pop_front (&lock->donaters);
      list_remove (&lock->elem);
    
      lock->max_donate = 0;
      lock->holder = NULL;
      sema_up (&lock->semaphore);
    
      /* Update the lock holder's donation information and notify its father if necessary. */
      int old_donate = t->max_donate;
      t->max_donate = 0;
      for (e = list_begin (&t->lock_list); e != list_end (&t->lock_list); e = list_next (e))
        {
          struct lock *l = list_entry (e, struct lock, elem);
          if (l->max_donate > t->max_donate)
            t->max_donate = l->max_donate;
        }
      if (t->max_donate != old_donate)
        {
          notify_father (t);
        }
    
      if (t->max_donate == 0 && t->priority_to_set > -1)
        {
          t->priority = t->priority_to_set;
          t->priority_to_set = -1;
        }
      thread_revolt ();
    }

    4.为保证优先级队列,比较当前线程和就绪队列第一个线程的优先级大小,如果当前执行优先级低则调用thread_yield让步。

    void
    thread_revolt (void)
    {
      if (thread_current () != idle_thread &&
          !list_empty (&ready_list) &&
          thread_get_priority () <
          thread_get_certain_priority (
                  list_entry (list_begin (&ready_list), struct thread, elem)))
      {
        thread_yield ();
      }
    }

3 BSD Scheduler

基本思想: 维护了64个队列, 每个队列对应一个优先级, 从PRI_MIN到PRI_MAX。每隔一定时间,通过一些公式计算来计算出线程当前的优先级, 系统调度的时候会从高优先级队列开始选择线程执行, 这里线程的优先级随着操作系统的运转数据而动态改变。

结构设计:

struct thread
{
    ···
    int nice;                           /* The nice level of thread, the higher the lower priority */
    fixed_point_t recent_cpu; /* Thread recent cpu usage */
    ···
};
int thread_get_nice (void);
void thread_set_nice (int);
int thread_get_recent_cpu (void);
int thread_get_load_avg (void);
static void thread_update_load_avg(void);
static void thread_update_recent_cpu(struct thread*, void*);
void thread_add_recent_cpu(void);

算法设计: 根据http://web.stanford.edu/class/cs140/projects/pintos/pintos_7.html#SEC131提供的BSD调度算法实现更新

priority = PRI_MAX - (recent_cpu / 4) - (nice * 2)

recent_cpu = (2load_avg)/(2load_avg + 1) * recent_cpu + nice

load_avg = (59/60)*load_avg + (1/60)*ready_threads.

  1. 使用浮点类fixed-point.h,用于计算优先级。

  2. 通过nicerecent_cpu计算load_avgpriority

  3. 增加thread_set_nice,thread_get_nice获取和设置nice值

    int
    thread_get_nice (void)
    {
      struct thread *cur = thread_current();
      return cur->nice;
    }
    
    void
    thread_set_nice (int nice)
    {
      thread_current()->nice = nice;
      if(thread_mlfqs){
        thread_update_priority(thread_current(), NULL);
      }
    
    }
    
  4. 增加thread_get_recent_cpu ()thread_get_load_avg ()获取recent_cpu,load_avg值

    /* Returns 100 times the current thread's recent_cpu value. */
    int
    thread_get_recent_cpu (void)
    {
      ASSERT(thread_mlfqs);
      return fix_round(fix_scale(thread_current()->recent_cpu, 100));
      
    }
    
    
    /* Returns 100 times the system load average. */
    int
    thread_get_load_avg (void)
    {
      ASSERT(thread_mlfqs);
      return fix_round(fix_scale(load_avg, 100));
    }
  5. 在每一次时间中断时,thread_timer先是通过``thread_add_recent_cpu()函数更新recent_cpt`,之后再通过调用`thread_foreach`函数遍历所有线程执行以下`thread_update_load_avg()`, `thread_update_recent_cpu()`, `thread_update_priority`函数更新计算`recent_cpu`,`load_avg`,`priority`

    /* Add recent_cpu of the running thread by 1 per second */
    void thread_add_recent_cpu(void)
    {
      ASSERT(thread_mlfqs);
      struct thread* cur = thread_current();
      if (cur != idle_thread)
        cur->recent_cpu = fix_add(cur->recent_cpu, fix_int(1));
      thread_update_priority(thread_current(), NULL);
    }
    /* Update load_avg
     * load_avg = 59/60 * load_avg + 1/60 * ready_threads
     * */
    static void
    thread_update_load_avg(void)
    {
    
      ASSERT(thread_mlfqs);
      int ready_threads = 0;
      struct list_elem *e;
      for (e = list_begin (&all_list); e != list_end (&all_list);
           e = list_next (e))
      {
        struct thread *t = list_entry (e, struct thread, allelem);
        if ((t->status == THREAD_RUNNING || t->status == THREAD_READY) && t != idle_thread)
          ready_threads++;
      }
      load_avg = fix_add(fix_unscale(fix_scale(load_avg, 59), 60), fix_unscale(fix_int(ready_threads), 60));
    }
    
    /* Update recent_cpu
     * recent_cpu = recent_cpu * (load_avg * 2 / (load_avg * 2 + 1)) + nice
     * Nice is thread's nice value
     * */
    static void
    thread_update_recent_cpu(struct thread *t, void* aux UNUSED)
    {
      ASSERT(thread_mlfqs);
      int load_avg2 = thread_get_load_avg() * 2;
       t->recent_cpu = fix_add(fix_mul(fix_div(fix_scale(load_avg, 2), fix_add(fix_scale(load_avg, 2), fix_int(1))),t->recent_cpu), fix_int(t->nice));
    }
    
    /* Returns 100 times the current thread's recent_cpu value. */
    int
    thread_get_recent_cpu (void)
    {
      ASSERT(thread_mlfqs);
      return fix_round(fix_scale(thread_current()->recent_cpu, 100));
      
    }
    static void
    thread_update_priority(struct thread* t, void *args UNUSED){
      if(t == idle_thread)
        return;
      int recent_cpu_div4 = fix_trunc(fix_unscale(t->recent_cpu, 4));
      t->priority =  PRI_MAX - recent_cpu_div4 - t->nice * 2;
    }
  6. 由于增加了调度算法,所以需要增加thread_get_certain_priority判断调度算法,返回当前优先级

    /* Returns the certain thread's priority. */
    int
    thread_get_certain_priority (const struct thread *t)
    {
      return t->priority + (thread_mlfqs ? 0 : t->max_donate) ;
    }

Project 3 USERPROG

一. 设计概览

pintos 的第二个项目是实现用户程序,主要实现了以下部分:

  • 读取cmdline,并执行对应的应用程序(包含传参)
  • 通过syscall处理用户的进程控制操作, 例如终止当前进程 建立新的进程等
  • 通过syscall处理用户的文件操作,例如新建文件 删除文件 读写文件等
  • bonus 部分 (禁止写入正在执行的可执行文件)

二. 设计细节

1. Process Termination Messages

基本思想:

设置变量记录返回值,并在process_eixt时输出

结构设计:

struct thread
{
    ···
    int return_value;     /* Return value of the thread (anyway, nobody cares)*/
    ···
}; 
  1. thread 类中添加成员变量 return_value 来记录结束返回值0或-1,表示是否为正常结束。
  2. 增加 thread_exit_with_return_value 函数来设置返回值。

算法设计: 在线程退出时通过判断是否存在异常,使用thread_exit_with_return_value来改变返回值并退出线程。

/* Terminate thread with a return value FINAL_VALUE */
void
thread_exit_with_return_value(struct intr_frame *f, int return_value) {
  struct thread *cur = thread_current();
  cur->return_value = return_value;
  f->eax = (uint32_t)return_value;
  thread_exit();
}

2. Argument Passing

基本思想:

传递参数主要分为两步,第一步是分离参数,第二步是把参数告诉要执行的程序。 使用strtok_r函数可以完成实现command line中参数的切割,将一整行命令切成可执行文件名和参数。参数分离完成之后,采用栈来使得用户程序能够读取到这些参数。

算法设计:

以命令/bin/ls -l foo bar为例, 参数在栈中的位置如下所示:

Address         Name                Data            Type
0xbffffffc      argv[3][...]        bar             char[4]
0xbffffff8      argv[2][...]        foo             char[4]
0xbffffff5      argv[1][...]        -l              char[3]
0xbfffffed      argv[0][...]        /bin/ls         char[8]
0xbfffffec      word-align          0               uint8_t
0xbfffffe8      argv[4]             0               char *
0xbfffffe4      argv[3]             0xbffffffc      char *
0xbfffffe0      argv[2]             0xbffffff8      char *
0xbfffffdc      argv[1]             0xbffffff5      char *
0xbfffffd8      argv[0]             0xbfffffed      char *
0xbfffffd4      argv                0xbfffffd8      char **
0xbfffffd0      argc                4               int
0xbfffffcc      return address      0               void (*) ()

只需要将分离出来的参数按照 从右到左、data-align-pointer-argv-argc-return_addr 的顺序压入栈中,程序就可以正确地读取到参数

1.在process_execute中对file_name_使用strtok_r进行切割划分出第一个值,作为为thread_name,在创建线程时使用。

tid_t
process_execute (const char *file_name_)
{
  /* Pudding by Chen Started */
  char *file_name;
  char *fn_copy;
  tid_t tid;

  /* Make a copy of FILE_NAME.
     Otherwise there's a race between the caller and load(). */
  file_name = palloc_get_page(0);
  strlcpy (file_name, file_name_, PGSIZE);
  /* Pudding by Chen Ended */

  fn_copy = palloc_get_page (0);
  if (fn_copy == NULL)
    return TID_ERROR;
  strlcpy (fn_copy, file_name, PGSIZE);


  char *thread_name, *save_ptr;
  thread_name = strtok_r (file_name, " ", &save_ptr);

  /* Create a new thread to execute FILE_NAME. */
  tid = thread_create (thread_name, PRI_DEFAULT, start_process, fn_copy);
  if (tid == TID_ERROR)
    palloc_free_page (fn_copy);
  palloc_free_page(file_name); /* this is part of pudding */

  list_push_back (&thread_current ()->child_list,
                  &thread_get_child_message (tid)->elem);


  return tid;
}

2.在start_process中通过load函数给esp赋值分配空间。获取esp堆栈指针后将cmd逐步切割获取所有参数放入用户栈,临时变量args数组存储参数地址,并使用top整型记录参数个数存入argc。由于需要加入双字的对齐,根据原始esp指针位置和当前位置继续减小栈指针位置使其为4的倍数。先放入0到用户栈后,逆序放入args内的指针以及top变量值,最后放入0作为return address。把esp指针赋值给if_.esp以此完成参数的切割并入栈

/* A thread function that loads a user process and starts it
   running. */
static void
start_process (void *file_name_)
{
  char *file_name = file_name_;
  struct intr_frame if_;
  bool success;


  char *text, *save_ptr;
  text = strtok_r (file_name, " ", &save_ptr);

  /* Initialize interrupt frame and load executable. */
  memset (&if_, 0, sizeof if_);
  if_.gs = if_.fs = if_.es = if_.ds = if_.ss = SEL_UDSEG;
  if_.cs = SEL_UCSEG;
  if_.eflags = FLAG_IF | FLAG_MBS;
  success = load (text, &if_.eip, &if_.esp);

  if (success)
  {

#define MAX_ARGC 32
    char *esp = if_.esp;
    char *args[MAX_ARGC], *arg;   /* Args is a stack.  */
    int top = 0;

    for (arg = text; arg != NULL; arg = strtok_r (NULL, " ", &save_ptr))
    {
      int l = strlen (arg);
      esp -= l + 1;
      strlcpy (esp, arg, l + 1);
      args[top] = esp, top++;
    }

    while (((char *) if_.esp - esp) % 4 != 0) esp--;
    esp -= 4;
    *((int *) esp) = 0;  /* alignment */

    int argc = top;
    while (top > 0)
    {
      esp -= 4;
      --top, *((char **) esp) = args[top];
    }
    char **argv = (char **) esp;

    esp -= 4;
    *((char ***) esp) = argv;
    esp -= 4;
    *((int *) esp) = argc;
    esp -= 4;
    *((int *) esp) = 0;

    if_.esp = esp;
#undef MAX_ARGC

  }
  /* If load failed, quit. */
  palloc_free_page (file_name);
  if (!success)
  {
    thread_current ()->message_to_grandpa->load_failed = true;
    thread_current ()->message_to_grandpa->return_value = -1;
    thread_current ()->return_value = -1;
  }
  sema_up (thread_current ()->message_to_grandpa->sema_started);
  if (!success)
    thread_exit ();


  /* Start the user process by simulating a return from an
     interrupt, implemented by intr_exit (in
     threads/intr-stubs.S).  Because intr_exit takes all of its
     arguments on the stack in the form of a `struct intr_frame',
     we just point the stack pointer (%esp) to our stack frame
     and jump to it. */
  asm volatile ("movl %0, %%esp; jmp intr_exit" : : "g" (&if_) : "memory");
  NOT_REACHED ();
}

3. System call

基本思想:

用户程序有时候需要“借用”内核的权限,来进行一些比较底层的操作,比如执行一个新的程序、读写I\O等等。Syscall 提供了一个给用户程序内核权限的接口,并且要进行严格的检查以保证用户程序的所有操作都是合法的。

结构设计:

static struct lock filesys_lock;

定义filesys_lock变量为文件添加锁预防读写冲突。

struct child_message
{
    struct thread *tchild;              /* Thread pointer to the child. */
    tid_t tid;                          /* Thread ID. */
    bool exited;                        /* If syscall exit() is called. */
    bool terminated;                    /* If the child finishes running. */
    bool load_failed;                   /* If the child has a load fail. */
    int return_value;                   /* Return value. */
    struct semaphore *sema_finished;    /* Semaphore to finish. */
    struct semaphore *sema_started;     /* Semaphore to finish loading. */
    struct list_elem elem;              /* List element for grandpa's child list. */
    struct list_elem allelem;           /* List element for global child list. */
};

定义child_message结构体记录子进程的相关信息,方便父进程对其的控制。

struct file_handle{
    int fd;
    struct file* opened_file;
    struct thread* owned_thread;
    /* Implementation by ymt Started */
#ifdef FILESYS
    struct dir* opened_dir;
#endif
    /* Implementation by ymt Ended */
    struct list_elem elem;
};

定义file_handle结构体,作为文件句柄,在文件操作是记录打开的文件。

在pintos中,一共涉及到了16个syscall操作,如下所示:

static void syscall_halt(struct intr_frame *f);
static void syscall_exit(struct intr_frame *f, int return_value);
static void syscall_exec(struct intr_frame *f, const char *cmd_line);
static void syscall_wait(struct intr_frame *f, pid_t pid);
static void syscall_open(struct intr_frame *f, const char *name);
static void syscall_create(struct intr_frame *f, const char *name, unsigned initial_size);
static void syscall_remove(struct intr_frame *f, const char *name);
static void syscall_filesize(struct intr_frame *f, int fd);
static void syscall_read(struct intr_frame *f, int fd, const void *buffer, unsigned size);
static void syscall_write(struct intr_frame *f, int fd, const void *buffer, unsigned size);
static void syscall_seek(struct intr_frame *f, int fd, unsigned position);
static void syscall_tell(struct intr_frame *f, int fd);
static void syscall_close(struct intr_frame *f, int fd);

bool syscall_translate_vaddr(const void *vaddr, bool write);
bool syscall_check_user_string(const char *str);
bool syscall_check_user_buffer (const char *str, int size, bool write); 

算法设计:

1.syscall_translate_vaddr:判断用户占指针是否为空或错误,若是则结束执行,不是则把指针给内核

/* Transfer user Vaddr to kernel vaddr
 * Return NULL if user Vaddr is invalid
 * */
bool
syscall_translate_vaddr(const void *vaddr, bool write){
  if (vaddr == NULL || !is_user_vaddr(vaddr))
    return false;
  ASSERT(vaddr != NULL);
  return pagedir_get_page(thread_current()->pagedir, vaddr) != NULL;

}

2.syscall_check_user_string:判断cmd字符串是否过长

bool
syscall_check_user_string(const char *ustr){
  if (!syscall_translate_vaddr(ustr, false))
    return false;
  int cnt = 0;
  while(*ustr != '\0'){
    if(cnt == 4095){
      puts("String to long, please make sure it is no longer than 4096 Bytes!\n");
      return false;
    }
    cnt++;
    ustr++;
    if (((int)ustr & PGMASK) == 0){
      if (!syscall_translate_vaddr(ustr, false))
        return false;
    }
  }
  return true;
}

3.syscall_check_user_buffer:判断缓冲是否溢出

bool
syscall_check_user_buffer(const char* ustr, int size, bool write){
  if (!syscall_translate_vaddr(ustr + size - 1, write))
    return false;

  size >>= 12;
  do{
    if (!syscall_translate_vaddr(ustr, write))
      return false;
    ustr += 1 << 12;
  }while(size--);
  return true;
}

4.syscall_write :指定输出对象和内容,获取文件操作资源的lock通过调用文件系统中得file_write完成写文件操作

static void
syscall_write(struct intr_frame *f, int fd, const void* buffer, unsigned size){
  if (!syscall_check_user_buffer(buffer, size, false))
    thread_exit_with_return_value(f, -1);

  if (fd == STDIN_FILENO)
    thread_exit_with_return_value(f, -1);

  if (fd == STDOUT_FILENO)
    putbuf(buffer, size);
  else{
    struct file_handle* t = syscall_get_file_handle(fd);
    if (t != NULL && !inode_isdir(file_get_inode(t->opened_file))){
      lock_acquire(&filesys_lock);
      f->eax = (uint32_t)file_write(t->opened_file, (void*)buffer, size);
      lock_release(&filesys_lock);
    }
    else
      thread_exit_with_return_value(f, -1);
  }
}

5.syscall_exit :结束当前的进程,如果是子进程,则将自身的返回值和状态告诉父进程,并设置返回值。调用thread_exit让线程结束

static void
syscall_exit(struct intr_frame *f, const int return_value){


  struct thread *cur = thread_current ();
  if (!cur->grandpa_died)
  {
    cur->message_to_grandpa->exited = true;
    cur->message_to_grandpa->return_value = return_value;
  }


  thread_exit_with_return_value(f, return_value);
}

6.syscall_create :指定要创建的文件名和初始大小,获取文件操作资源的lock后调用 filesys_create 函数创建文件

static void
syscall_create(struct intr_frame *f, const char * name, unsigned initial_size){
  if (!syscall_check_user_string(name))
    thread_exit_with_return_value(f, -1);

  lock_acquire(&filesys_lock);
  f->eax = (uint32_t)filesys_create(name, initial_size);
  lock_release(&filesys_lock);
}

7.syscall_open :指定文件名,获取文件操作资源的lock后调用filesys_open打开某个文件。此处需要一个list记录开过的文件

static void
syscall_open(struct intr_frame *f, const char* name){
  if (!syscall_check_user_string(name))
    thread_exit_with_return_value(f, -1);
  lock_acquire(&filesys_lock);
  struct file* tmp_file = filesys_open(name);
  lock_release(&filesys_lock);
  if (tmp_file == NULL){
    f->eax = (uint32_t)-1;
    return;
  }
}

8.syscall_close :指定文件名,获取文件操作资源的lock后调用filesys_close关闭某个文件, 并且需要在已打开的文件list中移除这个文件句柄

static void
syscall_close(struct intr_frame *f, int fd){
  struct file_handle* t = syscall_get_file_handle(fd);
  if(t != NULL){
    lock_acquire(&filesys_lock);

#ifdef FILESYS
    if (inode_isdir(file_get_inode(t->opened_file)))
      dir_close(t->opened_dir);
#endif
    file_close(t->opened_file);
    lock_release(&filesys_lock);
    list_remove(&t->elem);
    free(t);
  }
  else
    thread_exit_with_return_value(f, -1);
}

9.syscall_read :指定缓冲大小读取输入源中相应大小的内容,获取文件操作资源的lock后调用file_read读取内容

static void
syscall_read(struct intr_frame *f, int fd, const void* buffer, unsigned size){
  if (!syscall_check_user_buffer(buffer, size, true))
    thread_exit_with_return_value(f, -1);

  if (fd == STDOUT_FILENO)
    thread_exit_with_return_value(f, -1);

  uint8_t * str = buffer;
  if (fd == STDIN_FILENO){
    while(size-- != 0)
      *(char *)str++ = input_getc();
  }
  else{
    struct file_handle* t = syscall_get_file_handle(fd);
    if (t != NULL && !inode_isdir(file_get_inode(t->opened_file))){
      lock_acquire(&filesys_lock);
      f->eax = (uint32_t)file_read(t->opened_file, (void*)buffer, size);
      lock_release(&filesys_lock);
    }
    else
      thread_exit_with_return_value(f, -1);
  }
}

10.syscall_filesize :指定文件句柄,获取文件操作资源的lock后调用filesys_length获得文件的大小

static void
syscall_filesize(struct intr_frame *f, int fd){
  struct file_handle* t = syscall_get_file_handle(fd);
  if(t != NULL){
    lock_acquire(&filesys_lock);
    f->eax = (uint32_t)file_length(t->opened_file);
    lock_release(&filesys_lock);
  }

  else
    thread_exit_with_return_value(f, -1);
}

11.syscall_exec :指定cmd内容,获取文件操作资源的lock后调用process_execute实现。但是由于孩子与父亲之间需要进行充分的信息交流,所以借助信号量来保持孩子与父亲之间的同步问题,确保进程之间的正确调度

static void
syscall_exec (struct intr_frame *f, const char *cmd_line)
{
  if (!syscall_check_user_string(cmd_line))
    thread_exit_with_return_value(f, -1);
  lock_acquire(&filesys_lock);
  f->eax = (uint32_t)process_execute (cmd_line);
  lock_release(&filesys_lock);
  struct list_elem *e;
  struct thread *cur = thread_current ();
  struct child_message *l;
  for (e = list_begin (&cur->child_list); e != list_end (&cur->child_list); e = list_next (e))
  {
    l = list_entry (e, struct child_message, elem);
    if (l->tid == f->eax)
    {
      sema_down (l->sema_started);
      if (l->load_failed)
        f->eax = (uint32_t)-1;
      return;
    }
  }
}

12.syscall_wait:调用 process_wait 函数等子进程执行结束,process_wait 中,父进程会先判断子进程是否已返回,如果子进程已返回,父进程就会直接将该进程从它的子进程列表中移除。子进程若未返回,则父进程就会在子进程信号量上等待,直到子进程返回为止

static void
syscall_wait (struct intr_frame *f, pid_t pid)
{
  f->eax = (uint32_t)process_wait (pid);
}

13.syscall_seek :指定位置,获取文件操作资源的lock后调用 file_seek 将文件指针跳转到文件中的指定位置

static void
syscall_seek(struct intr_frame *f, int fd, unsigned position){
  struct file_handle* t = syscall_get_file_handle(fd);
  if (t != NULL){
    lock_acquire(&filesys_lock);
    file_seek(t->opened_file, position);
    lock_release(&filesys_lock);
  }

  else
    thread_exit_with_return_value(f, -1);
}

14.syscall_remove :指定文件名,获取文件操作资源的lock后调用 filesys_remove 删除文件

static void
syscall_remove(struct intr_frame *f, const char* name){
  if (!syscall_check_user_string(name))
    thread_exit_with_return_value(f, -1);
  lock_acquire(&filesys_lock);
  f->eax = (uint32_t)filesys_remove(name);
  lock_release(&filesys_lock);
}

15.syscall_tell :指定句柄,获取文件操作资源的lock后调用 file_tell获取文件指针当前所在文件中的位置

static void
syscall_tell(struct intr_frame *f, int fd){
  struct file_handle* t = syscall_get_file_handle(fd);
  if (t != NULL && !inode_isdir(file_get_inode(t->opened_file))){
    lock_acquire(&filesys_lock);
    f->eax = (uint32_t)file_tell(t->opened_file);
    lock_release(&filesys_lock);
  }
  else
    thread_exit_with_return_value(f, -1);
}

16.syscall_halt :调用shutdown_power_off函数实现关机

static void
syscall_halt(struct intr_frame *f){
  shutdown_power_off();
}

4. Denying Writes to Executables

基本思想:

通过加锁控制文件访问

结构设计:

/* An open file. */
struct file 
  {
    struct inode *inode;        /* File's inode. */
    off_t pos;                  /* Current position. */
    bool deny_write;            /* Has file_deny_write() been called? */

#ifdef FILESYS
    struct dir* dir; // for process_load
#endif

  };

对文件通过deny_write变量判断是否可写

算法设计:

thread_exec 中,在load 操作时调用 file_deny_write 加锁,禁止写入文件。在 thread_exit 中,将这个可执行文件调用 file_allow_write 解锁,允许写入文件,再调用 file_close 关闭文件。

bool
load (const char *file_name, void (**eip) (void), void **esp)
{
  ···
  done:
  /* We arrive here whether the load is successful or not. */
  if (success)
  {
    t->exec_file = file;

#ifdef FILESYS
    t->current_dir = get_file_dir(file);
#endif

    file_deny_write(file);
  }
  return success;
}

void
file_close (struct file *file) 
{
  if (file != NULL)
    {
      file_allow_write (file);
   
#ifdef FILESYS
      dir_close(file->dir);
#endif

      inode_close (file->inode);
      free (file);
    }
}