Merge lp:~timg-tpi/ureadahead/LP501715 into lp:ureadahead

Proposed by Tim Gardner on 2010-07-13
Status: Needs review
Proposed branch: lp:~timg-tpi/ureadahead/LP501715
Merge into: lp:ureadahead
Diff against target: 30 lines (+5/-1)
1 file modified
src/trace.c (+5/-1)
To merge this branch: bzr merge lp:~timg-tpi/ureadahead/LP501715
Reviewer Review Type Date Requested Status
Scott James Remnant (Canonical) 2010-07-13 Pending
Review via email: mp+29802@code.launchpad.net

Description of the change

Restore buffer_size_kb upon exit, LP: 501715

To post a comment you must log in.

Unmerged revisions

114. By Tim Gardner on 2010-07-13

Restore buffer_size_kb upon exit, LP: 501715

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/trace.c'
2--- src/trace.c 2009-11-29 15:04:36 +0000
3+++ src/trace.c 2010-07-13 15:47:39 +0000
4@@ -122,6 +122,7 @@
5 int old_open_exec_enabled = 0;
6 int old_uselib_enabled = 0;
7 int old_tracing_enabled = 0;
8+ int old_buffer_size_kb = 0;
9 struct sigaction act;
10 struct sigaction old_sigterm;
11 struct sigaction old_sigint;
12@@ -165,7 +166,7 @@
13
14 old_uselib_enabled = -1;
15 }
16- if (set_value (dfd, "buffer_size_kb", 128000, NULL) < 0)
17+ if (set_value (dfd, "buffer_size_kb", 128000, &old_buffer_size_kb) < 0)
18 goto error;
19 if (set_value (dfd, "tracing_enabled",
20 TRUE, &old_tracing_enabled) < 0)
21@@ -217,6 +218,9 @@
22 if (set_value (dfd, "events/fs/do_sys_open/enable",
23 old_sys_open_enabled, NULL) < 0)
24 goto error;
25+ if (set_value (dfd, "buffer_size_kb",
26+ old_buffer_size_kb, NULL) < 0)
27+ goto error;
28
29 /* Be nicer */
30 if (nice (15))

Subscribers

People subscribed via source and target branches