Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Jleong/change exit behavior #114

Merged
merged 12 commits into from
Feb 22, 2017
Merged

Jleong/change exit behavior #114

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
203ff2c
Clean up code in preparation for refactor
omegaphoenix Feb 20, 2017
e8c171f
Fix exec-missing test
omegaphoenix Feb 20, 2017
4b8c46b
Refactor to use semaphore when waiting to exit
omegaphoenix Feb 20, 2017
488003b
Fix possible minor bugs
omegaphoenix Feb 20, 2017
cd645c0
Fix bug where not failing if out of memory
omegaphoenix Feb 20, 2017
9301822
Close file with fd always
omegaphoenix Feb 20, 2017
23cf7c5
Remove unused filesys_lock in thread
omegaphoenix Feb 21, 2017
37e8890
Add lock for changing wait_on
omegaphoenix Feb 21, 2017
97f3da3
Fix all tests (including multi-oom)
omegaphoenix Feb 21, 2017
c6ef962
Refactor list_remove
omegaphoenix Feb 21, 2017
7108cbc
Clean up code and update design doc
omegaphoenix Feb 22, 2017
d7aefb9
Merge branch 'develop' into jleong/changeExitBehavior
omegaphoenix Feb 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix possible minor bugs
  • Loading branch information
@omegaphoenix
omegaphoenix committed Feb 20, 2017
commit 488003b1238e148f00d437084d2c0037ebbf07ef
2 changes: 1 addition & 1 deletion src/threads/thread.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,7 +608,7 @@ int add_open_file(struct thread *cur, struct file *file, int fd) {
new_file->file = file;
new_file->fd = fd;

if (is_valid_fd(fd)) {
if (is_valid_fd(fd) && !is_existing_fd(cur, fd)) {
list_push_back(&cur->open_files, &new_file->file_elem);
return fd;
}
Expand Down
4 changes: 4 additions & 0 deletions src/userprog/syscall.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,10 @@ void sys_exit(int status) {
printf("%s: exit(%d)\n", cur->name, status);
cur->exit_status = status;

if (lock_held_by_current_thread(&filesys_lock)) {
release_file_lock();
}

/* Free all file buffers. */
struct list_elem *e;
while (!list_empty(&cur->open_files)) {
Expand Down