Merge branch 'master' into dev

microsoft · Dec 17, 2020 · 2ab0bb3 · 2ab0bb3
2 parents 03503ea + 4cc8bff
commit 2ab0bb3
Show file tree

Hide file tree

Showing 13 changed files with 21 additions and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -2,6 +2,7 @@
 * text eol=lf
 *.png binary
 *.pdn binary
+*.jpg binary
 *.sln binary
 *.suo binary
 *.vcproj binary

diff --git a/doc/bench-c5-18xlarge-2020-01-20-a.svg b/doc/bench-c5-18xlarge-2020-01-20-a.svg
diff --git a/doc/bench-c5-18xlarge-2020-01-20-b.svg b/doc/bench-c5-18xlarge-2020-01-20-b.svg
diff --git a/doc/bench-c5-18xlarge-2020-01-20-rss-a.svg b/doc/bench-c5-18xlarge-2020-01-20-rss-a.svg
diff --git a/doc/bench-c5-18xlarge-2020-01-20-rss-b.svg b/doc/bench-c5-18xlarge-2020-01-20-rss-b.svg
diff --git a/doc/bench-r5a-1.svg b/doc/bench-r5a-1.svg
diff --git a/doc/bench-r5a-12xlarge-2020-01-16-a.svg b/doc/bench-r5a-12xlarge-2020-01-16-a.svg
diff --git a/doc/bench-r5a-12xlarge-2020-01-16-b.svg b/doc/bench-r5a-12xlarge-2020-01-16-b.svg
diff --git a/doc/bench-r5a-2.svg b/doc/bench-r5a-2.svg
diff --git a/doc/bench-r5a-rss-1.svg b/doc/bench-r5a-rss-1.svg
diff --git a/doc/bench-r5a-rss-2.svg b/doc/bench-r5a-rss-2.svg
diff --git a/doc/ds-logo.jpg b/doc/ds-logo.jpg
diff --git a/readme.md b/readme.md
@@ -102,6 +102,8 @@ free list encoding](https://github.com/microsoft/mimalloc/blob/783e3377f79ee82af
 
 Special thanks to:
 
+* [David Carlier](https://devnexen.blogspot.com/) (@devnexen) for his many contributions, and making
+  mimalloc work better on many less common operating systems, like Haiku, Dragonfly, etc.
 * Mary Feofanova (@mary3000), Evgeniy Moiseenko, and Manuel Pöter (@mpoeter) for making mimalloc TSAN checkable, and finding
   memory model bugs using the [genMC] model checker.
 * Weipeng Liu (@pongba), Zhuowei Li, Junhua Wang, and Jakub Szymanski, for their early support of mimalloc and deployment
@@ -112,6 +114,14 @@ Special thanks to:
 
 [genMC]: https://plv.mpi-sws.org/genmc/
 
+### Usage
+
+mimalloc is used in various large scale low-latency services and programs, for example:
+
+<a href="https://www.bing.com"><img align="left"  height="50" src="https://upload.wikimedia.org/wikipedia/commons/e/e9/Bing_logo.svg"></a>
+<a href="https://azure.microsoft.com/"><img align="left" height="50" src="https://upload.wikimedia.org/wikipedia/commons/a/a8/Microsoft_Azure_Logo.svg"></a>
+<a href="https://deathstrandingpc.505games.com"><img height="100" src="doc/ds-logo.jpg" style="border-radius=1ex;vertical-align:center"></a>
+
 # Building
 
 ## Windows