Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(17)

Side by Side Diff: third_party/tcmalloc/README.chromium

Issue 9702045: Update the tcmalloc vendor branch to r144 (gperftools 2.0), and README.chromium. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | third_party/tcmalloc/vendor/AUTHORS » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 Name: tcmalloc 1 Name: tcmalloc
2 Short Name: google-perftools 2 Short Name: gperftools
3 URL: http://google-perftools.googlecode.com/ 3 URL: http://gperftools.googlecode.com/
4 Version: unknown 4 Version: unknown
5 Revision: 144 5 Revision: 144
6 Security Critical: yes 6 Security Critical: yes
7 7
8 Description: 8 Description:
9 This contains Chromium's locally patched copy of tcmalloc. 9 This contains Chromium's locally patched copy of tcmalloc.
10 10
11 Contents: 11 Contents:
12 12
13 chromium/ 13 chromium/
14 14
15 The chromium patched sources, copied from the vendor/ 15 The chromium patched sources, copied from the vendor/
16 subdirectory and containing our local modifications. 16 subdirectory and containing our local modifications.
17 17
18 We only copy over the vendor/src/ subdirectory (the only piece 18 We only copy over the vendor/src/ subdirectory (the only piece
19 we need) but still leave it in a chromium/src/ subdirectory to 19 we need) but still leave it in a chromium/src/ subdirectory to
20 keep the directory structures in parallel. 20 keep the directory structures in parallel.
21 21
22 vendor/ 22 vendor/
23 23
24 Vanilla sources from upstream: 24 Vanilla sources from upstream:
25 25
26 http://google-perftools.googlecode.com/svn/trunk 26 http://gperftools.googlecode.com/svn/trunk
27 27
28 The current revision is: 28 The current revision is:
29 29
30 Last Changed Rev: 111 30 Last Changed Rev: 144
31 Last Changed Date: 2011-07-16 05:07:10 +0400 (Sat, 16 Jul 2011) 31 Last Changed Date: 2012-02-04 00:10:11 +0000 (Sat, 04 Feb 2012)
32 32
33 33
34 34
35 HOWTOs: 35 HOWTOs:
36 36
37 Take a new version from upstream: 37 Take a new version from upstream:
38 38
39 1) Grab the revision: 39 1) Grab the revision:
40 40
41 $ svn export [-r {tcmalloc-rev}] \ 41 $ svn export [-r {tcmalloc-rev}] \
42 http://google-perftools.googlecode.com/svn/trunk \ 42 http://gperftools.googlecode.com/svn/trunk \
43 vendor-{tcmalloc-rev} 43 vendor-{tcmalloc-rev}
44 44
45 2) Check for added or deleted files: 45 2) Check for added or deleted files:
46 46
47 $ diff -q -r -x .svn vendor vendor-{tcmalloc-rev} 47 $ diff -q -r -x .svn vendor vendor-{tcmalloc-rev}
48 48
49 3) Copy the new revision on top of the checked-in vendor branch: 49 3) Copy the new revision on top of the checked-in vendor branch:
50 50
51 $ cp -r vendor-{tcmalloc-rev}/* vendor 51 $ cp -r vendor-{tcmalloc-rev}/* vendor
52 52
53 C:\> xcopy /e/y/i vendor-{tcmalloc-rev}\* vendor 53 C:\> xcopy /e/y/i vendor-{tcmalloc-rev}\* vendor
54 54
55 4) "svn add" or "svn rm" added or removed files (based on your 55 4) Make all vendor files non-executable.
56
57 $ find . -executable -type f -exec chmod a-x {} \;
58
59 5) "svn add" or "svn rm" added or removed files (based on your
56 "diff -q -r" output from above) 60 "diff -q -r" output from above)
57 61
58 5) Create the CL, upload, check it in: 62 6) Create the CL, upload, check it in:
59 63
60 $ gcl change CL 64 $ gcl change CL
61 $ gcl upload CL 65 $ gcl upload CL
62 $ gcl commit CL 66 $ gcl commit CL
63 67
64 Note the revision number since you're going to want to merge 68 Note the revision number since you're going to want to merge
65 that to the local chromium branch. 69 that to the local chromium branch.
66 70
67 Merge a new upstream version with our local patched copy: 71 Merge a new upstream version with our local patched copy:
68 72
69 1) Merge the local revision to chromium/src 73 1) Merge the local revision to chromium/src
70 74
71 $ svn merge -c {chrome-rev} svn://chrome-svn/chrome/trunk/src/third_part y/tcmalloc/vendor/src chromium/src 75 $ svn merge -c {chrome-rev} svn://chrome-svn/chrome/trunk/src/third_part y/tcmalloc/vendor/src chromium/src
72 76
73 2) Resolve any conflicts 77 2) Resolve any conflicts
74 78
75 3) Create the CL, upload, check in: 79 3) Create the CL, upload, check in:
76 80
77 $ gcl change CL 81 $ gcl change CL
78 $ gcl upload CL 82 $ gcl upload CL
79 $ gcl commit CL 83 $ gcl commit CL
OLDNEW
« no previous file with comments | « no previous file | third_party/tcmalloc/vendor/AUTHORS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698