OSDN Git Service
Alex Deymo [Thu, 10 Dec 2015 22:28:29 +0000 (14:28 -0800)]
Merge "Rename libext2 host libraries to standard suffix."
am:
f8a6eb443f
* commit '
f8a6eb443f7ed8bc22d74c876d243c63a2d7f2f6':
Rename libext2 host libraries to standard suffix.
Alex Deymo [Thu, 10 Dec 2015 22:18:33 +0000 (22:18 +0000)]
Merge "Rename libext2 host libraries to standard suffix."
David Zeuthen [Thu, 10 Dec 2015 21:24:58 +0000 (13:24 -0800)]
Merge "bootctl: add is-slot-marked-successful command."
am:
71dddf50ce
* commit '
71dddf50cec9c21b24146901cdd1ce3dee44f4d7':
bootctl: add is-slot-marked-successful command.
David Zeuthen [Thu, 10 Dec 2015 21:17:29 +0000 (21:17 +0000)]
Merge "bootctl: add is-slot-marked-successful command."
David Zeuthen [Thu, 10 Dec 2015 21:09:17 +0000 (16:09 -0500)]
bootctl: add is-slot-marked-successful command.
This makes it easy to call the newly added isSlotMarkedSuccessful()
boot_control HAL method added in the CL at
https://android-review.googlesource.com/#/c/185841/
This is useful for e.g. test suites.
Also improve error reporting for is-slot-bootable command.
Change-Id: I603e07d8310fc1de88114dadbaa1622a76289afb
Test: tested on edison (Brillo).
Lorenzo Colitti [Thu, 10 Dec 2015 12:54:54 +0000 (04:54 -0800)]
Merge "Move CreateSocketPair to net_test.py so we can use it elsewhere."
am:
001077aa92
* commit '
001077aa9293cd52ac4b4b34132eacd9b9a6ad23':
Move CreateSocketPair to net_test.py so we can use it elsewhere.
Lorenzo Colitti [Thu, 10 Dec 2015 12:49:40 +0000 (12:49 +0000)]
Merge "Move CreateSocketPair to net_test.py so we can use it elsewhere."
Alex Deymo [Thu, 10 Dec 2015 01:55:36 +0000 (17:55 -0800)]
Rename libext2 host libraries to standard suffix.
libext2_uuid_host was renamed to libext2_uuid-host to match the
"-host" suffix used in most libraries.
Bug:
24619596
TEST=m
Change-Id: Ia417e1e65fa7ee54baac1007c057fe2571bf8196
Lorenzo Colitti [Wed, 9 Dec 2015 13:54:15 +0000 (05:54 -0800)]
Merge "Minor changes to netlink code."
am:
6ccb30917e
* commit '
6ccb30917e16d709c269e75c5d1ab85e34eb52e1':
Minor changes to netlink code.
Lorenzo Colitti [Tue, 10 Nov 2015 08:13:43 +0000 (17:13 +0900)]
Move CreateSocketPair to net_test.py so we can use it elsewhere.
Change-Id: Ic46e1b9ffb9d1d6082c0453baaad71a3d43b432f
Lorenzo Colitti [Wed, 9 Dec 2015 13:49:46 +0000 (13:49 +0000)]
Merge "Minor changes to netlink code."
Lorenzo Colitti [Tue, 10 Nov 2015 07:59:37 +0000 (16:59 +0900)]
Minor changes to netlink code.
1. Remove IpRoute._Debug, since it's identical to the superclass
version.
2. Add some setsockopt constants to netlink.py.
3. Do the right thing if the kernel returns an error in a dump
request.
Change-Id: I37e49b35f1366760a408c7c4a73f95164d796a2e
Yabin Cui [Wed, 9 Dec 2015 03:36:29 +0000 (03:36 +0000)]
Merge "Simpleperf: check value returned by fopen."
am:
4818f026d4
* commit '
4818f026d4c35683222b84976de17da18ae178bb':
Simpleperf: check value returned by fopen.
Yabin Cui [Wed, 9 Dec 2015 03:31:51 +0000 (03:31 +0000)]
Merge "Simpleperf: check value returned by fopen."
Yabin Cui [Wed, 9 Dec 2015 03:25:13 +0000 (19:25 -0800)]
Simpleperf: check value returned by fopen.
Change-Id: Iecddf0b7805ccc2ad930bab2cdfcefa0702e5661
Yabin Cui [Wed, 9 Dec 2015 02:49:07 +0000 (02:49 +0000)]
Merge "Simpleperf: check if elf file paths are valid before reading them."
am:
95c06b156f
* commit '
95c06b156fd8008b74eac9720f933f479f84a340':
Simpleperf: check if elf file paths are valid before reading them.
Yabin Cui [Wed, 9 Dec 2015 02:44:06 +0000 (02:44 +0000)]
Merge "Simpleperf: check if elf file paths are valid before reading them."
Yabin Cui [Wed, 9 Dec 2015 01:43:15 +0000 (17:43 -0800)]
Simpleperf: check if elf file paths are valid before reading them.
Reading invalid file paths can cause troubles. For example,
reading /dev/zero can eat all memory.
Bug:
25194400
Change-Id: I4de17f4f9200a43b50a4efe4c42a6fd9eaec1ba6
Elliott Hughes [Wed, 9 Dec 2015 01:17:48 +0000 (17:17 -0800)]
resolve merge conflicts of
836476d90d to mnc-dr2-dev-plus-aosp.
Change-Id: I8ae0ceb96f8bfe706cdaa4a512bf52935667600c
Elliott Hughes [Tue, 8 Dec 2015 23:41:31 +0000 (23:41 +0000)]
Fix showmap SIGSEGV.
am:
e2534e30bc
* commit '
e2534e30bc558035b1fb1036241e2063151be723':
Fix showmap SIGSEGV.
Elliott Hughes [Tue, 8 Dec 2015 23:38:33 +0000 (23:38 +0000)]
Merge "Prevent future instances of the last bug."
am:
113206fb65
* commit '
113206fb6548cf95bdb91821c7b4dd384c926756':
Prevent future instances of the last bug.
Elliott Hughes [Tue, 8 Dec 2015 23:32:38 +0000 (23:32 +0000)]
Merge "Prevent future instances of the last bug."
Elliott Hughes [Tue, 8 Dec 2015 23:19:59 +0000 (23:19 +0000)]
Merge "Fix showmap SIGSEGV."
am:
8a72d54a4f
* commit '
8a72d54a4f6636734f1f6a8a9d76022829f2001a':
Fix showmap SIGSEGV.
Elliott Hughes [Tue, 8 Dec 2015 22:57:22 +0000 (14:57 -0800)]
Fix showmap SIGSEGV.
Bug: http://b/
26084907
Change-Id: I6ed8a26b93d90348d2bb806ccd7752a1a76144a6
Elliott Hughes [Tue, 8 Dec 2015 23:13:36 +0000 (15:13 -0800)]
Prevent future instances of the last bug.
Also make the columns line up, and make it visible in the code that they
do now line up.
Bug: http://b/
26084907
Change-Id: If6abfffcafceab8e8d548c93fbbb13e371c79732
Thierry Strudel [Tue, 8 Dec 2015 23:15:35 +0000 (23:15 +0000)]
librank: fix pm_memusage_t init and layout am:
76617ddbd1
am:
17c08c98fe
* commit '
17c08c98fe93f3b7b9f1c291910fd488bd3a6027':
librank: fix pm_memusage_t init and layout
Thierry Strudel [Tue, 8 Dec 2015 23:12:53 +0000 (23:12 +0000)]
librank: fix pm_memusage_t init and layout
am:
76617ddbd1
* commit '
76617ddbd19525a8d82e7304a0e4b1c771438329':
librank: fix pm_memusage_t init and layout
Elliott Hughes [Tue, 8 Dec 2015 23:11:37 +0000 (23:11 +0000)]
Merge "Fix showmap SIGSEGV."
Elliott Hughes [Tue, 8 Dec 2015 23:02:48 +0000 (23:02 +0000)]
Merge "Showmap: show swap."
am:
88add2dbc1
* commit '
88add2dbc12ee79b3cc22bc70a71f857fe46b2b3':
Showmap: show swap.
Thierry Strudel [Tue, 8 Dec 2015 22:59:46 +0000 (14:59 -0800)]
librank: fix pm_memusage_t init and layout
pm_memusage_t variables must be initialized to 0 or call initializer.
Bug:
26083907
Change-Id: I62882be13de9c546e73bcdc24ec43ed0d5251db1
Elliott Hughes [Tue, 8 Dec 2015 22:57:22 +0000 (14:57 -0800)]
Fix showmap SIGSEGV.
Bug: http://b/
26084907
Change-Id: I6ed8a26b93d90348d2bb806ccd7752a1a76144a6
Elliott Hughes [Tue, 8 Dec 2015 22:56:18 +0000 (22:56 +0000)]
Merge "Showmap: show swap."
Martijn Coenen [Fri, 4 Dec 2015 16:22:15 +0000 (17:22 +0100)]
Showmap: show swap.
Bug:
26019993
Change-Id: I50a22a6be958dc336da0a1942989a164bb489937
Yabin Cui [Tue, 8 Dec 2015 21:21:04 +0000 (21:21 +0000)]
Merge "Simpleperf: add separate cpu_hotplug_test."
am:
8460573b13
* commit '
8460573b13e2cc3fc94ec6f7a25fac5885ad4ff1':
Simpleperf: add separate cpu_hotplug_test.
Yabin Cui [Tue, 8 Dec 2015 21:16:17 +0000 (21:16 +0000)]
Merge "Simpleperf: add separate cpu_hotplug_test."
Yabin Cui [Tue, 8 Dec 2015 04:14:14 +0000 (20:14 -0800)]
Simpleperf: add separate cpu_hotplug_test.
cpu_hotplug_test runs much longer than unit tests, so separate it.
It uses the same strategy as the shell scripts I used to find all
kernel bugs.
Bug:
26032318
Bug:
25193162
Change-Id: I2f26d4f0d65e680b597e40cce9e775b9568599ef
Martijn Coenen [Mon, 7 Dec 2015 23:29:01 +0000 (23:29 +0000)]
Showmap: show swap. am:
9f82eca8b9
am:
dc33fe9b55
* commit '
dc33fe9b554ee8ba5471c340e431c1b8db3e94e1':
Showmap: show swap.
Martijn Coenen [Mon, 7 Dec 2015 23:06:16 +0000 (23:06 +0000)]
Showmap: show swap.
am:
9f82eca8b9
* commit '
9f82eca8b9ac9068e4ea86036b7f183006e4c248':
Showmap: show swap.
Yabin Cui [Sat, 5 Dec 2015 00:23:18 +0000 (00:23 +0000)]
Merge "Simpleperf: don\'t use ioctl(PERF_EVENT_IOC_ENABLE)." am:
b9ca50b319
am:
58736022de
* commit '
58736022dedb503a32de80540a854526aa9bc0cb':
Simpleperf: don't use ioctl(PERF_EVENT_IOC_ENABLE).
Yabin Cui [Sat, 5 Dec 2015 00:20:20 +0000 (16:20 -0800)]
Merge "Simpleperf: don\'t use ioctl(PERF_EVENT_IOC_ENABLE)."
am:
b9ca50b319
* commit '
b9ca50b319d2083c5a92c468e54796b0e71a4ad9':
Simpleperf: don't use ioctl(PERF_EVENT_IOC_ENABLE).
Yabin Cui [Sat, 5 Dec 2015 00:15:38 +0000 (00:15 +0000)]
Merge "Simpleperf: don't use ioctl(PERF_EVENT_IOC_ENABLE)."
Elliott Hughes [Fri, 4 Dec 2015 23:33:38 +0000 (15:33 -0800)]
Merge "Track rename from base/ to android-base/." am:
5d8fdbb6ff
am:
9ff83ae0e4
* commit '
9ff83ae0e4f5e7de90d3bc5e8bd2d7d0b45d371b':
Track rename from base/ to android-base/.
Elliott Hughes [Fri, 4 Dec 2015 23:29:35 +0000 (15:29 -0800)]
Merge "Track rename from base/ to android-base/."
am:
5d8fdbb6ff
* commit '
5d8fdbb6ff3d617e48198e12a2b1c10b48d22f79':
Track rename from base/ to android-base/.
Elliott Hughes [Fri, 4 Dec 2015 23:22:53 +0000 (23:22 +0000)]
Merge "Track rename from base/ to android-base/."
Elliott Hughes [Fri, 4 Dec 2015 22:00:57 +0000 (14:00 -0800)]
Track rename from base/ to android-base/.
Change-Id: Ic15d4778c7accd1382de0b440a437aba2cf67016
Martijn Coenen [Fri, 4 Dec 2015 16:22:15 +0000 (17:22 +0100)]
Showmap: show swap.
Bug:
26019993
Change-Id: I50a22a6be958dc336da0a1942989a164bb489937
Yabin Cui [Thu, 3 Dec 2015 18:31:37 +0000 (10:31 -0800)]
Simpleperf: don't use ioctl(PERF_EVENT_IOC_ENABLE).
Some android kernels(like bullhead/angler) can't handle
ioctl(PERF_EVENT_IOC_ENABLE) correctly when cpu-hotplug
happens. Instead of fixing all of them in kernel, we
can't simply don't use it.
Bug:
25193162
Change-Id: I9df1458045ffd2ccc2c7ba393e746ebba7c253de
Thierry Strudel [Wed, 2 Dec 2015 23:53:00 +0000 (23:53 +0000)]
procrank: add proportional swap accounting am:
08ea6e722b
am:
6ca5d69923
* commit '
6ca5d6992307ac6d063e4a7a1f0457afb88e033c':
procrank: add proportional swap accounting
Thierry Strudel [Wed, 2 Dec 2015 23:49:41 +0000 (23:49 +0000)]
procrank: add proportional swap accounting
am:
08ea6e722b
* commit '
08ea6e722b1f2d6359f54fe39c6bed82f524291c':
procrank: add proportional swap accounting
Thierry Strudel [Sat, 21 Nov 2015 02:07:15 +0000 (18:07 -0800)]
procrank: add proportional swap accounting
Shared pages are reported in each of the sharing process swapped pages.
Compute a proportional swap usage to get a meaningful value of what each
process has in swap. Report also process unique pages swapped out.
In case ZRAM is used compute the compression ration and report the
actual RAM use of the swapped pages.
Bug:
25392275
Change-Id: I3a28c7812a09a02e1a604593615f5c6ad0340f9f
Yabin Cui [Wed, 25 Nov 2015 01:09:06 +0000 (01:09 +0000)]
Merge "Simpleperf: remove unnecessary exit()." am:
dd7f62ed57
am:
5345ea0e4f
* commit '
5345ea0e4f77b97b7292131161d4ed8789236ee3':
Simpleperf: remove unnecessary exit().
Yabin Cui [Wed, 25 Nov 2015 01:06:22 +0000 (01:06 +0000)]
Merge "Simpleperf: remove unnecessary exit()."
am:
dd7f62ed57
* commit '
dd7f62ed576e70e73a92b278c99dcba0d27f33a5':
Simpleperf: remove unnecessary exit().
Yabin Cui [Wed, 25 Nov 2015 01:03:01 +0000 (01:03 +0000)]
Merge "Simpleperf: remove unnecessary exit()."
Yabin Cui [Wed, 25 Nov 2015 00:58:53 +0000 (16:58 -0800)]
Simpleperf: remove unnecessary exit().
Change-Id: I5256617373c3414195a7a994d0ce217d9afd47e6
Riley Andrews [Mon, 23 Nov 2015 22:37:31 +0000 (22:37 +0000)]
Merge "zram performance test." am:
bb0eca64ee
am:
50f6f801ff
* commit '
50f6f801ff406bc1983e5ae21c5e875c1ae11479':
zram performance test.
Riley Andrews [Mon, 23 Nov 2015 22:33:22 +0000 (22:33 +0000)]
Merge "zram performance test."
am:
bb0eca64ee
* commit '
bb0eca64eea52340daf187a6e5908a6f27875e0a':
zram performance test.
Riley Andrews [Mon, 23 Nov 2015 22:27:48 +0000 (22:27 +0000)]
Merge "zram performance test."
Riley Andrews [Fri, 20 Nov 2015 23:40:09 +0000 (15:40 -0800)]
zram performance test.
Test dumps raw read and write performance to the zram device. It will
turn off the swap, benchmark, and then restore the swap device during a
successful run.
Signed-off-by: Riley Andrews <riandrews@google.com>
Change-Id: I9b5474b5f0a7556ca2093f3f0d1f792fa2fb1514
Thierry Strudel [Sat, 21 Nov 2015 02:18:00 +0000 (02:18 +0000)]
procrank: Fix some printf alignements am:
5e20c25f63
am:
7ad5b7d135
* commit '
7ad5b7d13581832472d9f8da576c50f72c203bf2':
procrank: Fix some printf alignements
Yu Liu [Sat, 21 Nov 2015 02:17:57 +0000 (02:17 +0000)]
Swap column in procrank not reported with swap enabled am:
aa5a7df9d8
am:
2424169f81
* commit '
2424169f810933f2713358f4cb393934528f322f':
Swap column in procrank not reported with swap enabled
Thierry Strudel [Sat, 21 Nov 2015 02:15:07 +0000 (02:15 +0000)]
procrank: Fix some printf alignements
am:
5e20c25f63
* commit '
5e20c25f630fcaace1728090a43998f076b2851f':
procrank: Fix some printf alignements
Yu Liu [Sat, 21 Nov 2015 02:15:02 +0000 (02:15 +0000)]
Swap column in procrank not reported with swap enabled
am:
aa5a7df9d8
* commit '
aa5a7df9d83c39e41fd07c1281a9912544022448':
Swap column in procrank not reported with swap enabled
Thierry Strudel [Fri, 20 Nov 2015 20:45:09 +0000 (12:45 -0800)]
procrank: Fix some printf alignements
Bug:
25392275
Change-Id: I8ea4d01310190c34b68d3f3140ea336ad82df665
Yu Liu [Thu, 18 Jun 2015 17:46:29 +0000 (10:46 -0700)]
Swap column in procrank not reported with swap enabled
Bug:
25392275
Change-Id: I6d2a0b03abba555b3667f6ccf12896caeecf27aa
Tao Bao [Fri, 20 Nov 2015 06:02:57 +0000 (06:02 +0000)]
Merge "bootctl: Fix the error checking for strtol result." am:
de2ad9750a
am:
60e27741b3
* commit '
60e27741b3e235ac490f6d46f1abdfd1d2bc0394':
bootctl: Fix the error checking for strtol result.
Tao Bao [Fri, 20 Nov 2015 05:59:28 +0000 (05:59 +0000)]
Merge "bootctl: Fix the error checking for strtol result."
am:
de2ad9750a
* commit '
de2ad9750aa29f696ca94a4ec4fa1286293ef72d':
bootctl: Fix the error checking for strtol result.
Tao Bao [Fri, 20 Nov 2015 05:56:17 +0000 (05:56 +0000)]
Merge "bootctl: Fix the error checking for strtol result."
Tao Bao [Thu, 19 Nov 2015 22:43:53 +0000 (14:43 -0800)]
bootctl: Fix the error checking for strtol result.
system/extras/bootctl/bootctl.c:136:13: warning: comparison is always false due to limited range of data type [-Wtype-limits]
if (ret == LONG_MIN || ret == LONG_MAX) {
Change-Id: Id4816716e4c6d304c2ca531aadbcc62117ad7376
David Zeuthen [Thu, 19 Nov 2015 19:59:25 +0000 (19:59 +0000)]
bootctl: Command-line wrapper for boot_control HAL.
am:
9c75618117 -s ours
* commit '
9c75618117cc0ac52a1916a3a949c10b2638a607':
bootctl: Command-line wrapper for boot_control HAL.
Tao Bao [Thu, 19 Nov 2015 19:26:58 +0000 (19:26 +0000)]
ext4_utils: Wrap wipe.h to be C++ compatible.
am:
13e82fe19e
* commit '
13e82fe19e59ccbc69dcdf0f3d786cf06d4a66fa':
ext4_utils: Wrap wipe.h to be C++ compatible.
Sami Tolvanen [Thu, 19 Nov 2015 15:53:44 +0000 (15:53 +0000)]
Merge "fec: report correct ecc location for -E" am:
139871346e
am:
8b94ede7a9
* commit '
8b94ede7a9ff264f339620642acd7f5184f7856a':
fec: report correct ecc location for -E
Sami Tolvanen [Thu, 19 Nov 2015 15:48:50 +0000 (15:48 +0000)]
Merge "fec: report correct ecc location for -E"
am:
139871346e
* commit '
139871346e1b113f2d396fcc2e5b9ca20123d96f':
fec: report correct ecc location for -E
Sami Tolvanen [Thu, 19 Nov 2015 15:39:53 +0000 (15:39 +0000)]
Merge "fec: report correct ecc location for -E"
Sami Tolvanen [Wed, 18 Nov 2015 10:13:45 +0000 (10:13 +0000)]
fec: report correct ecc location for -E
Since the header is now at the end, no need to take that into account
when reporting metadata location.
Change-Id: I825b5ae9d35b3ca69dead37f246568b4700298a2
Riley Andrews [Tue, 17 Nov 2015 22:27:53 +0000 (22:27 +0000)]
Riley Andrews [Tue, 17 Nov 2015 22:22:15 +0000 (22:22 +0000)]
Merge "Alloc stress."
am:
6978131b78
* commit '
6978131b781d16e6911fa51f68e101abe225de5c':
Alloc stress.
Riley Andrews [Tue, 17 Nov 2015 21:38:45 +0000 (21:38 +0000)]
Merge "Alloc stress."
David Zeuthen [Mon, 31 Aug 2015 21:55:33 +0000 (17:55 -0400)]
bootctl: Command-line wrapper for boot_control HAL.
Change-Id: Icd7bfee8fcc04ca113c2e6dc8bcefd614e804bb6
Tao Bao [Mon, 13 Jul 2015 23:54:02 +0000 (16:54 -0700)]
ext4_utils: Wrap wipe.h to be C++ compatible.
Change-Id: I78422a26cfe5c54f79fcb336e02460339eae7df2
(cherry picked from commit
7d056b49edc7bef93203baa043eec49c7efd1046)
Riley Andrews [Fri, 13 Nov 2015 01:51:07 +0000 (17:51 -0800)]
Alloc stress.
Change-Id: Ib1b506ef43aea122a76dac80d1eaf819c81073b1
Christopher Ferris [Thu, 12 Nov 2015 21:09:21 +0000 (21:09 +0000)]
Merge "Fix a size specification bug for the bandwidth test." am:
df6a677fac
am:
f570959542
* commit '
f5709595428ba81c7190853edc4dc4771e72aa0d':
Fix a size specification bug for the bandwidth test.
Christopher Ferris [Thu, 12 Nov 2015 21:05:10 +0000 (21:05 +0000)]
Merge "Fix a size specification bug for the bandwidth test."
am:
df6a677fac
* commit '
df6a677fac4e74723de43c1ad8540c9bdd0d6ad4':
Fix a size specification bug for the bandwidth test.
Christopher Ferris [Thu, 12 Nov 2015 21:00:53 +0000 (21:00 +0000)]
Merge "Fix a size specification bug for the bandwidth test."
Ben Cheng [Tue, 10 Nov 2015 09:33:40 +0000 (17:33 +0800)]
Fix a size specification bug for the bandwidth test.
Change-Id: I38b5dc89edafd1768caa34158c2746c7ef35c31e
(cherry picked from commit
fb829a48d844b9769c5a52d1bb4d40d51ff4b6bc)
Christopher Ferris [Mon, 9 Nov 2015 21:10:35 +0000 (21:10 +0000)]
Merge "Do not try and sanitize memtest." am:
442e95221f
am:
302d5a8669
* commit '
302d5a8669d55701e8e754e2deed4c2b9133d247':
Do not try and sanitize memtest.
Christopher Ferris [Mon, 9 Nov 2015 21:08:51 +0000 (21:08 +0000)]
Merge "Do not try and sanitize memtest."
am:
442e95221f
* commit '
442e95221fb7fa4e98dab788b0382140843e32a1':
Do not try and sanitize memtest.
Christopher Ferris [Mon, 9 Nov 2015 21:06:47 +0000 (21:06 +0000)]
Merge "Do not try and sanitize memtest."
Christopher Ferris [Mon, 9 Nov 2015 21:03:52 +0000 (13:03 -0800)]
Do not try and sanitize memtest.
Bug:
25592757
Change-Id: I944bdabd7026251d903f9e3441859401fdcb872f
Erik Kline [Mon, 9 Nov 2015 08:22:20 +0000 (08:22 +0000)]
Merge "Use packets.py instead of old multinetwork_test.Packets" am:
e883d56794
am:
8b753f8021
* commit '
8b753f80219a639f0c9a9b571f9b6f86ae5ec00a':
Use packets.py instead of old multinetwork_test.Packets
Erik Kline [Mon, 9 Nov 2015 08:20:38 +0000 (08:20 +0000)]
Merge "Use packets.py instead of old multinetwork_test.Packets"
am:
e883d56794
* commit '
e883d56794a07c09eb889e8a1bd51a963c3fc7b2':
Use packets.py instead of old multinetwork_test.Packets
Erik Kline [Mon, 9 Nov 2015 08:19:26 +0000 (08:19 +0000)]
Merge "Use packets.py instead of old multinetwork_test.Packets"
Erik Kline [Mon, 9 Nov 2015 07:29:00 +0000 (16:29 +0900)]
Use packets.py instead of old multinetwork_test.Packets
Change-Id: I39a36569a2df5b2a2a5b2bb323944864b284df0a
Lorenzo Colitti [Mon, 9 Nov 2015 06:56:06 +0000 (06:56 +0000)]
Merge "Pass more information to the attribute parsing functions." am:
7a280cb2f7
am:
d20f2dcde2
* commit '
d20f2dcde2c777e468258ca71303404638a0ae0d':
Pass more information to the attribute parsing functions.
Lorenzo Colitti [Mon, 9 Nov 2015 06:54:26 +0000 (06:54 +0000)]
Merge "Pass more information to the attribute parsing functions."
am:
7a280cb2f7
* commit '
7a280cb2f78961ab245051e777fa354804e5af4a':
Pass more information to the attribute parsing functions.
Lorenzo Colitti [Mon, 9 Nov 2015 06:53:44 +0000 (06:53 +0000)]
Merge "Pass more information to the attribute parsing functions."
Lorenzo Colitti [Thu, 29 Oct 2015 15:14:10 +0000 (00:14 +0900)]
Pass more information to the attribute parsing functions.
Change-Id: I790dc54dd3de8a84758789d58f2ee17f175a6582
Lorenzo Colitti [Mon, 9 Nov 2015 06:49:16 +0000 (06:49 +0000)]
Merge changes I608c9974,Ic13456c5,Ie77b1591 am:
61205df5b4
am:
dadbfba71f
* commit '
dadbfba71f0edd79c4a9d2e48c0fcc7253c0e2ea':
Support nested structs in CStruct.
Move common netlink code into a new netlink.py
Move the forwarding crash test to a new file.
Lorenzo Colitti [Mon, 9 Nov 2015 06:47:19 +0000 (06:47 +0000)]
Merge changes I608c9974,Ic13456c5,Ie77b1591
am:
61205df5b4
* commit '
61205df5b44cc809f60714330686c887eeaf4037':
Support nested structs in CStruct.
Move common netlink code into a new netlink.py
Move the forwarding crash test to a new file.
Lorenzo Colitti [Mon, 9 Nov 2015 06:45:16 +0000 (06:45 +0000)]
Merge changes I608c9974,Ic13456c5,Ie77b1591
* changes:
Support nested structs in CStruct.
Move common netlink code into a new netlink.py
Move the forwarding crash test to a new file.
Lorenzo Colitti [Thu, 29 Oct 2015 14:47:31 +0000 (23:47 +0900)]
Support nested structs in CStruct.
Change-Id: I608c9974617a9c1e2c5555d499116f72456e532d