You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by jo...@apache.org on 2016/12/19 17:40:47 UTC
mesos git commit: Libprocess: Reduced binary bloat due to 'mime'.
Repository: mesos
Updated Branches:
refs/heads/master 980f660ac -> daf291b6c
Libprocess: Reduced binary bloat due to 'mime'.
Review: https://reviews.apache.org/r/54768
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/daf291b6
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/daf291b6
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/daf291b6
Branch: refs/heads/master
Commit: daf291b6ce455d1e162691325d067a618149ea9e
Parents: 980f660
Author: Joris Van Remoortere <jo...@gmail.com>
Authored: Tue Sep 27 14:46:19 2016 -0400
Committer: Joris Van Remoortere <jo...@gmail.com>
Committed: Mon Dec 19 12:40:22 2016 -0500
----------------------------------------------------------------------
3rdparty/libprocess/Makefile.am | 1 +
3rdparty/libprocess/include/process/mime.hpp | 133 +------------------
3rdparty/libprocess/src/CMakeLists.txt | 1 +
3rdparty/libprocess/src/mime.cpp | 154 ++++++++++++++++++++++
4 files changed, 157 insertions(+), 132 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/daf291b6/3rdparty/libprocess/Makefile.am
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/Makefile.am b/3rdparty/libprocess/Makefile.am
index 10f4163..cbc3c1e 100644
--- a/3rdparty/libprocess/Makefile.am
+++ b/3rdparty/libprocess/Makefile.am
@@ -149,6 +149,7 @@ libprocess_la_SOURCES = \
src/latch.cpp \
src/logging.cpp \
src/metrics/metrics.cpp \
+ src/mime.cpp \
src/pid.cpp \
src/poll_socket.cpp \
src/poll_socket.hpp \
http://git-wip-us.apache.org/repos/asf/mesos/blob/daf291b6/3rdparty/libprocess/include/process/mime.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/include/process/mime.hpp b/3rdparty/libprocess/include/process/mime.hpp
index 2b8351a..eaf3d5d 100644
--- a/3rdparty/libprocess/include/process/mime.hpp
+++ b/3rdparty/libprocess/include/process/mime.hpp
@@ -21,138 +21,7 @@ namespace mime {
extern std::map<std::string, std::string> types;
-inline void initialize()
-{
- // These MIME types were collected via:
- /*
- python -c '
- import mimetypes
- for extension, type in mimetypes.types_map.iteritems():
- print "types[\"%s\"] = \"%s\";" % (extension, type)
- '
- */
-
- types[".obj"] = "application/octet-stream";
- types[".ra"] = "audio/x-pn-realaudio";
- types[".wsdl"] = "application/xml";
- types[".dll"] = "application/octet-stream";
- types[".ras"] = "image/x-cmu-raster";
- types[".ram"] = "application/x-pn-realaudio";
- types[".bcpio"] = "application/x-bcpio";
- types[".sh"] = "application/x-sh";
- types[".m1v"] = "video/mpeg";
- types[".xwd"] = "image/x-xwindowdump";
- types[".doc"] = "application/msword";
- types[".bmp"] = "image/x-ms-bmp";
- types[".shar"] = "application/x-shar";
- types[".js"] = "application/x-javascript";
- types[".src"] = "application/x-wais-source";
- types[".dvi"] = "application/x-dvi";
- types[".aif"] = "audio/x-aiff";
- types[".ksh"] = "text/plain";
- types[".dot"] = "application/msword";
- types[".mht"] = "message/rfc822";
- types[".p12"] = "application/x-pkcs12";
- types[".css"] = "text/css";
- types[".csh"] = "application/x-csh";
- types[".pwz"] = "application/vnd.ms-powerpoint";
- types[".pdf"] = "application/pdf";
- types[".cdf"] = "application/x-netcdf";
- types[".pl"] = "text/plain";
- types[".ai"] = "application/postscript";
- types[".jpe"] = "image/jpeg";
- types[".jpg"] = "image/jpeg";
- types[".py"] = "text/x-python";
- types[".xml"] = "text/xml";
- types[".jpeg"] = "image/jpeg";
- types[".ps"] = "application/postscript";
- types[".gtar"] = "application/x-gtar";
- types[".xpm"] = "image/x-xpixmap";
- types[".hdf"] = "application/x-hdf";
- types[".nws"] = "message/rfc822";
- types[".tsv"] = "text/tab-separated-values";
- types[".xpdl"] = "application/xml";
- types[".p7c"] = "application/pkcs7-mime";
- types[".eps"] = "application/postscript";
- types[".ief"] = "image/ief";
- types[".so"] = "application/octet-stream";
- types[".xlb"] = "application/vnd.ms-excel";
- types[".pbm"] = "image/x-portable-bitmap";
- types[".texinfo"] = "application/x-texinfo";
- types[".xls"] = "application/vnd.ms-excel";
- types[".tex"] = "application/x-tex";
- types[".rtx"] = "text/richtext";
- types[".html"] = "text/html";
- types[".aiff"] = "audio/x-aiff";
- types[".aifc"] = "audio/x-aiff";
- types[".exe"] = "application/octet-stream";
- types[".sgm"] = "text/x-sgml";
- types[".tif"] = "image/tiff";
- types[".mpeg"] = "video/mpeg";
- types[".ustar"] = "application/x-ustar";
- types[".gif"] = "image/gif";
- types[".ppt"] = "application/vnd.ms-powerpoint";
- types[".pps"] = "application/vnd.ms-powerpoint";
- types[".sgml"] = "text/x-sgml";
- types[".ppm"] = "image/x-portable-pixmap";
- types[".latex"] = "application/x-latex";
- types[".bat"] = "text/plain";
- types[".mov"] = "video/quicktime";
- types[".ppa"] = "application/vnd.ms-powerpoint";
- types[".tr"] = "application/x-troff";
- types[".rdf"] = "application/xml";
- types[".xsl"] = "application/xml";
- types[".eml"] = "message/rfc822";
- types[".nc"] = "application/x-netcdf";
- types[".sv4cpio"] = "application/x-sv4cpio";
- types[".bin"] = "application/octet-stream";
- types[".h"] = "text/plain";
- types[".tcl"] = "application/x-tcl";
- types[".wiz"] = "application/msword";
- types[".o"] = "application/octet-stream";
- types[".a"] = "application/octet-stream";
- types[".c"] = "text/plain";
- types[".wav"] = "audio/x-wav";
- types[".vcf"] = "text/x-vcard";
- types[".xbm"] = "image/x-xbitmap";
- types[".txt"] = "text/plain";
- types[".au"] = "audio/basic";
- types[".t"] = "application/x-troff";
- types[".tiff"] = "image/tiff";
- types[".texi"] = "application/x-texinfo";
- types[".oda"] = "application/oda";
- types[".ms"] = "application/x-troff-ms";
- types[".rgb"] = "image/x-rgb";
- types[".me"] = "application/x-troff-me";
- types[".sv4crc"] = "application/x-sv4crc";
- types[".qt"] = "video/quicktime";
- types[".mpa"] = "video/mpeg";
- types[".mpg"] = "video/mpeg";
- types[".mpe"] = "video/mpeg";
- types[".avi"] = "video/x-msvideo";
- types[".pgm"] = "image/x-portable-graymap";
- types[".pot"] = "application/vnd.ms-powerpoint";
- types[".mif"] = "application/x-mif";
- types[".roff"] = "application/x-troff";
- types[".htm"] = "text/html";
- types[".man"] = "application/x-troff-man";
- types[".etx"] = "text/x-setext";
- types[".zip"] = "application/zip";
- types[".movie"] = "video/x-sgi-movie";
- types[".pyc"] = "application/x-python-code";
- types[".png"] = "image/png";
- types[".pfx"] = "application/x-pkcs12";
- types[".mhtml"] = "message/rfc822";
- types[".tar"] = "application/x-tar";
- types[".pnm"] = "image/x-portable-anymap";
- types[".pyo"] = "application/x-python-code";
- types[".snd"] = "audio/basic";
- types[".cpio"] = "application/x-cpio";
- types[".swf"] = "application/x-shockwave-flash";
- types[".mp3"] = "audio/mpeg";
- types[".mp2"] = "audio/mpeg";
- types[".mp4"] = "video/mp4";
-}
+void initialize();
} // namespace mime {
} // namespace process {
http://git-wip-us.apache.org/repos/asf/mesos/blob/daf291b6/3rdparty/libprocess/src/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/CMakeLists.txt b/3rdparty/libprocess/src/CMakeLists.txt
index a815a6b..60f0e76 100644
--- a/3rdparty/libprocess/src/CMakeLists.txt
+++ b/3rdparty/libprocess/src/CMakeLists.txt
@@ -47,6 +47,7 @@ set(PROCESS_SRC
latch.cpp
logging.cpp
metrics/metrics.cpp
+ mime.cpp
pid.cpp
poll_socket.cpp
poll_socket.hpp
http://git-wip-us.apache.org/repos/asf/mesos/blob/daf291b6/3rdparty/libprocess/src/mime.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/mime.cpp b/3rdparty/libprocess/src/mime.cpp
new file mode 100644
index 0000000..304d6ce
--- /dev/null
+++ b/3rdparty/libprocess/src/mime.cpp
@@ -0,0 +1,154 @@
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License
+
+#include <process/mime.hpp>
+
+namespace process {
+namespace mime {
+
+void initialize()
+{
+ // These MIME types were collected via:
+ /*
+ python -c '
+ import mimetypes
+ for extension, type in mimetypes.types_map.iteritems():
+ print "types[\"%s\"] = \"%s\";" % (extension, type)
+ '
+ */
+
+ types.insert({
+ {".obj", "application/octet-stream"},
+ {".ra", "audio/x-pn-realaudio"},
+ {".wsdl", "application/xml"},
+ {".dll", "application/octet-stream"},
+ {".ras", "image/x-cmu-raster"},
+ {".ram", "application/x-pn-realaudio"},
+ {".bcpio", "application/x-bcpio"},
+ {".sh", "application/x-sh"},
+ {".m1v", "video/mpeg"},
+ {".xwd", "image/x-xwindowdump"},
+ {".doc", "application/msword"},
+ {".bmp", "image/x-ms-bmp"},
+ {".shar", "application/x-shar"},
+ {".js", "application/x-javascript"},
+ {".src", "application/x-wais-source"},
+ {".dvi", "application/x-dvi"},
+ {".aif", "audio/x-aiff"},
+ {".ksh", "text/plain"},
+ {".dot", "application/msword"},
+ {".mht", "message/rfc822"},
+ {".p12", "application/x-pkcs12"},
+ {".css", "text/css"},
+ {".csh", "application/x-csh"},
+ {".pwz", "application/vnd.ms-powerpoint"},
+ {".pdf", "application/pdf"},
+ {".cdf", "application/x-netcdf"},
+ {".pl", "text/plain"},
+ {".ai", "application/postscript"},
+ {".jpe", "image/jpeg"},
+ {".jpg", "image/jpeg"},
+ {".py", "text/x-python"},
+ {".xml", "text/xml"},
+ {".jpeg", "image/jpeg"},
+ {".ps", "application/postscript"},
+ {".gtar", "application/x-gtar"},
+ {".xpm", "image/x-xpixmap"},
+ {".hdf", "application/x-hdf"},
+ {".nws", "message/rfc822"},
+ {".tsv", "text/tab-separated-values"},
+ {".xpdl", "application/xml"},
+ {".p7c", "application/pkcs7-mime"},
+ {".eps", "application/postscript"},
+ {".ief", "image/ief"},
+ {".so", "application/octet-stream"},
+ {".xlb", "application/vnd.ms-excel"},
+ {".pbm", "image/x-portable-bitmap"},
+ {".texinfo", "application/x-texinfo"},
+ {".xls", "application/vnd.ms-excel"},
+ {".tex", "application/x-tex"},
+ {".rtx", "text/richtext"},
+ {".html", "text/html"},
+ {".aiff", "audio/x-aiff"},
+ {".aifc", "audio/x-aiff"},
+ {".exe", "application/octet-stream"},
+ {".sgm", "text/x-sgml"},
+ {".tif", "image/tiff"},
+ {".mpeg", "video/mpeg"},
+ {".ustar", "application/x-ustar"},
+ {".gif", "image/gif"},
+ {".ppt", "application/vnd.ms-powerpoint"},
+ {".pps", "application/vnd.ms-powerpoint"},
+ {".sgml", "text/x-sgml"},
+ {".ppm", "image/x-portable-pixmap"},
+ {".latex", "application/x-latex"},
+ {".bat", "text/plain"},
+ {".mov", "video/quicktime"},
+ {".ppa", "application/vnd.ms-powerpoint"},
+ {".tr", "application/x-troff"},
+ {".rdf", "application/xml"},
+ {".xsl", "application/xml"},
+ {".eml", "message/rfc822"},
+ {".nc", "application/x-netcdf"},
+ {".sv4cpio", "application/x-sv4cpio"},
+ {".bin", "application/octet-stream"},
+ {".h", "text/plain"},
+ {".tcl", "application/x-tcl"},
+ {".wiz", "application/msword"},
+ {".o", "application/octet-stream"},
+ {".a", "application/octet-stream"},
+ {".c", "text/plain"},
+ {".wav", "audio/x-wav"},
+ {".vcf", "text/x-vcard"},
+ {".xbm", "image/x-xbitmap"},
+ {".txt", "text/plain"},
+ {".au", "audio/basic"},
+ {".t", "application/x-troff"},
+ {".tiff", "image/tiff"},
+ {".texi", "application/x-texinfo"},
+ {".oda", "application/oda"},
+ {".ms", "application/x-troff-ms"},
+ {".rgb", "image/x-rgb"},
+ {".me", "application/x-troff-me"},
+ {".sv4crc", "application/x-sv4crc"},
+ {".qt", "video/quicktime"},
+ {".mpa", "video/mpeg"},
+ {".mpg", "video/mpeg"},
+ {".mpe", "video/mpeg"},
+ {".avi", "video/x-msvideo"},
+ {".pgm", "image/x-portable-graymap"},
+ {".pot", "application/vnd.ms-powerpoint"},
+ {".mif", "application/x-mif"},
+ {".roff", "application/x-troff"},
+ {".htm", "text/html"},
+ {".man", "application/x-troff-man"},
+ {".etx", "text/x-setext"},
+ {".zip", "application/zip"},
+ {".movie", "video/x-sgi-movie"},
+ {".pyc", "application/x-python-code"},
+ {".png", "image/png"},
+ {".pfx", "application/x-pkcs12"},
+ {".mhtml", "message/rfc822"},
+ {".tar", "application/x-tar"},
+ {".pnm", "image/x-portable-anymap"},
+ {".pyo", "application/x-python-code"},
+ {".snd", "audio/basic"},
+ {".cpio", "application/x-cpio"},
+ {".swf", "application/x-shockwave-flash"},
+ {".mp3", "audio/mpeg"},
+ {".mp2", "audio/mpeg"},
+ {".mp4", "video/mp4"},
+ });
+}
+
+} // namespace mime {
+} // namespace process {