diff options
| author | Jordan Niethe <jniethe5@gmail.com> | 2019-04-02 10:43:25 +1100 |
|---|---|---|
| committer | Stewart Smith <stewart@linux.ibm.com> | 2019-05-20 14:27:40 +1000 |
| commit | 3d6aca20b8ae7a8d882c787fe8bc1152591c1036 (patch) | |
| tree | 98bb9e1951690b2ac2754dca6dea50ae65e09e20 /ccan/Makefile.inc | |
| parent | 6c74b8e4dda1d37ba18c2efe5caf789dcce5776b (diff) | |
| download | skiboot-3d6aca20b8ae7a8d882c787fe8bc1152591c1036.zip skiboot-3d6aca20b8ae7a8d882c787fe8bc1152591c1036.tar.gz skiboot-3d6aca20b8ae7a8d882c787fe8bc1152591c1036.tar.bz2 | |
ccan: Add CCAN heap source
We would like to be able to use dump_trace to dump multiple trace
buffers at a time. The entries should be displayed in timestamp order.
As each buffer is already ordered on timestamp, a k-way merge is an
efficient method to sort the buffers together by timestamp. A heap can
be used to implement a k-way merge. As CCAN is already included in
Skiboot, use the CCAN heap. Add the source for heap.
Signed-off-by: Jordan Niethe <jniethe5@gmail.com>
[stewart: ccan/heap: Make test run quieter]
Signed-off-by: Stewart Smith <stewart@linux.ibm.com>
Diffstat (limited to 'ccan/Makefile.inc')
| -rw-r--r-- | ccan/Makefile.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ccan/Makefile.inc b/ccan/Makefile.inc index 36e7577..546891b 100644 --- a/ccan/Makefile.inc +++ b/ccan/Makefile.inc @@ -1,7 +1,7 @@ # -*-Makefile-*- -SUBDIRS += ccan ccan/list ccan/str -CCAN_OBJS = list/list.o str/str.o +SUBDIRS += ccan ccan/list ccan/str ccan/heap +CCAN_OBJS = list/list.o str/str.o heap/heap.o CCAN=ccan/built-in.a $(CCAN): $(CCAN_OBJS:%=ccan/%) |