diff --git a/Gopkg.lock b/Gopkg.lock
index e557805..317af80 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -17,7 +17,7 @@
branch = "master"
name = "github.com/cjbassi/termui"
packages = ["."]
- revision = "d8e7d6f2c53c6f045c1d95c9fa9968e4d2ba569e"
+ revision = "caeddf326ed4eb0a443f865b619d49baefd552fa"
[[projects]]
branch = "master"
@@ -47,6 +47,7 @@
revision = "e2050e41c8847748ec5288741c0b19a8cb26d084"
[[projects]]
+ branch = "master"
name = "github.com/shirou/gopsutil"
packages = [
"cpu",
@@ -57,8 +58,7 @@
"net",
"process"
]
- revision = "5776ff9c7c5d063d574ef53d740f75c68b448e53"
- version = "v2.18.02"
+ revision = "cd915bdc31582b0a56405ede7fa2f4ab043f851b"
[[projects]]
branch = "master"
@@ -78,6 +78,6 @@
[solve-meta]
analyzer-name = "dep"
analyzer-version = 1
- inputs-digest = "22a656ce826eed217bf58555e692a26e2d791e256a6f17b8b06b9c964bb30f11"
+ inputs-digest = "ec71ab41237638295a9293629386692d305ad3a4d80090ff43bba530e0f9af42"
solver-name = "gps-cdcl"
solver-version = 1
diff --git a/Gopkg.toml b/Gopkg.toml
index 817f8fd..b2bd426 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -7,9 +7,13 @@
name = "github.com/docopt/docopt-go"
[[constraint]]
+ branch = "master"
name = "github.com/shirou/gopsutil"
- version = "2.18.2"
[prune]
go-tests = true
unused-packages = true
+
+[[prune.project]]
+ name = "github.com/shirou/gopsutil"
+ unused-packages = false
diff --git a/vendor/github.com/cjbassi/termui/LICENSE b/vendor/github.com/cjbassi/termui/LICENSE
index 91454dd..dbbe355 100644
--- a/vendor/github.com/cjbassi/termui/LICENSE
+++ b/vendor/github.com/cjbassi/termui/LICENSE
@@ -1,21 +1,661 @@
-MIT License
+ GNU AFFERO GENERAL PUBLIC LICENSE
+ Version 3, 19 November 2007
-Copyright (c) 2018 Caleb Bassi
+ Copyright (C) 2007 Free Software Foundation, Inc.
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+ Preamble
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+ The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+ A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate. Many developers of free software are heartened and
+encouraged by the resulting cooperation. However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+ The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community. It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server. Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+ An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals. This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU Affero General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Remote Network Interaction; Use with the GNU General Public License.
+
+ Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software. This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time. Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+
+ Copyright (C)
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published
+ by the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see .
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source. For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code. There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+.
diff --git a/vendor/github.com/cjbassi/termui/README.md b/vendor/github.com/cjbassi/termui/README.md
index 306f6a7..5201197 100644
--- a/vendor/github.com/cjbassi/termui/README.md
+++ b/vendor/github.com/cjbassi/termui/README.md
@@ -1,5 +1,20 @@
# termui
-A fork of [gizak](https://github.com/gizak/termui) with a lot of codebase improvements.
+A fork of [termui](https://github.com/gizak/termui) with a lot of code cleanup and (frequently asked for) improvements.
You can see an implementation/example usage of this library [here](https://github.com/cjbassi/gotop).
+
+Some usage improvements include:
+* better event/keypress names
+* more convenient event handling function
+* 256 colors
+* better grid system
+* linegraph uses [drawille-go](https://github.com/exrook/drawille-go)
+ * no longer have to choose between dot mode and braille mode; uses a superior braille mode
+* table supports mouse and keyboard navigation
+* more powerful table column width sizing
+* visual improvements to linegraph and table
+
+TODO:
+* readd widgets that were removed like the list and bargraph
+* focusable widgets
diff --git a/vendor/github.com/shirou/gopsutil/.gitignore b/vendor/github.com/shirou/gopsutil/.gitignore
new file mode 100644
index 0000000..d2b87e8
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/.gitignore
@@ -0,0 +1,5 @@
+*~
+#*
+_obj
+*.tmp
+.idea
diff --git a/vendor/github.com/shirou/gopsutil/Makefile b/vendor/github.com/shirou/gopsutil/Makefile
new file mode 100644
index 0000000..83dabed
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/Makefile
@@ -0,0 +1,33 @@
+.PHONY: help check
+.DEFAULT_GOAL := help
+
+SUBPKGS=cpu disk docker host internal load mem net process
+
+help: ## Show help
+ @grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
+
+check: ## Check
+ errcheck -ignore="Close|Run|Write" ./...
+ golint ./... | egrep -v 'underscores|HttpOnly|should have comment|comment on exported|CamelCase|VM|UID' && exit 1 || exit 0
+
+BUILD_FAIL_PATTERN=grep -v "exec format error" | grep "build failed" && exit 1 || exit 0
+build_test: ## test only buildable
+ # Supported operating systems
+ GOOS=linux GOARCH=amd64 go test ./... | $(BUILD_FAIL_PATTERN)
+ GOOS=linux GOARCH=386 go test ./... | $(BUILD_FAIL_PATTERN)
+ GOOS=linux GOARCH=arm go test ./... | $(BUILD_FAIL_PATTERN)
+ GOOS=linux GOARCH=arm64 go test ./... | $(BUILD_FAIL_PATTERN)
+ GOOS=freebsd go test ./... | $(BUILD_FAIL_PATTERN)
+ CGO_ENABLED=0 GOOS=darwin go test ./... | $(BUILD_FAIL_PATTERN)
+ GOOS=windows go test ./... | $(BUILD_FAIL_PATTERN)
+ # Operating systems supported for building only (not implemented error if used)
+ GOOS=solaris go test ./... | $(BUILD_FAIL_PATTERN)
+ GOOS=dragonfly go test ./... | $(BUILD_FAIL_PATTERN)
+ GOOS=netbsd go test ./... | $(BUILD_FAIL_PATTERN)
+ # cross build to OpenBSD not worked since process has "C"
+# GOOS=openbsd go test ./... | $(BUILD_FAIL_PATTERN)
+
+ifeq ($(shell uname -s), Darwin)
+ CGO_ENABLED=1 GOOS=darwin go test ./... | $(BUILD_FAIL_PATTERN)
+endif
+ @echo 'Successfully built on all known operating systems'
diff --git a/vendor/github.com/shirou/gopsutil/README.rst b/vendor/github.com/shirou/gopsutil/README.rst
new file mode 100644
index 0000000..bc4614f
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/README.rst
@@ -0,0 +1,318 @@
+gopsutil: psutil for golang
+==============================
+
+.. image:: https://circleci.com/gh/shirou/gopsutil.svg?&style=shield
+ :target: https://circleci.com/gh/shirou/gopsutil
+
+.. image:: https://coveralls.io/repos/shirou/gopsutil/badge.svg?branch=master
+ :target: https://coveralls.io/r/shirou/gopsutil?branch=master
+
+.. image:: https://godoc.org/github.com/shirou/gopsutil?status.svg
+ :target: http://godoc.org/github.com/shirou/gopsutil
+
+This is a port of psutil (https://github.com/giampaolo/psutil). The challenge is porting all
+psutil functions on some architectures.
+
+
+Breaking Changes! golang 1.8 is required
+-------------------------------------------
+
+After v2.17.04, golang 1.8 is required to build.
+
+
+Tag semantics
+-------------------------
+
+gopsutil tag policy is almost same as Semantic Versioning, but automatically increase like Ubuntu versioning.
+
+for example, `v2.17.04` means
+
+- v2: major version
+- 17: release year, 2017
+- 04: release month
+
+gopsutil aims to keep backwards-compatiblity until major version change.
+
+Taged at every end of month, but there are only a few commits, it can be skipped.
+
+
+Available Architectures
+------------------------------------
+
+- FreeBSD i386/amd64/arm
+- Linux i386/amd64/arm(raspberry pi)
+- Windows/amd64
+- Darwin i386/amd64
+- OpenBSD amd64 (Thank you @mpfz0r!)
+- Solaris amd64 (developed and tested on SmartOS/Illumos, Thank you @jen20!)
+
+All works are implemented without cgo by porting c struct to golang struct.
+
+
+Usage
+---------
+
+Note: gopsutil v2 breaks compatibility. If you want to stay with compatibility, please use v1 branch and vendoring.
+
+.. code:: go
+
+ package main
+
+ import (
+ "fmt"
+
+ "github.com/shirou/gopsutil/mem"
+ )
+
+ func main() {
+ v, _ := mem.VirtualMemory()
+
+ // almost every return value is a struct
+ fmt.Printf("Total: %v, Free:%v, UsedPercent:%f%%\n", v.Total, v.Free, v.UsedPercent)
+
+ // convert to JSON. String() is also implemented
+ fmt.Println(v)
+ }
+
+The output is below.
+
+::
+
+ Total: 3179569152, Free:284233728, UsedPercent:84.508194%
+ {"total":3179569152,"available":492572672,"used":2895335424,"usedPercent":84.50819439828305, (snip...)}
+
+You can set an alternative location to :code:`/proc` by setting the :code:`HOST_PROC` environment variable.
+
+You can set an alternative location to :code:`/sys` by setting the :code:`HOST_SYS` environment variable.
+
+You can set an alternative location to :code:`/etc` by setting the :code:`HOST_ETC` environment variable.
+
+You can set an alternative location to :code:`/var` by setting the :code:`HOST_VAR` environment variable.
+
+Documentation
+------------------------
+
+see http://godoc.org/github.com/shirou/gopsutil
+
+Requirements
+-----------------
+
+- go1.7 or above is required.
+
+
+More Info
+--------------------
+
+Several methods have been added which are not present in psutil, but will provide useful information.
+
+- host/HostInfo() (linux)
+
+ - Hostname
+ - Uptime
+ - Procs
+ - OS (ex: "linux")
+ - Platform (ex: "ubuntu", "arch")
+ - PlatformFamily (ex: "debian")
+ - PlatformVersion (ex: "Ubuntu 13.10")
+ - VirtualizationSystem (ex: "LXC")
+ - VirtualizationRole (ex: "guest"/"host")
+
+- cpu/CPUInfo() (linux, freebsd)
+
+ - CPU (ex: 0, 1, ...)
+ - VendorID (ex: "GenuineIntel")
+ - Family
+ - Model
+ - Stepping
+ - PhysicalID
+ - CoreID
+ - Cores (ex: 2)
+ - ModelName (ex: "Intel(R) Core(TM) i7-2640M CPU @ 2.80GHz")
+ - Mhz
+ - CacheSize
+ - Flags (ex: "fpu vme de pse tsc msr pae mce cx8 ...")
+ - Microcode
+
+- load/LoadAvg() (linux, freebsd)
+
+ - Load1
+ - Load5
+ - Load15
+
+- docker/GetDockerIDList() (linux only)
+
+ - container id list ([]string)
+
+- docker/CgroupCPU() (linux only)
+
+ - user
+ - system
+
+- docker/CgroupMem() (linux only)
+
+ - various status
+
+- net_protocols (linux only)
+
+ - system wide stats on network protocols (i.e IP, TCP, UDP, etc.)
+ - sourced from /proc/net/snmp
+
+- iptables nf_conntrack (linux only)
+
+ - system wide stats on netfilter conntrack module
+ - sourced from /proc/sys/net/netfilter/nf_conntrack_count
+
+Some codes are ported from Ohai. many thanks.
+
+
+Current Status
+------------------
+
+- x: work
+- b: almost works, but something is broken
+
+=================== ====== ======= ======= ====== ======= =======
+name Linux FreeBSD OpenBSD MacOSX Windows Solaris
+cpu_times x x x x x
+cpu_count x x x x x
+cpu_percent x x x x x
+cpu_times_percent x x x x x
+virtual_memory x x x x x b
+swap_memory x x x x
+disk_partitions x x x x x
+disk_io_counters x x x
+disk_usage x x x x x
+net_io_counters x x x b x
+boot_time x x x x x
+users x x x x x
+pids x x x x x
+pid_exists x x x x x
+net_connections x x x
+net_protocols x
+net_if_addrs
+net_if_stats
+netfilter_conntrack x
+=================== ====== ======= ======= ====== =======
+
+Process class
+^^^^^^^^^^^^^^^
+
+================ ===== ======= ======= ====== =======
+name Linux FreeBSD OpenBSD MacOSX Windows
+pid x x x x x
+ppid x x x x x
+name x x x x x
+cmdline x x x x
+create_time x x
+status x x x x
+cwd x
+exe x x x x
+uids x x x x
+gids x x x x
+terminal x x x x
+io_counters x x x x
+nice x x x x x
+num_fds x
+num_ctx_switches x
+num_threads x x x x x
+cpu_times x x
+memory_info x x x x x
+memory_info_ex x
+memory_maps x
+open_files x
+send_signal x x x x
+suspend x x x x
+resume x x x x
+terminate x x x x x
+kill x x x x
+username x x x x x
+ionice
+rlimit x
+num_handlers
+threads x
+cpu_percent x x x
+cpu_affinity
+memory_percent
+parent x x x x
+children x x x x x
+connections x x x
+is_running
+================ ===== ======= ======= ====== =======
+
+Original Metrics
+^^^^^^^^^^^^^^^^^^^
+
+================== ===== ======= ======= ====== ======= =======
+item Linux FreeBSD OpenBSD MacOSX Windows Solaris
+**HostInfo**
+hostname x x x x x x
+ uptime x x x x x
+ proces x x x x
+ os x x x x x x
+ platform x x x x x
+ platformfamily x x x x x
+ virtualization x
+**CPU**
+ VendorID x x x x x x
+ Family x x x x x x
+ Model x x x x x x
+ Stepping x x x x x x
+ PhysicalID x x
+ CoreID x x
+ Cores x x x
+ ModelName x x x x x x
+ Microcode x x
+**LoadAvg**
+ Load1 x x x x
+ Load5 x x x x
+ Load15 x x x x
+**GetDockerID**
+ container id x no no no no
+**CgroupsCPU**
+ user x no no no no
+ system x no no no no
+**CgroupsMem**
+ various x no no no no
+================== ===== ======= ======= ====== ======= =======
+
+- future work
+
+ - process_iter
+ - wait_procs
+ - Process class
+
+ - as_dict
+ - wait
+
+
+License
+------------
+
+New BSD License (same as psutil)
+
+
+Related Works
+-----------------------
+
+I have been influenced by the following great works:
+
+- psutil: https://github.com/giampaolo/psutil
+- dstat: https://github.com/dagwieers/dstat
+- gosigar: https://github.com/cloudfoundry/gosigar/
+- goprocinfo: https://github.com/c9s/goprocinfo
+- go-ps: https://github.com/mitchellh/go-ps
+- ohai: https://github.com/opscode/ohai/
+- bosun: https://github.com/bosun-monitor/bosun/tree/master/cmd/scollector/collectors
+- mackerel: https://github.com/mackerelio/mackerel-agent/tree/master/metrics
+
+How to Contribute
+---------------------------
+
+1. Fork it
+2. Create your feature branch (git checkout -b my-new-feature)
+3. Commit your changes (git commit -am 'Add some feature')
+4. Push to the branch (git push origin my-new-feature)
+5. Create new Pull Request
+
+My English is terrible, so documentation or correcting comments are also
+welcome.
diff --git a/vendor/github.com/shirou/gopsutil/circle.yml b/vendor/github.com/shirou/gopsutil/circle.yml
new file mode 100644
index 0000000..541cded
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/circle.yml
@@ -0,0 +1,13 @@
+machine:
+ timezone:
+ Asia/Tokyo
+ pre:
+ - sudo chown -R ubuntu:ubuntu /usr/local/go/pkg/
+test:
+ override:
+ - GOOS=linux GOARCH=amd64 go test -v ./...
+ - GOOS=linux GOARCH=386 go get -v ./...
+ - GOOS=linux GOARCH=arm GOARM=7 go get -v ./...
+ - GOOS=freebsd GOARCH=amd64 go get -v ./...
+ - GOOS=windows GOARCH=amd64 go get -v ./...
+ - GOOS=darwin GOARCH=amd64 go get -v ./...
diff --git a/vendor/github.com/shirou/gopsutil/coverall.sh b/vendor/github.com/shirou/gopsutil/coverall.sh
new file mode 100644
index 0000000..35aa298
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/coverall.sh
@@ -0,0 +1,26 @@
+#/bin/sh
+
+# see http://www.songmu.jp/riji/entry/2015-01-15-goveralls-multi-package.html
+
+set -e
+# cleanup
+cleanup() {
+ if [ $tmpprof != "" ] && [ -f $tmpprof ]; then
+ rm -f $tmpprof
+ fi
+ exit
+}
+trap cleanup INT QUIT TERM EXIT
+
+# メインの処理
+prof=${1:-".profile.cov"}
+echo "mode: count" > $prof
+gopath1=$(echo $GOPATH | cut -d: -f1)
+for pkg in $(go list ./...); do
+ tmpprof=$gopath1/src/$pkg/profile.tmp
+ go test -covermode=count -coverprofile=$tmpprof $pkg
+ if [ -f $tmpprof ]; then
+ cat $tmpprof | tail -n +2 >> $prof
+ rm $tmpprof
+ fi
+done
diff --git a/vendor/github.com/shirou/gopsutil/cpu/cpu.go b/vendor/github.com/shirou/gopsutil/cpu/cpu.go
index 049869e..ceaf77f 100644
--- a/vendor/github.com/shirou/gopsutil/cpu/cpu.go
+++ b/vendor/github.com/shirou/gopsutil/cpu/cpu.go
@@ -54,10 +54,9 @@ type lastPercent struct {
}
var lastCPUPercent lastPercent
-var invoke common.Invoker
+var invoke common.Invoker = common.Invoke{}
func init() {
- invoke = common.Invoke{}
lastCPUPercent.Lock()
lastCPUPercent.lastCPUTimes, _ = Times(false)
lastCPUPercent.lastPerCPUTimes, _ = Times(true)
diff --git a/vendor/github.com/shirou/gopsutil/cpu/cpu_darwin.go b/vendor/github.com/shirou/gopsutil/cpu/cpu_darwin.go
index 001517e..74d2737 100644
--- a/vendor/github.com/shirou/gopsutil/cpu/cpu_darwin.go
+++ b/vendor/github.com/shirou/gopsutil/cpu/cpu_darwin.go
@@ -45,7 +45,7 @@ func InfoWithContext(ctx context.Context) ([]InfoStat, error) {
if err != nil {
return ret, err
}
- out, err := invoke.Command(sysctl, "machdep.cpu")
+ out, err := invoke.CommandWithContext(ctx, sysctl, "machdep.cpu")
if err != nil {
return ret, err
}
@@ -99,7 +99,7 @@ func InfoWithContext(ctx context.Context) ([]InfoStat, error) {
// Use the rated frequency of the CPU. This is a static value and does not
// account for low power or Turbo Boost modes.
- out, err = invoke.Command(sysctl, "hw.cpufrequency")
+ out, err = invoke.CommandWithContext(ctx, sysctl, "hw.cpufrequency")
if err != nil {
return ret, err
}
diff --git a/vendor/github.com/shirou/gopsutil/cpu/cpu_linux.go b/vendor/github.com/shirou/gopsutil/cpu/cpu_linux.go
index 0f3d928..23b0952 100644
--- a/vendor/github.com/shirou/gopsutil/cpu/cpu_linux.go
+++ b/vendor/github.com/shirou/gopsutil/cpu/cpu_linux.go
@@ -20,7 +20,7 @@ func init() {
if err != nil {
return
}
- out, err := invoke.Command(getconf, "CLK_TCK")
+ out, err := invoke.CommandWithContext(context.Background(), getconf, "CLK_TCK")
// ignore errors
if err == nil {
i, err := strconv.ParseFloat(strings.TrimSpace(string(out)), 64)
diff --git a/vendor/github.com/shirou/gopsutil/cpu/cpu_solaris.go b/vendor/github.com/shirou/gopsutil/cpu/cpu_solaris.go
index 0899f41..117fd90 100644
--- a/vendor/github.com/shirou/gopsutil/cpu/cpu_solaris.go
+++ b/vendor/github.com/shirou/gopsutil/cpu/cpu_solaris.go
@@ -47,7 +47,7 @@ func InfoWithContext(ctx context.Context) ([]InfoStat, error) {
if err != nil {
return nil, fmt.Errorf("cannot find psrinfo: %s", err)
}
- psrInfoOut, err := invoke.Command(psrInfo, "-p", "-v")
+ psrInfoOut, err := invoke.CommandWithContext(ctx, psrInfo, "-p", "-v")
if err != nil {
return nil, fmt.Errorf("cannot execute psrinfo: %s", err)
}
@@ -56,7 +56,7 @@ func InfoWithContext(ctx context.Context) ([]InfoStat, error) {
if err != nil {
return nil, fmt.Errorf("cannot find isainfo: %s", err)
}
- isaInfoOut, err := invoke.Command(isaInfo, "-b", "-v")
+ isaInfoOut, err := invoke.CommandWithContext(ctx, isaInfo, "-b", "-v")
if err != nil {
return nil, fmt.Errorf("cannot execute isainfo: %s", err)
}
diff --git a/vendor/github.com/shirou/gopsutil/cpu/testdata/freebsd/1cpu_2core.txt b/vendor/github.com/shirou/gopsutil/cpu/testdata/freebsd/1cpu_2core.txt
new file mode 100644
index 0000000..a5d9fec
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/cpu/testdata/freebsd/1cpu_2core.txt
@@ -0,0 +1,43 @@
+Copyright (c) 1992-2016 The FreeBSD Project.
+Copyright (c) 1979, 1980, 1983, 1986, 1988, 1989, 1991, 1992, 1993, 1994
+ The Regents of the University of California. All rights reserved.
+FreeBSD is a registered trademark of The FreeBSD Foundation.
+FreeBSD 11.0-RELEASE-p2 #0: Mon Oct 24 06:55:27 UTC 2016
+ root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC amd64
+FreeBSD clang version 3.8.0 (tags/RELEASE_380/final 262564) (based on LLVM 3.8.0)
+VT(vga): resolution 640x480
+CPU: Intel(R) Core(TM) i3 CPU 550 @ 3.20GHz (3192.07-MHz K8-class CPU)
+ Origin="GenuineIntel" Id=0x20655 Family=0x6 Model=0x25 Stepping=5
+ Features=0xbfebfbff
+ Features2=0x9ae3bd
+ AMD Features=0x28100800
+ AMD Features2=0x1
+ VT-x: PAT,HLT,MTF,PAUSE,EPT,UG,VPID
+ TSC: P-state invariant, performance statistics
+real memory = 8589934592 (8192 MB)
+avail memory = 8046452736 (7673 MB)
+Event timer "LAPIC" quality 600
+ACPI APIC Table:
+FreeBSD/SMP: Multiprocessor System Detected: 4 CPUs
+FreeBSD/SMP: 1 package(s) x 2 core(s) x 2 hardware threads
+random: unblocking device.
+ioapic0 irqs 0-23 on motherboard
+random: entropy device external interface
+kbd1 at kbdmux0
+netmap: loaded module
+module_register_init: MOD_LOAD (vesa, 0xffffffff8101c970, 0) error 19
+vtvga0: on motherboard
+cryptosoft0: on motherboard
+aesni0: No AESNI support.
+acpi0: on motherboard
+acpi0: Power Button (fixed)
+cpu0: on acpi0
+ACPI BIOS Warning (bug): Incorrect checksum in table [SSDT] - 0x3F, should be 0x1F (20160527/tbprint-229)
+cpu1: on acpi0
+cpu2: on acpi0
+cpu3: on acpi0
+attimer0: port 0x40-0x43 irq 0 on acpi0
+Timecounter "i8254" frequency 1193182 Hz quality 0
+Event timer "i8254" frequency 1193182 Hz quality 100
+atrtc0: port 0x70-0x71 irq 8 on acpi0
+Event timer "RTC" frequency 32768 Hz quality 0
\ No newline at end of file
diff --git a/vendor/github.com/shirou/gopsutil/cpu/testdata/freebsd/1cpu_4core.txt b/vendor/github.com/shirou/gopsutil/cpu/testdata/freebsd/1cpu_4core.txt
new file mode 100644
index 0000000..2a49823
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/cpu/testdata/freebsd/1cpu_4core.txt
@@ -0,0 +1,38 @@
+Copyright (c) 1992-2016 The FreeBSD Project.
+Copyright (c) 1979, 1980, 1983, 1986, 1988, 1989, 1991, 1992, 1993, 1994
+ The Regents of the University of California. All rights reserved.
+FreeBSD is a registered trademark of The FreeBSD Foundation.
+FreeBSD 10.3-RELEASE-p4 #0: Sat May 28 12:23:44 UTC 2016
+ root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC amd64
+FreeBSD clang version 3.4.1 (tags/RELEASE_34/dot1-final 208032) 20140512
+CPU: Intel(R) Xeon(R) CPU E5-1620 v2 @ 3.70GHz (3700.09-MHz K8-class CPU)
+ Origin="GenuineIntel" Id=0x306e4 Family=0x6 Model=0x3e Stepping=4
+ Features=0xbfebfbff
+ Features2=0x7fbee3ff
+ AMD Features=0x2c100800
+ AMD Features2=0x1
+ Structured Extended Features=0x281
+ XSAVE Features=0x1
+ VT-x: PAT,HLT,MTF,PAUSE,EPT,UG,VPID,VID,PostIntr
+ TSC: P-state invariant, performance statistics
+real memory = 34368126976 (32776 MB)
+avail memory = 33228333056 (31689 MB)
+Event timer "LAPIC" quality 600
+ACPI APIC Table: < >
+FreeBSD/SMP: Multiprocessor System Detected: 8 CPUs
+FreeBSD/SMP: 1 package(s) x 4 core(s) x 2 SMT threads
+ cpu0 (BSP): APIC ID: 0
+ cpu1 (AP): APIC ID: 1
+ cpu2 (AP): APIC ID: 2
+ cpu3 (AP): APIC ID: 3
+ cpu4 (AP): APIC ID: 4
+ cpu5 (AP): APIC ID: 5
+ cpu6 (AP): APIC ID: 6
+ cpu7 (AP): APIC ID: 7
+random: initialized
+ioapic0 irqs 0-23 on motherboard
+ioapic1 irqs 24-47 on motherboard
+kbd1 at kbdmux0
+cryptosoft0: on motherboard
+aesni0: on motherboard
+acpi0: on motherboard
\ No newline at end of file
diff --git a/vendor/github.com/shirou/gopsutil/cpu/testdata/freebsd/2cpu_4core.txt b/vendor/github.com/shirou/gopsutil/cpu/testdata/freebsd/2cpu_4core.txt
new file mode 100644
index 0000000..b274cc4
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/cpu/testdata/freebsd/2cpu_4core.txt
@@ -0,0 +1,45 @@
+Copyright (c) 1992-2011 The FreeBSD Project.
+Copyright (c) 1979, 1980, 1983, 1986, 1988, 1989, 1991, 1992, 1993, 1994
+ The Regents of the University of California. All rights reserved.
+FreeBSD is a registered trademark of The FreeBSD Foundation.
+FreeBSD 8.2-RELEASE #1: Sat Mar 5 23:03:14 CET 2011
+ root@host1:/usr/obj/usr/src/sys/MYKERNEL amd64
+Timecounter "i8254" frequency 1193182 Hz quality 0
+CPU: Intel(R) Xeon(R) CPU E5420 @ 2.50GHz (2500.11-MHz K8-class CPU)
+ Origin = "GenuineIntel" Id = 0x10676 Family = 6 Model = 17 Stepping = 6
+ Features=0xbfebfbff
+ Features2=0xce3bd
+ AMD Features=0x20100800
+ AMD Features2=0x1
+ TSC: P-state invariant
+real memory = 17179869184 (16384 MB)
+avail memory = 16531587072 (15765 MB)
+ACPI APIC Table:
+FreeBSD/SMP: Multiprocessor System Detected: 8 CPUs
+FreeBSD/SMP: 2 package(s) x 4 core(s)
+ cpu0 (BSP): APIC ID: 0
+ cpu1 (AP): APIC ID: 1
+ cpu2 (AP): APIC ID: 2
+ cpu3 (AP): APIC ID: 3
+ cpu4 (AP): APIC ID: 4
+ cpu5 (AP): APIC ID: 5
+ cpu6 (AP): APIC ID: 6
+ cpu7 (AP): APIC ID: 7
+ioapic0 irqs 0-23 on motherboard
+ioapic1 irqs 24-47 on motherboard
+kbd1 at kbdmux0
+acpi0: on motherboard
+acpi0: [ITHREAD]
+acpi0: Power Button (fixed)
+unknown: I/O range not supported
+Timecounter "ACPI-fast" frequency 3579545 Hz quality 1000
+acpi_timer0: <24-bit timer at 3.579545MHz> port 0x1008-0x100b on acpi0
+cpu0: on acpi0
+cpu1: on acpi0
+cpu2: on acpi0
+cpu3: on acpi0
+cpu4: on acpi0
+cpu5: on acpi0
+cpu6: on acpi0
+cpu7: on acpi0
+pcib0: port 0xcf8-0xcff on acpi0
\ No newline at end of file
diff --git a/vendor/github.com/shirou/gopsutil/cpu/testdata/linux/424/proc/stat b/vendor/github.com/shirou/gopsutil/cpu/testdata/linux/424/proc/stat
new file mode 100644
index 0000000..cb7610c
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/cpu/testdata/linux/424/proc/stat
@@ -0,0 +1,12 @@
+cpu 23644 6695 4764 134931750 22115 0 473 5892 0 0
+cpu0 6418 888 1230 33730755 5043 0 4 1046 0 0
+cpu1 6858 4870 1632 33716510 12327 0 235 1765 0 0
+cpu2 4859 622 915 33742072 2312 0 25 1546 0 0
+cpu3 5507 314 986 33742411 2432 0 208 1534 0 0
+intr 32552791 35 9 0 0 2335 0 3 0 2 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3107077 2985327 15704 0 6672 0 3218027 3063711 11558 0 6151 0 2160633 2194945 15838 0 6565 0 1595129 2134446 15337 0 5715 0 157 112837 717318 710764 20 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+ctxt 41317767
+btime 1505515383
+processes 41562
+procs_running 1
+procs_blocked 0
+softirq 5433315 0 1644387 67542 1428221 0 0 12270 1573783 0 707112
\ No newline at end of file
diff --git a/vendor/github.com/shirou/gopsutil/cpu/testdata/linux/times_empty/proc/stat b/vendor/github.com/shirou/gopsutil/cpu/testdata/linux/times_empty/proc/stat
new file mode 100755
index 0000000..e69de29
diff --git a/vendor/github.com/shirou/gopsutil/cpu/testdata/solaris/1cpu_1core_isainfo.txt b/vendor/github.com/shirou/gopsutil/cpu/testdata/solaris/1cpu_1core_isainfo.txt
new file mode 100644
index 0000000..4a804df
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/cpu/testdata/solaris/1cpu_1core_isainfo.txt
@@ -0,0 +1,4 @@
+64-bit amd64 applications
+ rdseed adx avx2 fma bmi2 bmi1 rdrand f16c vmx avx xsave pclmulqdq
+ aes movbe sse4.2 sse4.1 ssse3 popcnt tscp cx16 sse3 sse2 sse fxsr
+ mmx cmov amd_sysc cx8 tsc fpu
\ No newline at end of file
diff --git a/vendor/github.com/shirou/gopsutil/cpu/testdata/solaris/1cpu_1core_psrinfo.txt b/vendor/github.com/shirou/gopsutil/cpu/testdata/solaris/1cpu_1core_psrinfo.txt
new file mode 100644
index 0000000..0daaabf
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/cpu/testdata/solaris/1cpu_1core_psrinfo.txt
@@ -0,0 +1,3 @@
+The physical processor has 1 virtual processor (0)
+ x86 (GenuineIntel 406E3 family 6 model 78 step 3 clock 3312 MHz)
+ Intel(r) Core(tm) i7-6567U CPU @ 3.30GHz
\ No newline at end of file
diff --git a/vendor/github.com/shirou/gopsutil/cpu/testdata/solaris/2cpu_1core_isainfo.txt b/vendor/github.com/shirou/gopsutil/cpu/testdata/solaris/2cpu_1core_isainfo.txt
new file mode 100644
index 0000000..4a804df
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/cpu/testdata/solaris/2cpu_1core_isainfo.txt
@@ -0,0 +1,4 @@
+64-bit amd64 applications
+ rdseed adx avx2 fma bmi2 bmi1 rdrand f16c vmx avx xsave pclmulqdq
+ aes movbe sse4.2 sse4.1 ssse3 popcnt tscp cx16 sse3 sse2 sse fxsr
+ mmx cmov amd_sysc cx8 tsc fpu
\ No newline at end of file
diff --git a/vendor/github.com/shirou/gopsutil/cpu/testdata/solaris/2cpu_1core_psrinfo.txt b/vendor/github.com/shirou/gopsutil/cpu/testdata/solaris/2cpu_1core_psrinfo.txt
new file mode 100644
index 0000000..1de8a17
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/cpu/testdata/solaris/2cpu_1core_psrinfo.txt
@@ -0,0 +1,6 @@
+The physical processor has 1 virtual processor (0)
+ x86 (GenuineIntel 406E3 family 6 model 78 step 3 clock 3312 MHz)
+ Intel(r) Core(tm) i7-6567U CPU @ 3.30GHz
+The physical processor has 1 virtual processor (1)
+ x86 (GenuineIntel 406E3 family 6 model 78 step 3 clock 3312 MHz)
+ Intel(r) Core(tm) i7-6567U CPU @ 3.30GHz
\ No newline at end of file
diff --git a/vendor/github.com/shirou/gopsutil/cpu/testdata/solaris/2cpu_8core_isainfo.txt b/vendor/github.com/shirou/gopsutil/cpu/testdata/solaris/2cpu_8core_isainfo.txt
new file mode 100644
index 0000000..d291ad3
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/cpu/testdata/solaris/2cpu_8core_isainfo.txt
@@ -0,0 +1,3 @@
+64-bit amd64 applications
+ vmx avx xsave pclmulqdq aes sse4.2 sse4.1 ssse3 popcnt tscp cx16
+ sse3 sse2 sse fxsr mmx cmov amd_sysc cx8 tsc fpu
\ No newline at end of file
diff --git a/vendor/github.com/shirou/gopsutil/cpu/testdata/solaris/2cpu_8core_psrinfo.txt b/vendor/github.com/shirou/gopsutil/cpu/testdata/solaris/2cpu_8core_psrinfo.txt
new file mode 100644
index 0000000..36b3998
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/cpu/testdata/solaris/2cpu_8core_psrinfo.txt
@@ -0,0 +1,22 @@
+The physical processor has 8 cores and 16 virtual processors (0-7 16-23)
+ The core has 2 virtual processors (0 16)
+ The core has 2 virtual processors (1 17)
+ The core has 2 virtual processors (2 18)
+ The core has 2 virtual processors (3 19)
+ The core has 2 virtual processors (4 20)
+ The core has 2 virtual processors (5 21)
+ The core has 2 virtual processors (6 22)
+ The core has 2 virtual processors (7 23)
+ x86 (GenuineIntel 206D7 family 6 model 45 step 7 clock 2600 MHz)
+ Intel(r) Xeon(r) CPU E5-2670 0 @ 2.60GHz
+The physical processor has 8 cores and 16 virtual processors (8-15 24-31)
+ The core has 2 virtual processors (8 24)
+ The core has 2 virtual processors (9 25)
+ The core has 2 virtual processors (10 26)
+ The core has 2 virtual processors (11 27)
+ The core has 2 virtual processors (12 28)
+ The core has 2 virtual processors (13 29)
+ The core has 2 virtual processors (14 30)
+ The core has 2 virtual processors (15 31)
+ x86 (GenuineIntel 206D7 family 6 model 45 step 7 clock 2600 MHz)
+ Intel(r) Xeon(r) CPU E5-2670 0 @ 2.60GHz
\ No newline at end of file
diff --git a/vendor/github.com/shirou/gopsutil/disk/disk.go b/vendor/github.com/shirou/gopsutil/disk/disk.go
index a2c4720..1c31047 100644
--- a/vendor/github.com/shirou/gopsutil/disk/disk.go
+++ b/vendor/github.com/shirou/gopsutil/disk/disk.go
@@ -6,11 +6,7 @@ import (
"github.com/shirou/gopsutil/internal/common"
)
-var invoke common.Invoker
-
-func init() {
- invoke = common.Invoke{}
-}
+var invoke common.Invoker = common.Invoke{}
type UsageStat struct {
Path string `json:"path"`
diff --git a/vendor/github.com/shirou/gopsutil/disk/disk_darwin.go b/vendor/github.com/shirou/gopsutil/disk/disk_darwin.go
index 82ffacb..f9fd09c 100644
--- a/vendor/github.com/shirou/gopsutil/disk/disk_darwin.go
+++ b/vendor/github.com/shirou/gopsutil/disk/disk_darwin.go
@@ -22,7 +22,7 @@ func PartitionsWithContext(ctx context.Context, all bool) ([]PartitionStat, erro
if err != nil {
return ret, err
}
- fs := make([]Statfs_t, count)
+ fs := make([]Statfs, count)
_, err = Getfsstat(fs, MntWait)
for _, stat := range fs {
opts := "rw"
@@ -92,16 +92,16 @@ func PartitionsWithContext(ctx context.Context, all bool) ([]PartitionStat, erro
return ret, nil
}
-func Getfsstat(buf []Statfs_t, flags int) (n int, err error) {
+func Getfsstat(buf []Statfs, flags int) (n int, err error) {
return GetfsstatWithContext(context.Background(), buf, flags)
}
-func GetfsstatWithContext(ctx context.Context, buf []Statfs_t, flags int) (n int, err error) {
+func GetfsstatWithContext(ctx context.Context, buf []Statfs, flags int) (n int, err error) {
var _p0 unsafe.Pointer
var bufsize uintptr
if len(buf) > 0 {
_p0 = unsafe.Pointer(&buf[0])
- bufsize = unsafe.Sizeof(Statfs_t{}) * uintptr(len(buf))
+ bufsize = unsafe.Sizeof(Statfs{}) * uintptr(len(buf))
}
r0, _, e1 := unix.Syscall(SYS_GETFSSTAT64, uintptr(_p0), bufsize, uintptr(flags))
n = int(r0)
diff --git a/vendor/github.com/shirou/gopsutil/disk/disk_darwin_386.go b/vendor/github.com/shirou/gopsutil/disk/disk_darwin_386.go
new file mode 100644
index 0000000..bd83a4a
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/disk/disk_darwin_386.go
@@ -0,0 +1,59 @@
+// +build darwin
+// +build 386
+
+package disk
+
+const (
+ MntWait = 1
+ MfsNameLen = 15 /* length of fs type name, not inc. nul */
+ MNameLen = 90 /* length of buffer for returned name */
+
+ MFSTYPENAMELEN = 16 /* length of fs type name including null */
+ MAXPATHLEN = 1024
+ MNAMELEN = MAXPATHLEN
+
+ SYS_GETFSSTAT64 = 347
+)
+
+type Fsid struct{ val [2]int32 } /* file system id type */
+type uid_t int32
+
+// sys/mount.h
+const (
+ MntReadOnly = 0x00000001 /* read only filesystem */
+ MntSynchronous = 0x00000002 /* filesystem written synchronously */
+ MntNoExec = 0x00000004 /* can't exec from filesystem */
+ MntNoSuid = 0x00000008 /* don't honor setuid bits on fs */
+ MntUnion = 0x00000020 /* union with underlying filesystem */
+ MntAsync = 0x00000040 /* filesystem written asynchronously */
+ MntSuidDir = 0x00100000 /* special handling of SUID on dirs */
+ MntSoftDep = 0x00200000 /* soft updates being done */
+ MntNoSymFollow = 0x00400000 /* do not follow symlinks */
+ MntGEOMJournal = 0x02000000 /* GEOM journal support enabled */
+ MntMultilabel = 0x04000000 /* MAC support for individual objects */
+ MntACLs = 0x08000000 /* ACL support enabled */
+ MntNoATime = 0x10000000 /* disable update of file access time */
+ MntClusterRead = 0x40000000 /* disable cluster read */
+ MntClusterWrite = 0x80000000 /* disable cluster write */
+ MntNFS4ACLs = 0x00000010
+)
+
+// https://github.com/golang/go/blob/master/src/syscall/ztypes_darwin_386.go#L82
+type Statfs struct {
+ Bsize uint32
+ Iosize int32
+ Blocks uint64
+ Bfree uint64
+ Bavail uint64
+ Files uint64
+ Ffree uint64
+ Fsid Fsid
+ Owner uint32
+ Type uint32
+ Flags uint32
+ Fssubtype uint32
+ Fstypename [16]int8
+ Mntonname [1024]int8
+ Mntfromname [1024]int8
+ Reserved [8]uint32
+}
diff --git a/vendor/github.com/shirou/gopsutil/disk/disk_darwin_amd64.go b/vendor/github.com/shirou/gopsutil/disk/disk_darwin_amd64.go
index f58e213..ec40a75 100644
--- a/vendor/github.com/shirou/gopsutil/disk/disk_darwin_amd64.go
+++ b/vendor/github.com/shirou/gopsutil/disk/disk_darwin_amd64.go
@@ -38,7 +38,7 @@ const (
MntNFS4ACLs = 0x00000010
)
-type Statfs_t struct {
+type Statfs struct {
Bsize uint32
Iosize int32
Blocks uint64
diff --git a/vendor/github.com/shirou/gopsutil/disk/disk_darwin_arm64.go b/vendor/github.com/shirou/gopsutil/disk/disk_darwin_arm64.go
index 52bcf4c..0e3f670 100644
--- a/vendor/github.com/shirou/gopsutil/disk/disk_darwin_arm64.go
+++ b/vendor/github.com/shirou/gopsutil/disk/disk_darwin_arm64.go
@@ -38,7 +38,7 @@ const (
MntNFS4ACLs = 0x00000010
)
-type Statfs_t struct {
+type Statfs struct {
Bsize uint32
Iosize int32
Blocks uint64
diff --git a/vendor/github.com/shirou/gopsutil/disk/disk_linux.go b/vendor/github.com/shirou/gopsutil/disk/disk_linux.go
index f5eb526..46904e3 100644
--- a/vendor/github.com/shirou/gopsutil/disk/disk_linux.go
+++ b/vendor/github.com/shirou/gopsutil/disk/disk_linux.go
@@ -388,7 +388,7 @@ func GetDiskSerialNumberWithContext(ctx context.Context, name string) string {
return ""
}
- out, err := invoke.Command(udevadm, "info", "--query=property", n)
+ out, err := invoke.CommandWithContext(ctx, udevadm, "info", "--query=property", n)
// does not return error, just an empty string
if err != nil {
diff --git a/vendor/github.com/shirou/gopsutil/doc.go b/vendor/github.com/shirou/gopsutil/doc.go
new file mode 100644
index 0000000..6a65fe2
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/doc.go
@@ -0,0 +1 @@
+package gopsutil
diff --git a/vendor/github.com/shirou/gopsutil/docker/docker.go b/vendor/github.com/shirou/gopsutil/docker/docker.go
new file mode 100644
index 0000000..76791c2
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/docker/docker.go
@@ -0,0 +1,66 @@
+package docker
+
+import (
+ "encoding/json"
+ "errors"
+
+ "github.com/shirou/gopsutil/internal/common"
+)
+
+var ErrDockerNotAvailable = errors.New("docker not available")
+var ErrCgroupNotAvailable = errors.New("cgroup not available")
+
+var invoke common.Invoker = common.Invoke{}
+
+type CgroupMemStat struct {
+ ContainerID string `json:"containerID"`
+ Cache uint64 `json:"cache"`
+ RSS uint64 `json:"rss"`
+ RSSHuge uint64 `json:"rssHuge"`
+ MappedFile uint64 `json:"mappedFile"`
+ Pgpgin uint64 `json:"pgpgin"`
+ Pgpgout uint64 `json:"pgpgout"`
+ Pgfault uint64 `json:"pgfault"`
+ Pgmajfault uint64 `json:"pgmajfault"`
+ InactiveAnon uint64 `json:"inactiveAnon"`
+ ActiveAnon uint64 `json:"activeAnon"`
+ InactiveFile uint64 `json:"inactiveFile"`
+ ActiveFile uint64 `json:"activeFile"`
+ Unevictable uint64 `json:"unevictable"`
+ HierarchicalMemoryLimit uint64 `json:"hierarchicalMemoryLimit"`
+ TotalCache uint64 `json:"totalCache"`
+ TotalRSS uint64 `json:"totalRss"`
+ TotalRSSHuge uint64 `json:"totalRssHuge"`
+ TotalMappedFile uint64 `json:"totalMappedFile"`
+ TotalPgpgIn uint64 `json:"totalPgpgin"`
+ TotalPgpgOut uint64 `json:"totalPgpgout"`
+ TotalPgFault uint64 `json:"totalPgfault"`
+ TotalPgMajFault uint64 `json:"totalPgmajfault"`
+ TotalInactiveAnon uint64 `json:"totalInactiveAnon"`
+ TotalActiveAnon uint64 `json:"totalActiveAnon"`
+ TotalInactiveFile uint64 `json:"totalInactiveFile"`
+ TotalActiveFile uint64 `json:"totalActiveFile"`
+ TotalUnevictable uint64 `json:"totalUnevictable"`
+ MemUsageInBytes uint64 `json:"memUsageInBytes"`
+ MemMaxUsageInBytes uint64 `json:"memMaxUsageInBytes"`
+ MemLimitInBytes uint64 `json:"memoryLimitInBbytes"`
+ MemFailCnt uint64 `json:"memoryFailcnt"`
+}
+
+func (m CgroupMemStat) String() string {
+ s, _ := json.Marshal(m)
+ return string(s)
+}
+
+type CgroupDockerStat struct {
+ ContainerID string `json:"containerID"`
+ Name string `json:"name"`
+ Image string `json:"image"`
+ Status string `json:"status"`
+ Running bool `json:"running"`
+}
+
+func (c CgroupDockerStat) String() string {
+ s, _ := json.Marshal(c)
+ return string(s)
+}
diff --git a/vendor/github.com/shirou/gopsutil/docker/docker_linux.go b/vendor/github.com/shirou/gopsutil/docker/docker_linux.go
new file mode 100644
index 0000000..4dcb477
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/docker/docker_linux.go
@@ -0,0 +1,268 @@
+// +build linux
+
+package docker
+
+import (
+ "context"
+ "fmt"
+ "os"
+ "os/exec"
+ "path"
+ "strconv"
+ "strings"
+
+ cpu "github.com/shirou/gopsutil/cpu"
+ "github.com/shirou/gopsutil/internal/common"
+)
+
+// GetDockerStat returns a list of Docker basic stats.
+// This requires certain permission.
+func GetDockerStat() ([]CgroupDockerStat, error) {
+ return GetDockerStatWithContext(context.Background())
+}
+
+func GetDockerStatWithContext(ctx context.Context) ([]CgroupDockerStat, error) {
+ path, err := exec.LookPath("docker")
+ if err != nil {
+ return nil, ErrDockerNotAvailable
+ }
+
+ out, err := invoke.CommandWithContext(ctx, path, "ps", "-a", "--no-trunc", "--format", "{{.ID}}|{{.Image}}|{{.Names}}|{{.Status}}")
+ if err != nil {
+ return []CgroupDockerStat{}, err
+ }
+ lines := strings.Split(string(out), "\n")
+ ret := make([]CgroupDockerStat, 0, len(lines))
+
+ for _, l := range lines {
+ if l == "" {
+ continue
+ }
+ cols := strings.Split(l, "|")
+ if len(cols) != 4 {
+ continue
+ }
+ names := strings.Split(cols[2], ",")
+ stat := CgroupDockerStat{
+ ContainerID: cols[0],
+ Name: names[0],
+ Image: cols[1],
+ Status: cols[3],
+ Running: strings.Contains(cols[3], "Up"),
+ }
+ ret = append(ret, stat)
+ }
+
+ return ret, nil
+}
+
+// GetDockerIDList returnes a list of DockerID.
+// This requires certain permission.
+func GetDockerIDList() ([]string, error) {
+ return GetDockerIDListWithContext(context.Background())
+}
+
+func GetDockerIDListWithContext(ctx context.Context) ([]string, error) {
+ path, err := exec.LookPath("docker")
+ if err != nil {
+ return nil, ErrDockerNotAvailable
+ }
+
+ out, err := invoke.CommandWithContext(ctx, path, "ps", "-q", "--no-trunc")
+ if err != nil {
+ return []string{}, err
+ }
+ lines := strings.Split(string(out), "\n")
+ ret := make([]string, 0, len(lines))
+
+ for _, l := range lines {
+ if l == "" {
+ continue
+ }
+ ret = append(ret, l)
+ }
+
+ return ret, nil
+}
+
+// CgroupCPU returnes specified cgroup id CPU status.
+// containerID is same as docker id if you use docker.
+// If you use container via systemd.slice, you could use
+// containerID = docker-.scope and base=/sys/fs/cgroup/cpuacct/system.slice/
+func CgroupCPU(containerID string, base string) (*cpu.TimesStat, error) {
+ return CgroupCPUWithContext(context.Background(), containerID, base)
+}
+
+func CgroupCPUWithContext(ctx context.Context, containerID string, base string) (*cpu.TimesStat, error) {
+ statfile := getCgroupFilePath(containerID, base, "cpuacct", "cpuacct.stat")
+ lines, err := common.ReadLines(statfile)
+ if err != nil {
+ return nil, err
+ }
+ // empty containerID means all cgroup
+ if len(containerID) == 0 {
+ containerID = "all"
+ }
+ ret := &cpu.TimesStat{CPU: containerID}
+ for _, line := range lines {
+ fields := strings.Split(line, " ")
+ if fields[0] == "user" {
+ user, err := strconv.ParseFloat(fields[1], 64)
+ if err == nil {
+ ret.User = float64(user)
+ }
+ }
+ if fields[0] == "system" {
+ system, err := strconv.ParseFloat(fields[1], 64)
+ if err == nil {
+ ret.System = float64(system)
+ }
+ }
+ }
+
+ return ret, nil
+}
+
+func CgroupCPUDocker(containerid string) (*cpu.TimesStat, error) {
+ return CgroupCPUDockerWithContext(context.Background(), containerid)
+}
+
+func CgroupCPUDockerWithContext(ctx context.Context, containerid string) (*cpu.TimesStat, error) {
+ return CgroupCPU(containerid, common.HostSys("fs/cgroup/cpuacct/docker"))
+}
+
+func CgroupMem(containerID string, base string) (*CgroupMemStat, error) {
+ return CgroupMemWithContext(context.Background(), containerID, base)
+}
+
+func CgroupMemWithContext(ctx context.Context, containerID string, base string) (*CgroupMemStat, error) {
+ statfile := getCgroupFilePath(containerID, base, "memory", "memory.stat")
+
+ // empty containerID means all cgroup
+ if len(containerID) == 0 {
+ containerID = "all"
+ }
+ lines, err := common.ReadLines(statfile)
+ if err != nil {
+ return nil, err
+ }
+ ret := &CgroupMemStat{ContainerID: containerID}
+ for _, line := range lines {
+ fields := strings.Split(line, " ")
+ v, err := strconv.ParseUint(fields[1], 10, 64)
+ if err != nil {
+ continue
+ }
+ switch fields[0] {
+ case "cache":
+ ret.Cache = v
+ case "rss":
+ ret.RSS = v
+ case "rssHuge":
+ ret.RSSHuge = v
+ case "mappedFile":
+ ret.MappedFile = v
+ case "pgpgin":
+ ret.Pgpgin = v
+ case "pgpgout":
+ ret.Pgpgout = v
+ case "pgfault":
+ ret.Pgfault = v
+ case "pgmajfault":
+ ret.Pgmajfault = v
+ case "inactiveAnon":
+ ret.InactiveAnon = v
+ case "activeAnon":
+ ret.ActiveAnon = v
+ case "inactiveFile":
+ ret.InactiveFile = v
+ case "activeFile":
+ ret.ActiveFile = v
+ case "unevictable":
+ ret.Unevictable = v
+ case "hierarchicalMemoryLimit":
+ ret.HierarchicalMemoryLimit = v
+ case "totalCache":
+ ret.TotalCache = v
+ case "totalRss":
+ ret.TotalRSS = v
+ case "totalRssHuge":
+ ret.TotalRSSHuge = v
+ case "totalMappedFile":
+ ret.TotalMappedFile = v
+ case "totalPgpgin":
+ ret.TotalPgpgIn = v
+ case "totalPgpgout":
+ ret.TotalPgpgOut = v
+ case "totalPgfault":
+ ret.TotalPgFault = v
+ case "totalPgmajfault":
+ ret.TotalPgMajFault = v
+ case "totalInactiveAnon":
+ ret.TotalInactiveAnon = v
+ case "totalActiveAnon":
+ ret.TotalActiveAnon = v
+ case "totalInactiveFile":
+ ret.TotalInactiveFile = v
+ case "totalActiveFile":
+ ret.TotalActiveFile = v
+ case "totalUnevictable":
+ ret.TotalUnevictable = v
+ }
+ }
+
+ r, err := getCgroupMemFile(containerID, base, "memory.usage_in_bytes")
+ if err == nil {
+ ret.MemUsageInBytes = r
+ }
+ r, err = getCgroupMemFile(containerID, base, "memory.max_usage_in_bytes")
+ if err == nil {
+ ret.MemMaxUsageInBytes = r
+ }
+ r, err = getCgroupMemFile(containerID, base, "memoryLimitInBbytes")
+ if err == nil {
+ ret.MemLimitInBytes = r
+ }
+ r, err = getCgroupMemFile(containerID, base, "memoryFailcnt")
+ if err == nil {
+ ret.MemFailCnt = r
+ }
+
+ return ret, nil
+}
+
+func CgroupMemDocker(containerID string) (*CgroupMemStat, error) {
+ return CgroupMemDockerWithContext(context.Background(), containerID)
+}
+
+func CgroupMemDockerWithContext(ctx context.Context, containerID string) (*CgroupMemStat, error) {
+ return CgroupMem(containerID, common.HostSys("fs/cgroup/memory/docker"))
+}
+
+// getCgroupFilePath constructs file path to get targetted stats file.
+func getCgroupFilePath(containerID, base, target, file string) string {
+ if len(base) == 0 {
+ base = common.HostSys(fmt.Sprintf("fs/cgroup/%s/docker", target))
+ }
+ statfile := path.Join(base, containerID, file)
+
+ if _, err := os.Stat(statfile); os.IsNotExist(err) {
+ statfile = path.Join(
+ common.HostSys(fmt.Sprintf("fs/cgroup/%s/system.slice", target)), "docker-"+containerID+".scope", file)
+ }
+
+ return statfile
+}
+
+// getCgroupMemFile reads a cgroup file and return the contents as uint64.
+func getCgroupMemFile(containerID, base, file string) (uint64, error) {
+ statfile := getCgroupFilePath(containerID, base, "memory", file)
+ lines, err := common.ReadLines(statfile)
+ if err != nil {
+ return 0, err
+ }
+ if len(lines) != 1 {
+ return 0, fmt.Errorf("wrong format file: %s", statfile)
+ }
+ return strconv.ParseUint(lines[0], 10, 64)
+}
diff --git a/vendor/github.com/shirou/gopsutil/docker/docker_notlinux.go b/vendor/github.com/shirou/gopsutil/docker/docker_notlinux.go
new file mode 100644
index 0000000..7a93c45
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/docker/docker_notlinux.go
@@ -0,0 +1,65 @@
+// +build !linux
+
+package docker
+
+import (
+ "context"
+ "github.com/shirou/gopsutil/cpu"
+ "github.com/shirou/gopsutil/internal/common"
+)
+
+// GetDockerStat returns a list of Docker basic stats.
+// This requires certain permission.
+func GetDockerStat() ([]CgroupDockerStat, error) {
+ return GetDockerStatWithContext(context.Background())
+}
+
+func GetDockerStatWithContext(ctx context.Context) ([]CgroupDockerStat, error) {
+ return nil, ErrDockerNotAvailable
+}
+
+// GetDockerIDList returnes a list of DockerID.
+// This requires certain permission.
+func GetDockerIDList() ([]string, error) {
+ return GetDockerIDListWithContext(context.Background())
+}
+
+func GetDockerIDListWithContext(ctx context.Context) ([]string, error) {
+ return nil, ErrDockerNotAvailable
+}
+
+// CgroupCPU returnes specified cgroup id CPU status.
+// containerid is same as docker id if you use docker.
+// If you use container via systemd.slice, you could use
+// containerid = docker-.scope and base=/sys/fs/cgroup/cpuacct/system.slice/
+func CgroupCPU(containerid string, base string) (*cpu.TimesStat, error) {
+ return CgroupCPUWithContext(context.Background(), containerid, base)
+}
+
+func CgroupCPUWithContext(ctx context.Context, containerid string, base string) (*cpu.TimesStat, error) {
+ return nil, ErrCgroupNotAvailable
+}
+
+func CgroupCPUDocker(containerid string) (*cpu.TimesStat, error) {
+ return CgroupCPUDockerWithContext(context.Background(), containerid)
+}
+
+func CgroupCPUDockerWithContext(ctx context.Context, containerid string) (*cpu.TimesStat, error) {
+ return CgroupCPU(containerid, common.HostSys("fs/cgroup/cpuacct/docker"))
+}
+
+func CgroupMem(containerid string, base string) (*CgroupMemStat, error) {
+ return CgroupMemWithContext(context.Background(), containerid, base)
+}
+
+func CgroupMemWithContext(ctx context.Context, containerid string, base string) (*CgroupMemStat, error) {
+ return nil, ErrCgroupNotAvailable
+}
+
+func CgroupMemDocker(containerid string) (*CgroupMemStat, error) {
+ return CgroupMemDockerWithContext(context.Background(), containerid)
+}
+
+func CgroupMemDockerWithContext(ctx context.Context, containerid string) (*CgroupMemStat, error) {
+ return CgroupMem(containerid, common.HostSys("fs/cgroup/memory/docker"))
+}
diff --git a/vendor/github.com/shirou/gopsutil/host/host.go b/vendor/github.com/shirou/gopsutil/host/host.go
index a256a6c..1e9e9bb 100644
--- a/vendor/github.com/shirou/gopsutil/host/host.go
+++ b/vendor/github.com/shirou/gopsutil/host/host.go
@@ -6,11 +6,7 @@ import (
"github.com/shirou/gopsutil/internal/common"
)
-var invoke common.Invoker
-
-func init() {
- invoke = common.Invoke{}
-}
+var invoke common.Invoker = common.Invoke{}
// A HostInfoStat describes the host status.
// This is not in the psutil but it useful.
diff --git a/vendor/github.com/shirou/gopsutil/host/host_darwin.go b/vendor/github.com/shirou/gopsutil/host/host_darwin.go
index c82d990..acefc2f 100644
--- a/vendor/github.com/shirou/gopsutil/host/host_darwin.go
+++ b/vendor/github.com/shirou/gopsutil/host/host_darwin.go
@@ -40,7 +40,7 @@ func InfoWithContext(ctx context.Context) (*InfoStat, error) {
uname, err := exec.LookPath("uname")
if err == nil {
- out, err := invoke.Command(uname, "-r")
+ out, err := invoke.CommandWithContext(ctx, uname, "-r")
if err == nil {
ret.KernelVersion = strings.ToLower(strings.TrimSpace(string(out)))
}
@@ -70,7 +70,7 @@ func InfoWithContext(ctx context.Context) (*InfoStat, error) {
ret.Procs = uint64(len(procs))
}
- values, err := common.DoSysctrl("kern.uuid")
+ values, err := common.DoSysctrlWithContext(ctx, "kern.uuid")
if err == nil && len(values) == 1 && values[0] != "" {
ret.HostID = strings.ToLower(values[0])
}
@@ -90,7 +90,7 @@ func BootTimeWithContext(ctx context.Context) (uint64, error) {
if t != 0 {
return t, nil
}
- values, err := common.DoSysctrl("kern.boottime")
+ values, err := common.DoSysctrlWithContext(ctx, "kern.boottime")
if err != nil {
return 0, err
}
@@ -188,12 +188,12 @@ func PlatformInformationWithContext(ctx context.Context) (string, string, string
return "", "", "", err
}
- out, err := invoke.Command(uname, "-s")
+ out, err := invoke.CommandWithContext(ctx, uname, "-s")
if err == nil {
platform = strings.ToLower(strings.TrimSpace(string(out)))
}
- out, err = invoke.Command(sw_vers, "-productVersion")
+ out, err = invoke.CommandWithContext(ctx, sw_vers, "-productVersion")
if err == nil {
pver = strings.ToLower(strings.TrimSpace(string(out)))
}
diff --git a/vendor/github.com/shirou/gopsutil/host/host_fallback.go b/vendor/github.com/shirou/gopsutil/host/host_fallback.go
index f6537a9..e80d7ea 100644
--- a/vendor/github.com/shirou/gopsutil/host/host_fallback.go
+++ b/vendor/github.com/shirou/gopsutil/host/host_fallback.go
@@ -55,3 +55,11 @@ func KernelVersion() (string, error) {
func KernelVersionWithContext(ctx context.Context) (string, error) {
return "", common.ErrNotImplementedError
}
+
+func PlatformInformation() (string, string, string, error) {
+ return PlatformInformationWithContext(context.Background())
+}
+
+func PlatformInformationWithContext(ctx context.Context) (string, string, string, error) {
+ return "", "", "", common.ErrNotImplementedError
+}
diff --git a/vendor/github.com/shirou/gopsutil/host/host_freebsd.go b/vendor/github.com/shirou/gopsutil/host/host_freebsd.go
index 2f51c31..00a8519 100644
--- a/vendor/github.com/shirou/gopsutil/host/host_freebsd.go
+++ b/vendor/github.com/shirou/gopsutil/host/host_freebsd.go
@@ -8,7 +8,6 @@ import (
"encoding/binary"
"io/ioutil"
"os"
- "os/exec"
"runtime"
"strings"
"sync/atomic"
@@ -168,25 +167,17 @@ func PlatformInformation() (string, string, string, error) {
}
func PlatformInformationWithContext(ctx context.Context) (string, string, string, error) {
- platform := ""
- family := ""
- version := ""
- uname, err := exec.LookPath("uname")
+ platform, err := unix.Sysctl("kern.ostype")
if err != nil {
return "", "", "", err
}
- out, err := invoke.Command(uname, "-s")
- if err == nil {
- platform = strings.ToLower(strings.TrimSpace(string(out)))
+ version, err := unix.Sysctl("kern.osrelease")
+ if err != nil {
+ return "", "", "", err
}
- out, err = invoke.Command(uname, "-r")
- if err == nil {
- version = strings.ToLower(strings.TrimSpace(string(out)))
- }
-
- return platform, family, version, nil
+ return strings.ToLower(platform), "", strings.ToLower(version), nil
}
func Virtualization() (string, string, error) {
diff --git a/vendor/github.com/shirou/gopsutil/host/host_linux.go b/vendor/github.com/shirou/gopsutil/host/host_linux.go
index 5324258..0e09f15 100644
--- a/vendor/github.com/shirou/gopsutil/host/host_linux.go
+++ b/vendor/github.com/shirou/gopsutil/host/host_linux.go
@@ -109,10 +109,14 @@ func BootTimeWithContext(ctx context.Context) (uint64, error) {
if err != nil {
return 0, err
}
+
statFile := "stat"
if system == "lxc" && role == "guest" {
// if lxc, /proc/uptime is used.
statFile = "uptime"
+ } else if system == "docker" && role == "guest" {
+ // also docker, guest
+ statFile = "uptime"
}
filename := common.HostProc(statFile)
@@ -120,20 +124,35 @@ func BootTimeWithContext(ctx context.Context) (uint64, error) {
if err != nil {
return 0, err
}
- for _, line := range lines {
- if strings.HasPrefix(line, "btime") {
- f := strings.Fields(line)
- if len(f) != 2 {
- return 0, fmt.Errorf("wrong btime format")
+
+ if statFile == "stat" {
+ for _, line := range lines {
+ if strings.HasPrefix(line, "btime") {
+ f := strings.Fields(line)
+ if len(f) != 2 {
+ return 0, fmt.Errorf("wrong btime format")
+ }
+ b, err := strconv.ParseInt(f[1], 10, 64)
+ if err != nil {
+ return 0, err
+ }
+ t = uint64(b)
+ atomic.StoreUint64(&cachedBootTime, t)
+ return t, nil
}
- b, err := strconv.ParseInt(f[1], 10, 64)
- if err != nil {
- return 0, err
- }
- t = uint64(b)
- atomic.StoreUint64(&cachedBootTime, t)
- return t, nil
}
+ } else if statFile == "uptime" {
+ if len(lines) != 1 {
+ return 0, fmt.Errorf("wrong uptime format")
+ }
+ f := strings.Fields(lines[0])
+ b, err := strconv.ParseFloat(f[0], 64)
+ if err != nil {
+ return 0, err
+ }
+ t = uint64(time.Now().Unix()) - uint64(b)
+ atomic.StoreUint64(&cachedBootTime, t)
+ return t, nil
}
return 0, fmt.Errorf("could not find btime")
diff --git a/vendor/github.com/shirou/gopsutil/host/host_linux_mips64.go b/vendor/github.com/shirou/gopsutil/host/host_linux_mips64.go
new file mode 100644
index 0000000..b0fca09
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/host/host_linux_mips64.go
@@ -0,0 +1,43 @@
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs types_linux.go
+
+package host
+
+const (
+ sizeofPtr = 0x4
+ sizeofShort = 0x2
+ sizeofInt = 0x4
+ sizeofLong = 0x4
+ sizeofLongLong = 0x8
+ sizeOfUtmp = 0x180
+)
+
+type (
+ _C_short int16
+ _C_int int32
+ _C_long int32
+ _C_long_long int64
+)
+
+type utmp struct {
+ Type int16
+ Pad_cgo_0 [2]byte
+ Pid int32
+ Line [32]int8
+ Id [4]int8
+ User [32]int8
+ Host [256]int8
+ Exit exit_status
+ Session int32
+ Tv timeval
+ Addr_v6 [4]int32
+ X__unused [20]int8
+}
+type exit_status struct {
+ Termination int16
+ Exit int16
+}
+type timeval struct {
+ Sec int32
+ Usec int32
+}
diff --git a/vendor/github.com/shirou/gopsutil/host/host_openbsd.go b/vendor/github.com/shirou/gopsutil/host/host_openbsd.go
index 83c2f7d..2ad64d7 100644
--- a/vendor/github.com/shirou/gopsutil/host/host_openbsd.go
+++ b/vendor/github.com/shirou/gopsutil/host/host_openbsd.go
@@ -113,12 +113,12 @@ func PlatformInformationWithContext(ctx context.Context) (string, string, string
return "", "", "", err
}
- out, err := invoke.Command(uname, "-s")
+ out, err := invoke.CommandWithContext(ctx, uname, "-s")
if err == nil {
platform = strings.ToLower(strings.TrimSpace(string(out)))
}
- out, err = invoke.Command(uname, "-r")
+ out, err = invoke.CommandWithContext(ctx, uname, "-r")
if err == nil {
version = strings.ToLower(strings.TrimSpace(string(out)))
}
diff --git a/vendor/github.com/shirou/gopsutil/host/host_solaris.go b/vendor/github.com/shirou/gopsutil/host/host_solaris.go
index 2560c06..bb83bfc 100644
--- a/vendor/github.com/shirou/gopsutil/host/host_solaris.go
+++ b/vendor/github.com/shirou/gopsutil/host/host_solaris.go
@@ -38,7 +38,7 @@ func InfoWithContext(ctx context.Context) (*InfoStat, error) {
return nil, err
}
- out, err := invoke.Command(uname, "-srv")
+ out, err := invoke.CommandWithContext(ctx, uname, "-srv")
if err != nil {
return nil, err
}
@@ -87,7 +87,7 @@ func InfoWithContext(ctx context.Context) (*InfoStat, error) {
// If everything works, use the current zone ID as the HostID if present.
zonename, err := exec.LookPath("/usr/bin/zonename")
if err == nil {
- out, err := invoke.Command(zonename)
+ out, err := invoke.CommandWithContext(ctx, zonename)
if err == nil {
sc := bufio.NewScanner(bytes.NewReader(out))
for sc.Scan() {
@@ -114,7 +114,7 @@ func InfoWithContext(ctx context.Context) (*InfoStat, error) {
if result.HostID == "" {
hostID, err := exec.LookPath("/usr/bin/hostid")
if err == nil {
- out, err := invoke.Command(hostID)
+ out, err := invoke.CommandWithContext(ctx, hostID)
if err == nil {
sc := bufio.NewScanner(bytes.NewReader(out))
for sc.Scan() {
@@ -156,7 +156,7 @@ func BootTimeWithContext(ctx context.Context) (uint64, error) {
return 0, err
}
- out, err := invoke.Command(kstat, "-p", "unix:0:system_misc:boot_time")
+ out, err := invoke.CommandWithContext(ctx, kstat, "-p", "unix:0:system_misc:boot_time")
if err != nil {
return 0, err
}
@@ -220,7 +220,7 @@ func KernelVersionWithContext(ctx context.Context) (string, error) {
return "", err
}
- out, err := invoke.Command(uname, "-srv")
+ out, err := invoke.CommandWithContext(ctx, uname, "-srv")
if err != nil {
return "", err
}
@@ -231,3 +231,18 @@ func KernelVersionWithContext(ctx context.Context) (string, error) {
}
return "", fmt.Errorf("could not get kernel version")
}
+
+func PlatformInformation() (platform string, family string, version string, err error) {
+ return PlatformInformationWithContext(context.Background())
+}
+
+func PlatformInformationWithContext(ctx context.Context) (platform string, family string, version string, err error) {
+ /* This is not finished yet at all. Please contribute! */
+
+ version, err = KernelVersion()
+ if err != nil {
+ return "", "", "", err
+ }
+
+ return "solaris", "solaris", version, nil
+}
diff --git a/vendor/github.com/shirou/gopsutil/host/include/smc.c b/vendor/github.com/shirou/gopsutil/host/include/smc.c
new file mode 100644
index 0000000..30a232b
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/host/include/smc.c
@@ -0,0 +1,700 @@
+/*
+ * Apple System Management Controller (SMC) API from user space for Intel based
+ * Macs. Works by talking to the AppleSMC.kext (kernel extension), the driver
+ * for the SMC.
+ *
+ * smc.c
+ * libsmc
+ *
+ * Copyright (C) 2014 beltex
+ *
+ * Based off of fork from:
+ * osx-cpu-temp
+ *
+ * With credits to:
+ *
+ * Copyright (C) 2006 devnull
+ * Apple System Management Control (SMC) Tool
+ *
+ * Copyright (C) 2006 Hendrik Holtmann
+ * smcFanControl
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include
+#include
+#include "smc.h"
+
+
+//------------------------------------------------------------------------------
+// MARK: MACROS
+//------------------------------------------------------------------------------
+
+
+/**
+Name of the SMC IOService as seen in the IORegistry. You can view it either via
+command line with ioreg or through the IORegistryExplorer app (found on Apple's
+developer site - Hardware IO Tools for Xcode)
+*/
+#define IOSERVICE_SMC "AppleSMC"
+
+
+/**
+IOService for getting machine model name
+*/
+#define IOSERVICE_MODEL "IOPlatformExpertDevice"
+
+
+/**
+SMC data types - 4 byte multi-character constants
+
+Sources: See TMP SMC keys in smc.h
+
+http://stackoverflow.com/questions/22160746/fpe2-and-sp78-data-types
+*/
+#define DATA_TYPE_UINT8 "ui8 "
+#define DATA_TYPE_UINT16 "ui16"
+#define DATA_TYPE_UINT32 "ui32"
+#define DATA_TYPE_FLAG "flag"
+#define DATA_TYPE_FPE2 "fpe2"
+#define DATA_TYPE_SFDS "{fds"
+#define DATA_TYPE_SP78 "sp78"
+
+
+//------------------------------------------------------------------------------
+// MARK: GLOBAL VARS
+//------------------------------------------------------------------------------
+
+
+/**
+Our connection to the SMC
+*/
+static io_connect_t conn;
+
+
+/**
+Number of characters in an SMC key
+*/
+static const int SMC_KEY_SIZE = 4;
+
+
+/**
+Number of characters in a data type "key" returned from the SMC. See data type
+macros.
+*/
+static const int DATA_TYPE_SIZE = 4;
+
+
+//------------------------------------------------------------------------------
+// MARK: ENUMS
+//------------------------------------------------------------------------------
+
+
+/**
+Defined by AppleSMC.kext. See SMCParamStruct.
+
+These are SMC specific return codes
+*/
+typedef enum {
+ kSMCSuccess = 0,
+ kSMCError = 1,
+ kSMCKeyNotFound = 0x84
+} kSMC_t;
+
+
+/**
+Defined by AppleSMC.kext. See SMCParamStruct.
+
+Function selectors. Used to tell the SMC which function inside it to call.
+*/
+typedef enum {
+ kSMCUserClientOpen = 0,
+ kSMCUserClientClose = 1,
+ kSMCHandleYPCEvent = 2,
+ kSMCReadKey = 5,
+ kSMCWriteKey = 6,
+ kSMCGetKeyCount = 7,
+ kSMCGetKeyFromIndex = 8,
+ kSMCGetKeyInfo = 9
+} selector_t;
+
+
+//------------------------------------------------------------------------------
+// MARK: STRUCTS
+//------------------------------------------------------------------------------
+
+
+/**
+Defined by AppleSMC.kext. See SMCParamStruct.
+*/
+typedef struct {
+ unsigned char major;
+ unsigned char minor;
+ unsigned char build;
+ unsigned char reserved;
+ unsigned short release;
+} SMCVersion;
+
+
+/**
+Defined by AppleSMC.kext. See SMCParamStruct.
+*/
+typedef struct {
+ uint16_t version;
+ uint16_t length;
+ uint32_t cpuPLimit;
+ uint32_t gpuPLimit;
+ uint32_t memPLimit;
+} SMCPLimitData;
+
+
+/**
+Defined by AppleSMC.kext. See SMCParamStruct.
+
+- dataSize : How many values written to SMCParamStruct.bytes
+- dataType : Type of data written to SMCParamStruct.bytes. This lets us know how
+ to interpret it (translate it to human readable)
+*/
+typedef struct {
+ IOByteCount dataSize;
+ uint32_t dataType;
+ uint8_t dataAttributes;
+} SMCKeyInfoData;
+
+
+/**
+Defined by AppleSMC.kext.
+
+This is the predefined struct that must be passed to communicate with the
+AppleSMC driver. While the driver is closed source, the definition of this
+struct happened to appear in the Apple PowerManagement project at around
+version 211, and soon after disappeared. It can be seen in the PrivateLib.c
+file under pmconfigd.
+
+https://www.opensource.apple.com/source/PowerManagement/PowerManagement-211/
+*/
+typedef struct {
+ uint32_t key;
+ SMCVersion vers;
+ SMCPLimitData pLimitData;
+ SMCKeyInfoData keyInfo;
+ uint8_t result;
+ uint8_t status;
+ uint8_t data8;
+ uint32_t data32;
+ uint8_t bytes[32];
+} SMCParamStruct;
+
+
+/**
+Used for returning data from the SMC.
+*/
+typedef struct {
+ uint8_t data[32];
+ uint32_t dataType;
+ uint32_t dataSize;
+ kSMC_t kSMC;
+} smc_return_t;
+
+
+//------------------------------------------------------------------------------
+// MARK: HELPERS - TYPE CONVERSION
+//------------------------------------------------------------------------------
+
+
+/**
+Convert data from SMC of fpe2 type to human readable.
+
+:param: data Data from the SMC to be converted. Assumed data size of 2.
+:returns: Converted data
+*/
+static unsigned int from_fpe2(uint8_t data[32])
+{
+ unsigned int ans = 0;
+
+ // Data type for fan calls - fpe2
+ // This is assumend to mean floating point, with 2 exponent bits
+ // http://stackoverflow.com/questions/22160746/fpe2-and-sp78-data-types
+ ans += data[0] << 6;
+ ans += data[1] << 2;
+
+ return ans;
+}
+
+
+/**
+Convert to fpe2 data type to be passed to SMC.
+
+:param: val Value to convert
+:param: data Pointer to data array to place result
+*/
+static void to_fpe2(unsigned int val, uint8_t *data)
+{
+ data[0] = val >> 6;
+ data[1] = (val << 2) ^ (data[0] << 8);
+}
+
+
+/**
+Convert SMC key to uint32_t. This must be done to pass it to the SMC.
+
+:param: key The SMC key to convert
+:returns: uint32_t translation.
+ Returns zero if key is not 4 characters in length.
+*/
+static uint32_t to_uint32_t(char *key)
+{
+ uint32_t ans = 0;
+ uint32_t shift = 24;
+
+ // SMC key is expected to be 4 bytes - thus 4 chars
+ if (strlen(key) != SMC_KEY_SIZE) {
+ return 0;
+ }
+
+ for (int i = 0; i < SMC_KEY_SIZE; i++) {
+ ans += key[i] << shift;
+ shift -= 8;
+ }
+
+ return ans;
+}
+
+
+/**
+For converting the dataType return from the SMC to human readable 4 byte
+multi-character constant.
+*/
+static void to_string(uint32_t val, char *dataType)
+{
+ int shift = 24;
+
+ for (int i = 0; i < DATA_TYPE_SIZE; i++) {
+ // To get each char, we shift it into the lower 8 bits, and then & by
+ // 255 to insolate it
+ dataType[i] = (val >> shift) & 0xff;
+ shift -= 8;
+ }
+}
+
+
+//------------------------------------------------------------------------------
+// MARK: HELPERS - TMP CONVERSION
+//------------------------------------------------------------------------------
+
+
+/**
+Celsius to Fahrenheit
+*/
+static double to_fahrenheit(double tmp)
+{
+ // http://en.wikipedia.org/wiki/Fahrenheit#Definition_and_conversions
+ return (tmp * 1.8) + 32;
+}
+
+
+/**
+Celsius to Kelvin
+*/
+static double to_kelvin(double tmp)
+{
+ // http://en.wikipedia.org/wiki/Kelvin
+ return tmp + 273.15;
+}
+
+
+//------------------------------------------------------------------------------
+// MARK: "PRIVATE" FUNCTIONS
+//------------------------------------------------------------------------------
+
+
+/**
+Make a call to the SMC
+
+:param: inputStruct Struct that holds data telling the SMC what you want
+:param: outputStruct Struct holding the SMC's response
+:returns: I/O Kit return code
+*/
+static kern_return_t call_smc(SMCParamStruct *inputStruct,
+ SMCParamStruct *outputStruct)
+{
+ kern_return_t result;
+ size_t inputStructCnt = sizeof(SMCParamStruct);
+ size_t outputStructCnt = sizeof(SMCParamStruct);
+
+ result = IOConnectCallStructMethod(conn, kSMCHandleYPCEvent,
+ inputStruct,
+ inputStructCnt,
+ outputStruct,
+ &outputStructCnt);
+
+ if (result != kIOReturnSuccess) {
+ // IOReturn error code lookup. See "Accessing Hardware From Applications
+ // -> Handling Errors" Apple doc
+ result = err_get_code(result);
+ }
+
+ return result;
+}
+
+
+/**
+Read data from the SMC
+
+:param: key The SMC key
+*/
+static kern_return_t read_smc(char *key, smc_return_t *result_smc)
+{
+ kern_return_t result;
+ SMCParamStruct inputStruct;
+ SMCParamStruct outputStruct;
+
+ memset(&inputStruct, 0, sizeof(SMCParamStruct));
+ memset(&outputStruct, 0, sizeof(SMCParamStruct));
+ memset(result_smc, 0, sizeof(smc_return_t));
+
+ // First call to AppleSMC - get key info
+ inputStruct.key = to_uint32_t(key);
+ inputStruct.data8 = kSMCGetKeyInfo;
+
+ result = call_smc(&inputStruct, &outputStruct);
+ result_smc->kSMC = outputStruct.result;
+
+ if (result != kIOReturnSuccess || outputStruct.result != kSMCSuccess) {
+ return result;
+ }
+
+ // Store data for return
+ result_smc->dataSize = outputStruct.keyInfo.dataSize;
+ result_smc->dataType = outputStruct.keyInfo.dataType;
+
+
+ // Second call to AppleSMC - now we can get the data
+ inputStruct.keyInfo.dataSize = outputStruct.keyInfo.dataSize;
+ inputStruct.data8 = kSMCReadKey;
+
+ result = call_smc(&inputStruct, &outputStruct);
+ result_smc->kSMC = outputStruct.result;
+
+ if (result != kIOReturnSuccess || outputStruct.result != kSMCSuccess) {
+ return result;
+ }
+
+ memcpy(result_smc->data, outputStruct.bytes, sizeof(outputStruct.bytes));
+
+ return result;
+}
+
+
+/**
+Write data to the SMC.
+
+:returns: IOReturn IOKit return code
+*/
+static kern_return_t write_smc(char *key, smc_return_t *result_smc)
+{
+ kern_return_t result;
+ SMCParamStruct inputStruct;
+ SMCParamStruct outputStruct;
+
+ memset(&inputStruct, 0, sizeof(SMCParamStruct));
+ memset(&outputStruct, 0, sizeof(SMCParamStruct));
+
+ // First call to AppleSMC - get key info
+ inputStruct.key = to_uint32_t(key);
+ inputStruct.data8 = kSMCGetKeyInfo;
+
+ result = call_smc(&inputStruct, &outputStruct);
+ result_smc->kSMC = outputStruct.result;
+
+ if (result != kIOReturnSuccess || outputStruct.result != kSMCSuccess) {
+ return result;
+ }
+
+ // Check data is correct
+ if (result_smc->dataSize != outputStruct.keyInfo.dataSize ||
+ result_smc->dataType != outputStruct.keyInfo.dataType) {
+ return kIOReturnBadArgument;
+ }
+
+ // Second call to AppleSMC - now we can write the data
+ inputStruct.data8 = kSMCWriteKey;
+ inputStruct.keyInfo.dataSize = outputStruct.keyInfo.dataSize;
+
+ // Set data to write
+ memcpy(inputStruct.bytes, result_smc->data, sizeof(result_smc->data));
+
+ result = call_smc(&inputStruct, &outputStruct);
+ result_smc->kSMC = outputStruct.result;
+
+ return result;
+}
+
+
+/**
+Get the model name of the machine.
+*/
+static kern_return_t get_machine_model(io_name_t model)
+{
+ io_service_t service;
+ kern_return_t result;
+
+ service = IOServiceGetMatchingService(kIOMasterPortDefault,
+ IOServiceMatching(IOSERVICE_MODEL));
+
+ if (service == 0) {
+ printf("ERROR: %s NOT FOUND\n", IOSERVICE_MODEL);
+ return kIOReturnError;
+ }
+
+ // Get the model name
+ result = IORegistryEntryGetName(service, model);
+ IOObjectRelease(service);
+
+ return result;
+}
+
+
+//------------------------------------------------------------------------------
+// MARK: "PUBLIC" FUNCTIONS
+//------------------------------------------------------------------------------
+
+
+kern_return_t open_smc(void)
+{
+ kern_return_t result;
+ io_service_t service;
+
+ service = IOServiceGetMatchingService(kIOMasterPortDefault,
+ IOServiceMatching(IOSERVICE_SMC));
+
+ if (service == 0) {
+ // NOTE: IOServiceMatching documents 0 on failure
+ printf("ERROR: %s NOT FOUND\n", IOSERVICE_SMC);
+ return kIOReturnError;
+ }
+
+ result = IOServiceOpen(service, mach_task_self(), 0, &conn);
+ IOObjectRelease(service);
+
+ return result;
+}
+
+
+kern_return_t close_smc(void)
+{
+ return IOServiceClose(conn);
+}
+
+
+bool is_key_valid(char *key)
+{
+ bool ans = false;
+ kern_return_t result;
+ smc_return_t result_smc;
+
+ if (strlen(key) != SMC_KEY_SIZE) {
+ printf("ERROR: Invalid key size - must be 4 chars\n");
+ return ans;
+ }
+
+ // Try a read and see if it succeeds
+ result = read_smc(key, &result_smc);
+
+ if (result == kIOReturnSuccess && result_smc.kSMC == kSMCSuccess) {
+ ans = true;
+ }
+
+ return ans;
+}
+
+
+double get_tmp(char *key, tmp_unit_t unit)
+{
+ kern_return_t result;
+ smc_return_t result_smc;
+
+ result = read_smc(key, &result_smc);
+
+ if (!(result == kIOReturnSuccess &&
+ result_smc.dataSize == 2 &&
+ result_smc.dataType == to_uint32_t(DATA_TYPE_SP78))) {
+ // Error
+ return 0.0;
+ }
+
+ // TODO: Create from_sp78() convert function
+ double tmp = result_smc.data[0];
+
+ switch (unit) {
+ case CELSIUS:
+ break;
+ case FAHRENHEIT:
+ tmp = to_fahrenheit(tmp);
+ break;
+ case KELVIN:
+ tmp = to_kelvin(tmp);
+ break;
+ }
+
+ return tmp;
+}
+
+
+bool is_battery_powered(void)
+{
+ kern_return_t result;
+ smc_return_t result_smc;
+
+ result = read_smc(BATT_PWR, &result_smc);
+
+ if (!(result == kIOReturnSuccess &&
+ result_smc.dataSize == 1 &&
+ result_smc.dataType == to_uint32_t(DATA_TYPE_FLAG))) {
+ // Error
+ return false;
+ }
+
+ return result_smc.data[0];
+}
+
+
+bool is_optical_disk_drive_full(void)
+{
+ kern_return_t result;
+ smc_return_t result_smc;
+
+ result = read_smc(ODD_FULL, &result_smc);
+
+ if (!(result == kIOReturnSuccess &&
+ result_smc.dataSize == 1 &&
+ result_smc.dataType == to_uint32_t(DATA_TYPE_FLAG))) {
+ // Error
+ return false;
+ }
+
+ return result_smc.data[0];
+}
+
+
+//------------------------------------------------------------------------------
+// MARK: FAN FUNCTIONS
+//------------------------------------------------------------------------------
+
+
+bool get_fan_name(unsigned int fan_num, fan_name_t name)
+{
+ char key[5];
+ kern_return_t result;
+ smc_return_t result_smc;
+
+ sprintf(key, "F%dID", fan_num);
+ result = read_smc(key, &result_smc);
+
+ if (!(result == kIOReturnSuccess &&
+ result_smc.dataSize == 16 &&
+ result_smc.dataType == to_uint32_t(DATA_TYPE_SFDS))) {
+ return false;
+ }
+
+
+ /*
+ We know the data size is 16 bytes and the type is "{fds", a custom
+ struct defined by the AppleSMC.kext. See TMP enum sources for the
+ struct.
+
+ The last 12 bytes contain the name of the fan, an array of chars, hence
+ the loop range.
+ */
+ int index = 0;
+ for (int i = 4; i < 16; i++) {
+ // Check if at the end (name may not be full 12 bytes)
+ // Could check for 0 (null), but instead we check for 32 (space). This
+ // is a hack to remove whitespace. :)
+ if (result_smc.data[i] == 32) {
+ break;
+ }
+
+ name[index] = result_smc.data[i];
+ index++;
+ }
+
+ return true;
+}
+
+
+int get_num_fans(void)
+{
+ kern_return_t result;
+ smc_return_t result_smc;
+
+ result = read_smc(NUM_FANS, &result_smc);
+
+ if (!(result == kIOReturnSuccess &&
+ result_smc.dataSize == 1 &&
+ result_smc.dataType == to_uint32_t(DATA_TYPE_UINT8))) {
+ // Error
+ return -1;
+ }
+
+ return result_smc.data[0];
+}
+
+
+unsigned int get_fan_rpm(unsigned int fan_num)
+{
+ char key[5];
+ kern_return_t result;
+ smc_return_t result_smc;
+
+ sprintf(key, "F%dAc", fan_num);
+ result = read_smc(key, &result_smc);
+
+ if (!(result == kIOReturnSuccess &&
+ result_smc.dataSize == 2 &&
+ result_smc.dataType == to_uint32_t(DATA_TYPE_FPE2))) {
+ // Error
+ return 0;
+ }
+
+ return from_fpe2(result_smc.data);
+}
+
+
+bool set_fan_min_rpm(unsigned int fan_num, unsigned int rpm, bool auth)
+{
+ // TODO: Add rpm val safety check
+ char key[5];
+ bool ans = false;
+ kern_return_t result;
+ smc_return_t result_smc;
+
+ memset(&result_smc, 0, sizeof(smc_return_t));
+
+ // TODO: Don't use magic number
+ result_smc.dataSize = 2;
+ result_smc.dataType = to_uint32_t(DATA_TYPE_FPE2);
+ to_fpe2(rpm, result_smc.data);
+
+ sprintf(key, "F%dMn", fan_num);
+ result = write_smc(key, &result_smc);
+
+ if (result == kIOReturnSuccess && result_smc.kSMC == kSMCSuccess) {
+ ans = true;
+ }
+
+ return ans;
+}
diff --git a/vendor/github.com/shirou/gopsutil/host/include/smc.h b/vendor/github.com/shirou/gopsutil/host/include/smc.h
new file mode 100644
index 0000000..b156368
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/host/include/smc.h
@@ -0,0 +1,254 @@
+/*
+ * Apple System Management Controller (SMC) API from user space for Intel based
+ * Macs. Works by talking to the AppleSMC.kext (kernel extension), the driver
+ * for the SMC.
+ *
+ * smc.h
+ * libsmc
+ *
+ * Copyright (C) 2014 beltex
+ *
+ * Based off of fork from:
+ * osx-cpu-temp
+ *
+ * With credits to:
+ *
+ * Copyright (C) 2006 devnull
+ * Apple System Management Control (SMC) Tool
+ *
+ * Copyright (C) 2006 Hendrik Holtmann
+ * smcFanControl
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include
+
+
+//------------------------------------------------------------------------------
+// MARK: MACROS
+//------------------------------------------------------------------------------
+
+
+/**
+SMC keys for temperature sensors - 4 byte multi-character constants
+
+Not applicable to all Mac's of course. In adition, the definition of the codes
+may not be 100% accurate necessarily. Finally, list is incomplete.
+
+Presumed letter translations:
+
+- T = Temperature (if first char)
+- C = CPU
+- G = GPU
+- P = Proximity
+- D = Diode
+- H = Heatsink
+
+Sources:
+
+- https://www.apple.com/downloads/dashboard/status/istatpro.html
+- https://github.com/hholtmann/smcFanControl
+- https://github.com/jedda/OSX-Monitoring-Tools
+- http://www.parhelia.ch/blog/statics/k3_keys.html
+*/
+#define AMBIENT_AIR_0 "TA0P"
+#define AMBIENT_AIR_1 "TA1P"
+#define CPU_0_DIODE "TC0D"
+#define CPU_0_HEATSINK "TC0H"
+#define CPU_0_PROXIMITY "TC0P"
+#define ENCLOSURE_BASE_0 "TB0T"
+#define ENCLOSURE_BASE_1 "TB1T"
+#define ENCLOSURE_BASE_2 "TB2T"
+#define ENCLOSURE_BASE_3 "TB3T"
+#define GPU_0_DIODE "TG0D"
+#define GPU_0_HEATSINK "TG0H"
+#define GPU_0_PROXIMITY "TG0P"
+#define HARD_DRIVE_BAY "TH0P"
+#define MEMORY_SLOT_0 "TM0S"
+#define MEMORY_SLOTS_PROXIMITY "TM0P"
+#define NORTHBRIDGE "TN0H"
+#define NORTHBRIDGE_DIODE "TN0D"
+#define NORTHBRIDGE_PROXIMITY "TN0P"
+#define THUNDERBOLT_0 "TI0P"
+#define THUNDERBOLT_1 "TI1P"
+#define WIRELESS_MODULE "TW0P"
+
+
+/**
+SMC keys for fans - 4 byte multi-character constants
+
+Number of fans on Macs vary of course, thus not all keys will be applicable.
+
+Presumed letter translations:
+
+- F = Fan
+- Ac = Acutal
+- Mn = Min
+- Mx = Max
+- Sf = Safe
+- Tg = Target
+
+Sources: See TMP SMC keys
+*/
+#define FAN_0 "F0Ac"
+#define FAN_0_MIN_RPM "F0Mn"
+#define FAN_0_MAX_RPM "F0Mx"
+#define FAN_0_SAFE_RPM "F0Sf"
+#define FAN_0_TARGET_RPM "F0Tg"
+#define FAN_1 "F1Ac"
+#define FAN_1_MIN_RPM "F1Mn"
+#define FAN_1_MAX_RPM "F1Mx"
+#define FAN_1_SAFE_RPM "F1Sf"
+#define FAN_1_TARGET_RPM "F1Tg"
+#define FAN_2 "F2Ac"
+#define FAN_2_MIN_RPM "F2Mn"
+#define FAN_2_MAX_RPM "F2Mx"
+#define FAN_2_SAFE_RPM "F2Sf"
+#define FAN_2_TARGET_RPM "F2Tg"
+#define NUM_FANS "FNum"
+#define FORCE_BITS "FS! "
+
+
+/**
+Misc SMC keys - 4 byte multi-character constants
+
+Sources: See TMP SMC keys
+*/
+#define BATT_PWR "BATP"
+#define NUM_KEYS "#KEY"
+#define ODD_FULL "MSDI"
+
+
+//------------------------------------------------------------------------------
+// MARK: TYPES
+//------------------------------------------------------------------------------
+
+
+typedef char fan_name_t[13];
+
+
+//------------------------------------------------------------------------------
+// MARK: ENUMS
+//------------------------------------------------------------------------------
+
+
+typedef enum {
+ CELSIUS,
+ FAHRENHEIT,
+ KELVIN
+} tmp_unit_t;
+
+
+//------------------------------------------------------------------------------
+// MARK: PROTOTYPES
+//------------------------------------------------------------------------------
+
+
+/**
+Open a connection to the SMC
+
+:returns: kIOReturnSuccess on successful connection to the SMC.
+*/
+kern_return_t open_smc(void);
+
+
+/**
+Close connection to the SMC
+
+:returns: kIOReturnSuccess on successful close of connection to the SMC.
+*/
+kern_return_t close_smc(void);
+
+
+/**
+Check if an SMC key is valid. Useful for determining if a certain machine has
+particular sensor or fan for example.
+
+:param: key The SMC key to check. 4 byte multi-character constant. Must be 4
+ characters in length.
+:returns: True if the key is found, false otherwise
+*/
+bool is_key_valid(char *key);
+
+
+/**
+Get the current temperature from a sensor
+
+:param: key The temperature sensor to read from
+:param: unit The unit for the temperature value.
+:returns: Temperature of sensor. If the sensor is not found, or an error
+ occurs, return will be zero
+*/
+double get_tmp(char *key, tmp_unit_t unit);
+
+
+/**
+Is the machine being powered by the battery?
+
+:returns: True if it is, false otherwise
+*/
+bool is_battery_powered(void);
+
+
+/**
+Is there a CD in the optical disk drive (ODD)?
+
+:returns: True if there is, false otherwise
+*/
+bool is_optical_disk_drive_full(void);
+
+
+/**
+Get the name of a fan.
+
+:param: fanNum The number of the fan to check
+:param: name The name of the fan. Return will be empty on error.
+:returns: True if successful, false otherwise.
+*/
+bool get_fan_name(unsigned int fan_num, fan_name_t name);
+
+
+/**
+Get the number of fans on this machine.
+
+:returns: The number of fans. If an error occurs, return will be -1.
+*/
+int get_num_fans(void);
+
+
+/**
+Get the current speed (RPM - revolutions per minute) of a fan.
+
+:param: fan_num The number of the fan to check
+:returns: The fan RPM. If the fan is not found, or an error occurs, return
+ will be zero
+*/
+UInt get_fan_rpm(UInt fan_num);
+
+
+/**
+Set the minimum speed (RPM - revolutions per minute) of a fan. This method
+requires root privileges. By minimum we mean that OS X can interject and
+raise the fan speed if needed, however it will not go below this.
+
+WARNING: You are playing with hardware here, BE CAREFUL.
+
+:param: fan_num The number of the fan to set
+:param: rpm The speed you would like to set the fan to.
+:param: auth Should the function do authentication?
+:return: True if successful, false otherwise
+*/
+bool set_fan_min_rpm(unsigned int fan_num, unsigned int rpm, bool auth);
diff --git a/vendor/github.com/shirou/gopsutil/internal/common/common.go b/vendor/github.com/shirou/gopsutil/internal/common/common.go
index fcee6be..f9373ee 100644
--- a/vendor/github.com/shirou/gopsutil/internal/common/common.go
+++ b/vendor/github.com/shirou/gopsutil/internal/common/common.go
@@ -32,15 +32,19 @@ var (
type Invoker interface {
Command(string, ...string) ([]byte, error)
+ CommandWithContext(context.Context, string, ...string) ([]byte, error)
}
type Invoke struct{}
func (i Invoke) Command(name string, arg ...string) ([]byte, error) {
- ctxt, cancel := context.WithTimeout(context.Background(), Timeout)
+ ctx, cancel := context.WithTimeout(context.Background(), Timeout)
defer cancel()
+ return i.CommandWithContext(ctx, name, arg...)
+}
- cmd := exec.CommandContext(ctxt, name, arg...)
+func (i Invoke) CommandWithContext(ctx context.Context, name string, arg ...string) ([]byte, error) {
+ cmd := exec.CommandContext(ctx, name, arg...)
var buf bytes.Buffer
cmd.Stdout = &buf
@@ -84,6 +88,10 @@ func (i FakeInvoke) Command(name string, arg ...string) ([]byte, error) {
return []byte{}, fmt.Errorf("could not find testdata: %s", fpath)
}
+func (i FakeInvoke) CommandWithContext(ctx context.Context, name string, arg ...string) ([]byte, error) {
+ return i.Command(name, arg...)
+}
+
var ErrNotImplementedError = errors.New("not implemented yet")
// ReadLines reads contents from a file and splits them by new lines.
diff --git a/vendor/github.com/shirou/gopsutil/internal/common/common_darwin.go b/vendor/github.com/shirou/gopsutil/internal/common/common_darwin.go
index 2b6d4c1..3e85cc0 100644
--- a/vendor/github.com/shirou/gopsutil/internal/common/common_darwin.go
+++ b/vendor/github.com/shirou/gopsutil/internal/common/common_darwin.go
@@ -3,6 +3,7 @@
package common
import (
+ "context"
"os"
"os/exec"
"strings"
@@ -11,12 +12,12 @@ import (
"golang.org/x/sys/unix"
)
-func DoSysctrl(mib string) ([]string, error) {
+func DoSysctrlWithContext(ctx context.Context, mib string) ([]string, error) {
sysctl, err := exec.LookPath("/usr/sbin/sysctl")
if err != nil {
return []string{}, err
}
- cmd := exec.Command(sysctl, "-n", mib)
+ cmd := exec.CommandContext(ctx, sysctl, "-n", mib)
cmd.Env = getSysctrlEnv(os.Environ())
out, err := cmd.Output()
if err != nil {
diff --git a/vendor/github.com/shirou/gopsutil/internal/common/common_unix.go b/vendor/github.com/shirou/gopsutil/internal/common/common_unix.go
index cc934dd..750a592 100644
--- a/vendor/github.com/shirou/gopsutil/internal/common/common_unix.go
+++ b/vendor/github.com/shirou/gopsutil/internal/common/common_unix.go
@@ -3,12 +3,13 @@
package common
import (
+ "context"
"os/exec"
"strconv"
"strings"
)
-func CallLsof(invoke Invoker, pid int32, args ...string) ([]string, error) {
+func CallLsofWithContext(ctx context.Context, invoke Invoker, pid int32, args ...string) ([]string, error) {
var cmd []string
if pid == 0 { // will get from all processes.
cmd = []string{"-a", "-n", "-P"}
@@ -20,7 +21,7 @@ func CallLsof(invoke Invoker, pid int32, args ...string) ([]string, error) {
if err != nil {
return []string{}, err
}
- out, err := invoke.Command(lsof, cmd...)
+ out, err := invoke.CommandWithContext(ctx, lsof, cmd...)
if err != nil {
// if no pid found, lsof returnes code 1.
if err.Error() == "exit status 1" && len(out) == 0 {
@@ -39,14 +40,14 @@ func CallLsof(invoke Invoker, pid int32, args ...string) ([]string, error) {
return ret, nil
}
-func CallPgrep(invoke Invoker, pid int32) ([]int32, error) {
+func CallPgrepWithContext(ctx context.Context, invoke Invoker, pid int32) ([]int32, error) {
var cmd []string
cmd = []string{"-P", strconv.Itoa(int(pid))}
pgrep, err := exec.LookPath("pgrep")
if err != nil {
return []int32{}, err
}
- out, err := invoke.Command(pgrep, cmd...)
+ out, err := invoke.CommandWithContext(ctx, pgrep, cmd...)
if err != nil {
return []int32{}, err
}
diff --git a/vendor/github.com/shirou/gopsutil/load/load.go b/vendor/github.com/shirou/gopsutil/load/load.go
new file mode 100644
index 0000000..9085889
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/load/load.go
@@ -0,0 +1,31 @@
+package load
+
+import (
+ "encoding/json"
+
+ "github.com/shirou/gopsutil/internal/common"
+)
+
+var invoke common.Invoker = common.Invoke{}
+
+type AvgStat struct {
+ Load1 float64 `json:"load1"`
+ Load5 float64 `json:"load5"`
+ Load15 float64 `json:"load15"`
+}
+
+func (l AvgStat) String() string {
+ s, _ := json.Marshal(l)
+ return string(s)
+}
+
+type MiscStat struct {
+ ProcsRunning int `json:"procsRunning"`
+ ProcsBlocked int `json:"procsBlocked"`
+ Ctxt int `json:"ctxt"`
+}
+
+func (m MiscStat) String() string {
+ s, _ := json.Marshal(m)
+ return string(s)
+}
diff --git a/vendor/github.com/shirou/gopsutil/load/load_bsd.go b/vendor/github.com/shirou/gopsutil/load/load_bsd.go
new file mode 100644
index 0000000..dfac10c
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/load/load_bsd.go
@@ -0,0 +1,68 @@
+// +build freebsd openbsd
+
+package load
+
+import (
+ "context"
+ "os/exec"
+ "strings"
+ "unsafe"
+
+ "golang.org/x/sys/unix"
+)
+
+func Avg() (*AvgStat, error) {
+ return AvgWithContext(context.Background())
+}
+
+func AvgWithContext(ctx context.Context) (*AvgStat, error) {
+ // This SysctlRaw method borrowed from
+ // https://github.com/prometheus/node_exporter/blob/master/collector/loadavg_freebsd.go
+ type loadavg struct {
+ load [3]uint32
+ scale int
+ }
+ b, err := unix.SysctlRaw("vm.loadavg")
+ if err != nil {
+ return nil, err
+ }
+ load := *(*loadavg)(unsafe.Pointer((&b[0])))
+ scale := float64(load.scale)
+ ret := &AvgStat{
+ Load1: float64(load.load[0]) / scale,
+ Load5: float64(load.load[1]) / scale,
+ Load15: float64(load.load[2]) / scale,
+ }
+
+ return ret, nil
+}
+
+// Misc returns miscellaneous host-wide statistics.
+// darwin use ps command to get process running/blocked count.
+// Almost same as Darwin implementation, but state is different.
+func Misc() (*MiscStat, error) {
+ return MiscWithContext(context.Background())
+}
+
+func MiscWithContext(ctx context.Context) (*MiscStat, error) {
+ bin, err := exec.LookPath("ps")
+ if err != nil {
+ return nil, err
+ }
+ out, err := invoke.CommandWithContext(ctx, bin, "axo", "state")
+ if err != nil {
+ return nil, err
+ }
+ lines := strings.Split(string(out), "\n")
+
+ ret := MiscStat{}
+ for _, l := range lines {
+ if strings.Contains(l, "R") {
+ ret.ProcsRunning++
+ } else if strings.Contains(l, "D") {
+ ret.ProcsBlocked++
+ }
+ }
+
+ return &ret, nil
+}
diff --git a/vendor/github.com/shirou/gopsutil/load/load_darwin.go b/vendor/github.com/shirou/gopsutil/load/load_darwin.go
new file mode 100644
index 0000000..cd7b74d
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/load/load_darwin.go
@@ -0,0 +1,76 @@
+// +build darwin
+
+package load
+
+import (
+ "context"
+ "os/exec"
+ "strconv"
+ "strings"
+
+ "github.com/shirou/gopsutil/internal/common"
+)
+
+func Avg() (*AvgStat, error) {
+ return AvgWithContext(context.Background())
+}
+
+func AvgWithContext(ctx context.Context) (*AvgStat, error) {
+ values, err := common.DoSysctrlWithContext(ctx, "vm.loadavg")
+ if err != nil {
+ return nil, err
+ }
+
+ load1, err := strconv.ParseFloat(values[0], 64)
+ if err != nil {
+ return nil, err
+ }
+ load5, err := strconv.ParseFloat(values[1], 64)
+ if err != nil {
+ return nil, err
+ }
+ load15, err := strconv.ParseFloat(values[2], 64)
+ if err != nil {
+ return nil, err
+ }
+
+ ret := &AvgStat{
+ Load1: float64(load1),
+ Load5: float64(load5),
+ Load15: float64(load15),
+ }
+
+ return ret, nil
+}
+
+// Misc returnes miscellaneous host-wide statistics.
+// darwin use ps command to get process running/blocked count.
+// Almost same as FreeBSD implementation, but state is different.
+// U means 'Uninterruptible Sleep'.
+func Misc() (*MiscStat, error) {
+ return MiscWithContext(context.Background())
+}
+
+func MiscWithContext(ctx context.Context) (*MiscStat, error) {
+ bin, err := exec.LookPath("ps")
+ if err != nil {
+ return nil, err
+ }
+ out, err := invoke.CommandWithContext(ctx, bin, "axo", "state")
+ if err != nil {
+ return nil, err
+ }
+ lines := strings.Split(string(out), "\n")
+
+ ret := MiscStat{}
+ for _, l := range lines {
+ if strings.Contains(l, "R") {
+ ret.ProcsRunning++
+ } else if strings.Contains(l, "U") {
+ // uninterruptible sleep == blocked
+ ret.ProcsBlocked++
+ }
+ }
+
+ return &ret, nil
+}
diff --git a/vendor/github.com/shirou/gopsutil/load/load_fallback.go b/vendor/github.com/shirou/gopsutil/load/load_fallback.go
new file mode 100644
index 0000000..1e3ade0
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/load/load_fallback.go
@@ -0,0 +1,25 @@
+// +build !darwin,!linux,!freebsd,!openbsd,!windows
+
+package load
+
+import (
+ "context"
+
+ "github.com/shirou/gopsutil/internal/common"
+)
+
+func Avg() (*AvgStat, error) {
+ return AvgWithContext(context.Background())
+}
+
+func AvgWithContext(ctx context.Context) (*AvgStat, error) {
+ return nil, common.ErrNotImplementedError
+}
+
+func Misc() (*MiscStat, error) {
+ return MiscWithContext(context.Background())
+}
+
+func MiscWithContext(ctx context.Context) (*MiscStat, error) {
+ return nil, common.ErrNotImplementedError
+}
diff --git a/vendor/github.com/shirou/gopsutil/load/load_linux.go b/vendor/github.com/shirou/gopsutil/load/load_linux.go
new file mode 100644
index 0000000..63c26a2
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/load/load_linux.go
@@ -0,0 +1,87 @@
+// +build linux
+
+package load
+
+import (
+ "context"
+ "io/ioutil"
+ "strconv"
+ "strings"
+
+ "github.com/shirou/gopsutil/internal/common"
+)
+
+func Avg() (*AvgStat, error) {
+ return AvgWithContext(context.Background())
+}
+
+func AvgWithContext(ctx context.Context) (*AvgStat, error) {
+ filename := common.HostProc("loadavg")
+ line, err := ioutil.ReadFile(filename)
+ if err != nil {
+ return nil, err
+ }
+
+ values := strings.Fields(string(line))
+
+ load1, err := strconv.ParseFloat(values[0], 64)
+ if err != nil {
+ return nil, err
+ }
+ load5, err := strconv.ParseFloat(values[1], 64)
+ if err != nil {
+ return nil, err
+ }
+ load15, err := strconv.ParseFloat(values[2], 64)
+ if err != nil {
+ return nil, err
+ }
+
+ ret := &AvgStat{
+ Load1: load1,
+ Load5: load5,
+ Load15: load15,
+ }
+
+ return ret, nil
+}
+
+// Misc returnes miscellaneous host-wide statistics.
+// Note: the name should be changed near future.
+func Misc() (*MiscStat, error) {
+ return MiscWithContext(context.Background())
+}
+
+func MiscWithContext(ctx context.Context) (*MiscStat, error) {
+ filename := common.HostProc("stat")
+ out, err := ioutil.ReadFile(filename)
+ if err != nil {
+ return nil, err
+ }
+
+ ret := &MiscStat{}
+ lines := strings.Split(string(out), "\n")
+ for _, line := range lines {
+ fields := strings.Fields(line)
+ if len(fields) != 2 {
+ continue
+ }
+ v, err := strconv.ParseInt(fields[1], 10, 64)
+ if err != nil {
+ continue
+ }
+ switch fields[0] {
+ case "procs_running":
+ ret.ProcsRunning = int(v)
+ case "procs_blocked":
+ ret.ProcsBlocked = int(v)
+ case "ctxt":
+ ret.Ctxt = int(v)
+ default:
+ continue
+ }
+
+ }
+
+ return ret, nil
+}
diff --git a/vendor/github.com/shirou/gopsutil/load/load_windows.go b/vendor/github.com/shirou/gopsutil/load/load_windows.go
new file mode 100644
index 0000000..42968b3
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/load/load_windows.go
@@ -0,0 +1,29 @@
+// +build windows
+
+package load
+
+import (
+ "context"
+
+ "github.com/shirou/gopsutil/internal/common"
+)
+
+func Avg() (*AvgStat, error) {
+ return AvgWithContext(context.Background())
+}
+
+func AvgWithContext(ctx context.Context) (*AvgStat, error) {
+ ret := AvgStat{}
+
+ return &ret, common.ErrNotImplementedError
+}
+
+func Misc() (*MiscStat, error) {
+ return MiscWithContext(context.Background())
+}
+
+func MiscWithContext(ctx context.Context) (*MiscStat, error) {
+ ret := MiscStat{}
+
+ return &ret, common.ErrNotImplementedError
+}
diff --git a/vendor/github.com/shirou/gopsutil/mem/mem.go b/vendor/github.com/shirou/gopsutil/mem/mem.go
index 87dfb53..fd8337a 100644
--- a/vendor/github.com/shirou/gopsutil/mem/mem.go
+++ b/vendor/github.com/shirou/gopsutil/mem/mem.go
@@ -6,11 +6,7 @@ import (
"github.com/shirou/gopsutil/internal/common"
)
-var invoke common.Invoker
-
-func init() {
- invoke = common.Invoke{}
-}
+var invoke common.Invoker = common.Invoke{}
// Memory usage statistics. Total, Available and Used contain numbers of bytes
// for human consumption.
@@ -49,6 +45,7 @@ type VirtualMemoryStat struct {
// Linux specific numbers
// https://www.centos.org/docs/5/html/5.1/Deployment_Guide/s2-proc-meminfo.html
// https://www.kernel.org/doc/Documentation/filesystems/proc.txt
+ // https://www.kernel.org/doc/Documentation/vm/overcommit-accounting
Buffers uint64 `json:"buffers"`
Cached uint64 `json:"cached"`
Writeback uint64 `json:"writeback"`
@@ -58,6 +55,8 @@ type VirtualMemoryStat struct {
Slab uint64 `json:"slab"`
PageTables uint64 `json:"pagetables"`
SwapCached uint64 `json:"swapcached"`
+ CommitLimit uint64 `json:"commitlimit"`
+ CommittedAS uint64 `json:"committedas"`
}
type SwapMemoryStat struct {
diff --git a/vendor/github.com/shirou/gopsutil/mem/mem_darwin.go b/vendor/github.com/shirou/gopsutil/mem/mem_darwin.go
index 3e259a0..4fe7009 100644
--- a/vendor/github.com/shirou/gopsutil/mem/mem_darwin.go
+++ b/vendor/github.com/shirou/gopsutil/mem/mem_darwin.go
@@ -35,7 +35,7 @@ func SwapMemory() (*SwapMemoryStat, error) {
func SwapMemoryWithContext(ctx context.Context) (*SwapMemoryStat, error) {
var ret *SwapMemoryStat
- swapUsage, err := common.DoSysctrl("vm.swapusage")
+ swapUsage, err := common.DoSysctrlWithContext(ctx, "vm.swapusage")
if err != nil {
return ret, err
}
diff --git a/vendor/github.com/shirou/gopsutil/mem/mem_freebsd.go b/vendor/github.com/shirou/gopsutil/mem/mem_freebsd.go
index e691227..1fa880b 100644
--- a/vendor/github.com/shirou/gopsutil/mem/mem_freebsd.go
+++ b/vendor/github.com/shirou/gopsutil/mem/mem_freebsd.go
@@ -5,9 +5,7 @@ package mem
import (
"context"
"errors"
- "os/exec"
- "strconv"
- "strings"
+ "unsafe"
"golang.org/x/sys/unix"
)
@@ -69,53 +67,66 @@ func VirtualMemoryWithContext(ctx context.Context) (*VirtualMemoryStat, error) {
}
// Return swapinfo
-// FreeBSD can have multiple swap devices. but use only first device
func SwapMemory() (*SwapMemoryStat, error) {
return SwapMemoryWithContext(context.Background())
}
-func SwapMemoryWithContext(ctx context.Context) (*SwapMemoryStat, error) {
- swapinfo, err := exec.LookPath("swapinfo")
- if err != nil {
- return nil, err
- }
+// Constants from vm/vm_param.h
+// nolint: golint
+const (
+ XSWDEV_VERSION = 1
+)
- out, err := invoke.Command(swapinfo)
- if err != nil {
- return nil, err
- }
- for _, line := range strings.Split(string(out), "\n") {
- values := strings.Fields(line)
- // skip title line
- if len(values) == 0 || values[0] == "Device" {
- continue
- }
-
- u := strings.Replace(values[4], "%", "", 1)
- total_v, err := strconv.ParseUint(values[1], 10, 64)
- if err != nil {
- return nil, err
- }
- used_v, err := strconv.ParseUint(values[2], 10, 64)
- if err != nil {
- return nil, err
- }
- free_v, err := strconv.ParseUint(values[3], 10, 64)
- if err != nil {
- return nil, err
- }
- up_v, err := strconv.ParseFloat(u, 64)
- if err != nil {
- return nil, err
- }
-
- return &SwapMemoryStat{
- Total: total_v,
- Used: used_v,
- Free: free_v,
- UsedPercent: up_v,
- }, nil
- }
-
- return nil, errors.New("no swap devices found")
+// Types from vm/vm_param.h
+type xswdev struct {
+ Version uint32 // Version is the version
+ Dev uint32 // Dev is the device identifier
+ Flags int32 // Flags is the swap flags applied to the device
+ NBlks int32 // NBlks is the total number of blocks
+ Used int32 // Used is the number of blocks used
+}
+
+func SwapMemoryWithContext(ctx context.Context) (*SwapMemoryStat, error) {
+ // FreeBSD can have multiple swap devices so we total them up
+ i, err := unix.SysctlUint32("vm.nswapdev")
+ if err != nil {
+ return nil, err
+ }
+
+ if i == 0 {
+ return nil, errors.New("no swap devices found")
+ }
+
+ c := int(i)
+
+ i, err = unix.SysctlUint32("vm.stats.vm.v_page_size")
+ if err != nil {
+ return nil, err
+ }
+ pageSize := uint64(i)
+
+ var buf []byte
+ s := &SwapMemoryStat{}
+ for n := 0; n < c; n++ {
+ buf, err = unix.SysctlRaw("vm.swap_info", n)
+ if err != nil {
+ return nil, err
+ }
+
+ xsw := (*xswdev)(unsafe.Pointer(&buf[0]))
+ if xsw.Version != XSWDEV_VERSION {
+ return nil, errors.New("xswdev version mismatch")
+ }
+ s.Total += uint64(xsw.NBlks)
+ s.Used += uint64(xsw.Used)
+ }
+
+ if s.Total != 0 {
+ s.UsedPercent = float64(s.Used) / float64(s.Total) * 100
+ }
+ s.Total *= pageSize
+ s.Used *= pageSize
+ s.Free = s.Total - s.Used
+
+ return s, nil
}
diff --git a/vendor/github.com/shirou/gopsutil/mem/mem_linux.go b/vendor/github.com/shirou/gopsutil/mem/mem_linux.go
index fe6c4e1..d326fcc 100644
--- a/vendor/github.com/shirou/gopsutil/mem/mem_linux.go
+++ b/vendor/github.com/shirou/gopsutil/mem/mem_linux.go
@@ -65,13 +65,17 @@ func VirtualMemoryWithContext(ctx context.Context) (*VirtualMemoryStat, error) {
ret.PageTables = t * 1024
case "SwapCached":
ret.SwapCached = t * 1024
+ case "CommitLimit":
+ ret.CommitLimit = t * 1024
+ case "Committed_AS":
+ ret.CommittedAS = t * 1024
}
}
if !memavail {
ret.Available = ret.Free + ret.Buffers + ret.Cached
}
- ret.Used = ret.Total - ret.Available
- ret.UsedPercent = float64(ret.Total-ret.Available) / float64(ret.Total) * 100.0
+ ret.Used = ret.Total - ret.Free - ret.Buffers - ret.Cached
+ ret.UsedPercent = float64(ret.Used) / float64(ret.Total) * 100.0
return ret, nil
}
diff --git a/vendor/github.com/shirou/gopsutil/mem/mem_openbsd.go b/vendor/github.com/shirou/gopsutil/mem/mem_openbsd.go
index e4834f3..35472a3 100644
--- a/vendor/github.com/shirou/gopsutil/mem/mem_openbsd.go
+++ b/vendor/github.com/shirou/gopsutil/mem/mem_openbsd.go
@@ -99,7 +99,7 @@ func SwapMemoryWithContext(ctx context.Context) (*SwapMemoryStat, error) {
return nil, err
}
- out, err := invoke.Command(swapctl, "-sk")
+ out, err := invoke.CommandWithContext(ctx, swapctl, "-sk")
if err != nil {
return &SwapMemoryStat{}, nil
}
diff --git a/vendor/github.com/shirou/gopsutil/mem/mem_solaris.go b/vendor/github.com/shirou/gopsutil/mem/mem_solaris.go
index d6c6a5f..0736bc4 100644
--- a/vendor/github.com/shirou/gopsutil/mem/mem_solaris.go
+++ b/vendor/github.com/shirou/gopsutil/mem/mem_solaris.go
@@ -57,7 +57,8 @@ func zoneName() (string, error) {
return "", err
}
- out, err := invoke.Command(zonename)
+ ctx := context.Background()
+ out, err := invoke.CommandWithContext(ctx, zonename)
if err != nil {
return "", err
}
@@ -73,7 +74,8 @@ func globalZoneMemoryCapacity() (uint64, error) {
return 0, err
}
- out, err := invoke.Command(prtconf)
+ ctx := context.Background()
+ out, err := invoke.CommandWithContext(ctx, prtconf)
if err != nil {
return 0, err
}
@@ -99,7 +101,8 @@ func nonGlobalZoneMemoryCapacity() (uint64, error) {
return 0, err
}
- out, err := invoke.Command(kstat, "-p", "-c", "zone_memory_cap", "memory_cap:*:*:physcap")
+ ctx := context.Background()
+ out, err := invoke.CommandWithContext(ctx, kstat, "-p", "-c", "zone_memory_cap", "memory_cap:*:*:physcap")
if err != nil {
return 0, err
}
diff --git a/vendor/github.com/shirou/gopsutil/mem/mem_windows.go b/vendor/github.com/shirou/gopsutil/mem/mem_windows.go
index d40f6cf..cc9ce82 100644
--- a/vendor/github.com/shirou/gopsutil/mem/mem_windows.go
+++ b/vendor/github.com/shirou/gopsutil/mem/mem_windows.go
@@ -84,7 +84,7 @@ func SwapMemoryWithContext(ctx context.Context) (*SwapMemoryStat, error) {
Total: tot,
Used: used,
Free: free,
- UsedPercent: float64(used / tot),
+ UsedPercent: float64(used) / float64(tot),
}
return ret, nil
diff --git a/vendor/github.com/shirou/gopsutil/mktypes.sh b/vendor/github.com/shirou/gopsutil/mktypes.sh
new file mode 100644
index 0000000..7bf2e24
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/mktypes.sh
@@ -0,0 +1,37 @@
+
+DIRS="cpu disk docker host load mem net process"
+
+GOOS=`uname | tr '[:upper:]' '[:lower:]'`
+ARCH=`uname -m`
+
+case $ARCH in
+ amd64)
+ GOARCH="amd64"
+ ;;
+ x86_64)
+ GOARCH="amd64"
+ ;;
+ i386)
+ GOARCH="386"
+ ;;
+ i686)
+ GOARCH="386"
+ ;;
+ arm)
+ GOARCH="arm"
+ ;;
+ *)
+ echo "unknown arch: $ARCH"
+ exit 1
+esac
+
+for DIR in $DIRS
+do
+ if [ -e ${DIR}/types_${GOOS}.go ]; then
+ echo "// +build $GOOS" > ${DIR}/${DIR}_${GOOS}_${GOARCH}.go
+ echo "// +build $GOARCH" >> ${DIR}/${DIR}_${GOOS}_${GOARCH}.go
+ go tool cgo -godefs ${DIR}/types_${GOOS}.go >> ${DIR}/${DIR}_${GOOS}_${GOARCH}.go
+ fi
+done
+
+
diff --git a/vendor/github.com/shirou/gopsutil/net/net.go b/vendor/github.com/shirou/gopsutil/net/net.go
index 428e68e..c31f512 100644
--- a/vendor/github.com/shirou/gopsutil/net/net.go
+++ b/vendor/github.com/shirou/gopsutil/net/net.go
@@ -12,11 +12,7 @@ import (
"github.com/shirou/gopsutil/internal/common"
)
-var invoke common.Invoker
-
-func init() {
- invoke = common.Invoke{}
-}
+var invoke common.Invoker = common.Invoke{}
type IOCountersStat struct {
Name string `json:"name"` // interface name
diff --git a/vendor/github.com/shirou/gopsutil/net/net_darwin.go b/vendor/github.com/shirou/gopsutil/net/net_darwin.go
index 2afb0f0..0d89280 100644
--- a/vendor/github.com/shirou/gopsutil/net/net_darwin.go
+++ b/vendor/github.com/shirou/gopsutil/net/net_darwin.go
@@ -180,7 +180,7 @@ func IOCountersWithContext(ctx context.Context, pernic bool) ([]IOCountersStat,
}
// try to get all interface metrics, and hope there won't be any truncated
- out, err := invoke.Command(netstat, "-ibdnW")
+ out, err := invoke.CommandWithContext(ctx, netstat, "-ibdnW")
if err != nil {
return nil, err
}
@@ -208,7 +208,7 @@ func IOCountersWithContext(ctx context.Context, pernic bool) ([]IOCountersStat,
if err != nil {
return nil, err
}
- if out, err = invoke.Command(ifconfig, "-l"); err != nil {
+ if out, err = invoke.CommandWithContext(ctx, ifconfig, "-l"); err != nil {
return nil, err
}
interfaceNames := strings.Fields(strings.TrimRight(string(out), endOfLine))
@@ -227,7 +227,7 @@ func IOCountersWithContext(ctx context.Context, pernic bool) ([]IOCountersStat,
}
if truncated {
// run netstat with -I$ifacename
- if out, err = invoke.Command(netstat, "-ibdnWI"+interfaceName); err != nil {
+ if out, err = invoke.CommandWithContext(ctx, netstat, "-ibdnWI"+interfaceName); err != nil {
return nil, err
}
parsedIfaces, err := parseNetstatOutput(string(out))
diff --git a/vendor/github.com/shirou/gopsutil/net/net_freebsd.go b/vendor/github.com/shirou/gopsutil/net/net_freebsd.go
index 9daed8d..ce02415 100644
--- a/vendor/github.com/shirou/gopsutil/net/net_freebsd.go
+++ b/vendor/github.com/shirou/gopsutil/net/net_freebsd.go
@@ -21,7 +21,7 @@ func IOCountersWithContext(ctx context.Context, pernic bool) ([]IOCountersStat,
if err != nil {
return nil, err
}
- out, err := invoke.Command(netstat, "-ibdnW")
+ out, err := invoke.CommandWithContext(ctx, netstat, "-ibdnW")
if err != nil {
return nil, err
}
diff --git a/vendor/github.com/shirou/gopsutil/net/net_openbsd.go b/vendor/github.com/shirou/gopsutil/net/net_openbsd.go
index 4b194eb..3e74e8f 100644
--- a/vendor/github.com/shirou/gopsutil/net/net_openbsd.go
+++ b/vendor/github.com/shirou/gopsutil/net/net_openbsd.go
@@ -106,11 +106,11 @@ func IOCountersWithContext(ctx context.Context, pernic bool) ([]IOCountersStat,
if err != nil {
return nil, err
}
- out, err := invoke.Command(netstat, "-inb")
+ out, err := invoke.CommandWithContext(ctx, netstat, "-inb")
if err != nil {
return nil, err
}
- out2, err := invoke.Command(netstat, "-ind")
+ out2, err := invoke.CommandWithContext(ctx, netstat, "-ind")
if err != nil {
return nil, err
}
@@ -290,7 +290,7 @@ func ConnectionsWithContext(ctx context.Context, kind string) ([]ConnectionStat,
if err != nil {
return nil, err
}
- out, err := invoke.Command(netstat, args...)
+ out, err := invoke.CommandWithContext(ctx, netstat, args...)
if err != nil {
return nil, err
diff --git a/vendor/github.com/shirou/gopsutil/net/net_unix.go b/vendor/github.com/shirou/gopsutil/net/net_unix.go
index 5ceb9cc..e3ff262 100644
--- a/vendor/github.com/shirou/gopsutil/net/net_unix.go
+++ b/vendor/github.com/shirou/gopsutil/net/net_unix.go
@@ -66,7 +66,7 @@ func ConnectionsPidWithContext(ctx context.Context, kind string, pid int32) ([]C
return ret, common.ErrNotImplementedError
}
- r, err := common.CallLsof(invoke, pid, args...)
+ r, err := common.CallLsofWithContext(ctx, invoke, pid, args...)
if err != nil {
return nil, err
}
diff --git a/vendor/github.com/shirou/gopsutil/process/process.go b/vendor/github.com/shirou/gopsutil/process/process.go
index e20742a..a4b24f4 100644
--- a/vendor/github.com/shirou/gopsutil/process/process.go
+++ b/vendor/github.com/shirou/gopsutil/process/process.go
@@ -3,6 +3,7 @@ package process
import (
"context"
"encoding/json"
+ "errors"
"runtime"
"time"
@@ -11,11 +12,10 @@ import (
"github.com/shirou/gopsutil/mem"
)
-var invoke common.Invoker
-
-func init() {
- invoke = common.Invoke{}
-}
+var (
+ invoke common.Invoker = common.Invoke{}
+ ErrorNoChildren = errors.New("process does not have children")
+)
type Process struct {
Pid int32 `json:"pid"`
diff --git a/vendor/github.com/shirou/gopsutil/process/process_darwin.go b/vendor/github.com/shirou/gopsutil/process/process_darwin.go
index 588640a..c949154 100644
--- a/vendor/github.com/shirou/gopsutil/process/process_darwin.go
+++ b/vendor/github.com/shirou/gopsutil/process/process_darwin.go
@@ -51,7 +51,7 @@ func Pids() ([]int32, error) {
func PidsWithContext(ctx context.Context) ([]int32, error) {
var ret []int32
- pids, err := callPs("pid", 0, false)
+ pids, err := callPsWithContext(ctx, "pid", 0, false)
if err != nil {
return ret, err
}
@@ -72,7 +72,7 @@ func (p *Process) Ppid() (int32, error) {
}
func (p *Process) PpidWithContext(ctx context.Context) (int32, error) {
- r, err := callPs("ppid", p.Pid, false)
+ r, err := callPsWithContext(ctx, "ppid", p.Pid, false)
if err != nil {
return 0, err
}
@@ -119,9 +119,9 @@ func (p *Process) ExeWithContext(ctx context.Context) (string, error) {
return "", err
}
- lsof := exec.Command(lsof_bin, "-p", strconv.Itoa(int(p.Pid)), "-Fpfn")
- awk := exec.Command(awk_bin, "NR==5{print}")
- sed := exec.Command(sed_bin, "s/n\\//\\//")
+ lsof := exec.CommandContext(ctx, lsof_bin, "-p", strconv.Itoa(int(p.Pid)), "-Fpfn")
+ awk := exec.CommandContext(ctx, awk_bin, "NR==5{print}")
+ sed := exec.CommandContext(ctx, sed_bin, "s/n\\//\\//")
output, _, err := common.Pipeline(lsof, awk, sed)
@@ -141,7 +141,7 @@ func (p *Process) Cmdline() (string, error) {
}
func (p *Process) CmdlineWithContext(ctx context.Context) (string, error) {
- r, err := callPs("command", p.Pid, false)
+ r, err := callPsWithContext(ctx, "command", p.Pid, false)
if err != nil {
return "", err
}
@@ -158,7 +158,7 @@ func (p *Process) CmdlineSlice() ([]string, error) {
}
func (p *Process) CmdlineSliceWithContext(ctx context.Context) ([]string, error) {
- r, err := callPs("command", p.Pid, false)
+ r, err := callPsWithContext(ctx, "command", p.Pid, false)
if err != nil {
return nil, err
}
@@ -169,7 +169,7 @@ func (p *Process) CreateTime() (int64, error) {
}
func (p *Process) CreateTimeWithContext(ctx context.Context) (int64, error) {
- r, err := callPs("etime", p.Pid, false)
+ r, err := callPsWithContext(ctx, "etime", p.Pid, false)
if err != nil {
return 0, err
}
@@ -210,7 +210,7 @@ func (p *Process) Parent() (*Process, error) {
}
func (p *Process) ParentWithContext(ctx context.Context) (*Process, error) {
- rr, err := common.CallLsof(invoke, p.Pid, "-FR")
+ rr, err := common.CallLsofWithContext(ctx, invoke, p.Pid, "-FR")
if err != nil {
return nil, err
}
@@ -232,7 +232,7 @@ func (p *Process) Status() (string, error) {
}
func (p *Process) StatusWithContext(ctx context.Context) (string, error) {
- r, err := callPs("state", p.Pid, false)
+ r, err := callPsWithContext(ctx, "state", p.Pid, false)
if err != nil {
return "", err
}
@@ -350,7 +350,7 @@ func (p *Process) NumThreads() (int32, error) {
}
func (p *Process) NumThreadsWithContext(ctx context.Context) (int32, error) {
- r, err := callPs("utime,stime", p.Pid, true)
+ r, err := callPsWithContext(ctx, "utime,stime", p.Pid, true)
if err != nil {
return 0, err
}
@@ -395,7 +395,7 @@ func (p *Process) Times() (*cpu.TimesStat, error) {
}
func (p *Process) TimesWithContext(ctx context.Context) (*cpu.TimesStat, error) {
- r, err := callPs("utime,stime", p.Pid, false)
+ r, err := callPsWithContext(ctx, "utime,stime", p.Pid, false)
if err != nil {
return nil, err
@@ -429,7 +429,7 @@ func (p *Process) MemoryInfo() (*MemoryInfoStat, error) {
}
func (p *Process) MemoryInfoWithContext(ctx context.Context) (*MemoryInfoStat, error) {
- r, err := callPs("rss,vsize,pagein", p.Pid, false)
+ r, err := callPsWithContext(ctx, "rss,vsize,pagein", p.Pid, false)
if err != nil {
return nil, err
}
@@ -467,7 +467,7 @@ func (p *Process) Children() ([]*Process, error) {
}
func (p *Process) ChildrenWithContext(ctx context.Context) ([]*Process, error) {
- pids, err := common.CallPgrep(invoke, p.Pid)
+ pids, err := common.CallPgrepWithContext(ctx, invoke, p.Pid)
if err != nil {
return nil, err
}
@@ -609,7 +609,7 @@ func NewProcess(pid int32) (*Process, error) {
// Return value deletes Header line(you must not input wrong arg).
// And splited by Space. Caller have responsibility to manage.
// If passed arg pid is 0, get information from all process.
-func callPs(arg string, pid int32, threadOption bool) ([][]string, error) {
+func callPsWithContext(ctx context.Context, arg string, pid int32, threadOption bool) ([][]string, error) {
bin, err := exec.LookPath("ps")
if err != nil {
return [][]string{}, err
@@ -623,7 +623,7 @@ func callPs(arg string, pid int32, threadOption bool) ([][]string, error) {
} else {
cmd = []string{"-x", "-o", arg, "-p", strconv.Itoa(int(pid))}
}
- out, err := invoke.Command(bin, cmd...)
+ out, err := invoke.CommandWithContext(ctx, bin, cmd...)
if err != nil {
return [][]string{}, err
}
diff --git a/vendor/github.com/shirou/gopsutil/process/process_freebsd.go b/vendor/github.com/shirou/gopsutil/process/process_freebsd.go
index 13b3d88..af2b3b1 100644
--- a/vendor/github.com/shirou/gopsutil/process/process_freebsd.go
+++ b/vendor/github.com/shirou/gopsutil/process/process_freebsd.go
@@ -355,7 +355,7 @@ func (p *Process) Children() ([]*Process, error) {
}
func (p *Process) ChildrenWithContext(ctx context.Context) ([]*Process, error) {
- pids, err := common.CallPgrep(invoke, p.Pid)
+ pids, err := common.CallPgrepWithContext(ctx, invoke, p.Pid)
if err != nil {
return nil, err
}
diff --git a/vendor/github.com/shirou/gopsutil/process/process_linux.go b/vendor/github.com/shirou/gopsutil/process/process_linux.go
index 8f59949..7ec1bc5 100644
--- a/vendor/github.com/shirou/gopsutil/process/process_linux.go
+++ b/vendor/github.com/shirou/gopsutil/process/process_linux.go
@@ -7,7 +7,6 @@ import (
"bytes"
"context"
"encoding/json"
- "errors"
"fmt"
"io/ioutil"
"math"
@@ -23,10 +22,7 @@ import (
"golang.org/x/sys/unix"
)
-var (
- ErrorNoChildren = errors.New("process does not have children")
- PageSize = uint64(os.Getpagesize())
-)
+var PageSize = uint64(os.Getpagesize())
const (
PrioProcess = 0 // linux/resource.h
@@ -466,7 +462,7 @@ func (p *Process) Children() ([]*Process, error) {
}
func (p *Process) ChildrenWithContext(ctx context.Context) ([]*Process, error) {
- pids, err := common.CallPgrep(invoke, p.Pid)
+ pids, err := common.CallPgrepWithContext(ctx, invoke, p.Pid)
if err != nil {
if pids == nil || len(pids) == 0 {
return nil, ErrorNoChildren
diff --git a/vendor/github.com/shirou/gopsutil/process/process_openbsd.go b/vendor/github.com/shirou/gopsutil/process/process_openbsd.go
index 78631ac..b7b2cba 100644
--- a/vendor/github.com/shirou/gopsutil/process/process_openbsd.go
+++ b/vendor/github.com/shirou/gopsutil/process/process_openbsd.go
@@ -5,6 +5,7 @@ package process
import (
"C"
"bytes"
+ "context"
"encoding/binary"
"strings"
"unsafe"
@@ -15,7 +16,6 @@ import (
net "github.com/shirou/gopsutil/net"
"golang.org/x/sys/unix"
)
-import "context"
// MemoryInfoExStat is different between OSes
type MemoryInfoExStat struct {
@@ -345,7 +345,7 @@ func (p *Process) Children() ([]*Process, error) {
}
func (p *Process) ChildrenWithContext(ctx context.Context) ([]*Process, error) {
- pids, err := common.CallPgrep(invoke, p.Pid)
+ pids, err := common.CallPgrepWithContext(ctx, invoke, p.Pid)
if err != nil {
return nil, err
}
diff --git a/vendor/github.com/shirou/gopsutil/process/testdata/darwin/ps-ax-opid_fail b/vendor/github.com/shirou/gopsutil/process/testdata/darwin/ps-ax-opid_fail
new file mode 100644
index 0000000..fce59ef
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/process/testdata/darwin/ps-ax-opid_fail
@@ -0,0 +1,10 @@
+ PID
+ 245
+ 247
+ 248
+ 249
+ 254
+ 262
+ 264
+ 265
+ 267
diff --git a/vendor/github.com/shirou/gopsutil/v2migration.sh b/vendor/github.com/shirou/gopsutil/v2migration.sh
new file mode 100644
index 0000000..978cc44
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/v2migration.sh
@@ -0,0 +1,134 @@
+# This script is a helper of migration to gopsutil v2 using gorename
+#
+# go get golang.org/x/tools/cmd/gorename
+
+IFS=$'\n'
+
+## Part 1. rename Functions to pass golint. ex) cpu.CPUTimesStat -> cpu.TimesStat
+
+#
+# Note:
+# process has IOCounters() for file IO, and also NetIOCounters() for Net IO.
+# This scripts replace process.NetIOCounters() to IOCounters().
+# So you need hand-fixing process.
+
+TARGETS=`cat < TimesStat
+CPUInfoStat -> InfoStat
+CPUTimes -> Times
+CPUInfo -> Info
+CPUCounts -> Counts
+CPUPercent -> Percent
+DiskUsageStat -> UsageStat
+DiskPartitionStat -> PartitionStat
+DiskIOCountersStat -> IOCountersStat
+DiskPartitions -> Partitions
+DiskIOCounters -> IOCounters
+DiskUsage -> Usage
+HostInfoStat -> InfoStat
+HostInfo -> Info
+GetVirtualization -> Virtualization
+GetPlatformInformation -> PlatformInformation
+LoadAvgStat -> AvgStat
+LoadAvg -> Avg
+NetIOCountersStat -> IOCountersStat
+NetConnectionStat -> ConnectionStat
+NetProtoCountersStat -> ProtoCountersStat
+NetInterfaceAddr -> InterfaceAddr
+NetInterfaceStat -> InterfaceStat
+NetFilterStat -> FilterStat
+NetInterfaces -> Interfaces
+getNetIOCountersAll -> getIOCountersAll
+NetIOCounters -> IOCounters
+NetIOCountersByFile -> IOCountersByFile
+NetProtoCounters -> ProtoCounters
+NetFilterCounters -> FilterCounters
+NetConnections -> Connections
+NetConnectionsPid -> ConnectionsPid
+Uid -> UID
+Id -> ID
+convertCpuTimes -> convertCPUTimes
+EOF`
+
+for T in $TARGETS
+do
+ echo $T
+ gofmt -w -r "$T" ./*.go
+done
+
+
+###### Part 2 rename JSON key name
+## Google JSOn style
+## https://google.github.io/styleguide/jsoncstyleguide.xml
+
+sed -i "" 's/guest_nice/guestNice/g' cpu/*.go
+sed -i "" 's/vendor_id/vendorId/g' cpu/*.go
+sed -i "" 's/physical_id/physicalId/g' cpu/*.go
+sed -i "" 's/model_name/modelName/g' cpu/*.go
+sed -i "" 's/cache_size/cacheSize/g' cpu/*.go
+sed -i "" 's/core_id/coreId/g' cpu/*.go
+
+sed -i "" 's/inodes_total/inodesTotal/g' disk/*.go
+sed -i "" 's/inodes_used/inodesUsed/g' disk/*.go
+sed -i "" 's/inodes_free/inodesFree/g' disk/*.go
+sed -i "" 's/inodes_used_percent/inodesUsedPercent/g' disk/*.go
+sed -i "" 's/read_count/readCount/g' disk/*.go
+sed -i "" 's/write_count/writeCount/g' disk/*.go
+sed -i "" 's/read_bytes/readBytes/g' disk/*.go
+sed -i "" 's/write_bytes/writeBytes/g' disk/*.go
+sed -i "" 's/read_time/readTime/g' disk/*.go
+sed -i "" 's/write_time/writeTime/g' disk/*.go
+sed -i "" 's/io_time/ioTime/g' disk/*.go
+sed -i "" 's/serial_number/serialNumber/g' disk/*.go
+sed -i "" 's/used_percent/usedPercent/g' disk/*.go
+sed -i "" 's/inodesUsed_percent/inodesUsedPercent/g' disk/*.go
+
+sed -i "" 's/total_cache/totalCache/g' docker/*.go
+sed -i "" 's/total_rss_huge/totalRssHuge/g' docker/*.go
+sed -i "" 's/total_rss/totalRss/g' docker/*.go
+sed -i "" 's/total_mapped_file/totalMappedFile/g' docker/*.go
+sed -i "" 's/total_pgpgin/totalPgpgin/g' docker/*.go
+sed -i "" 's/total_pgpgout/totalPgpgout/g' docker/*.go
+sed -i "" 's/total_pgfault/totalPgfault/g' docker/*.go
+sed -i "" 's/total_pgmajfault/totalPgmajfault/g' docker/*.go
+sed -i "" 's/total_inactive_anon/totalInactiveAnon/g' docker/*.go
+sed -i "" 's/total_active_anon/totalActiveAnon/g' docker/*.go
+sed -i "" 's/total_inactive_file/totalInactiveFile/g' docker/*.go
+sed -i "" 's/total_active_file/totalActiveFile/g' docker/*.go
+sed -i "" 's/total_unevictable/totalUnevictable/g' docker/*.go
+sed -i "" 's/mem_usage_in_bytes/memUsageInBytes/g' docker/*.go
+sed -i "" 's/mem_max_usage_in_bytes/memMaxUsageInBytes/g' docker/*.go
+sed -i "" 's/memory.limit_in_bytes/memoryLimitInBbytes/g' docker/*.go
+sed -i "" 's/memory.failcnt/memoryFailcnt/g' docker/*.go
+sed -i "" 's/mapped_file/mappedFile/g' docker/*.go
+sed -i "" 's/container_id/containerID/g' docker/*.go
+sed -i "" 's/rss_huge/rssHuge/g' docker/*.go
+sed -i "" 's/inactive_anon/inactiveAnon/g' docker/*.go
+sed -i "" 's/active_anon/activeAnon/g' docker/*.go
+sed -i "" 's/inactive_file/inactiveFile/g' docker/*.go
+sed -i "" 's/active_file/activeFile/g' docker/*.go
+sed -i "" 's/hierarchical_memory_limit/hierarchicalMemoryLimit/g' docker/*.go
+
+sed -i "" 's/boot_time/bootTime/g' host/*.go
+sed -i "" 's/platform_family/platformFamily/g' host/*.go
+sed -i "" 's/platform_version/platformVersion/g' host/*.go
+sed -i "" 's/virtualization_system/virtualizationSystem/g' host/*.go
+sed -i "" 's/virtualization_role/virtualizationRole/g' host/*.go
+
+sed -i "" 's/used_percent/usedPercent/g' mem/*.go
+
+sed -i "" 's/bytes_sent/bytesSent/g' net/*.go
+sed -i "" 's/bytes_recv/bytesRecv/g' net/*.go
+sed -i "" 's/packets_sent/packetsSent/g' net/*.go
+sed -i "" 's/packets_recv/packetsRecv/g' net/*.go
+sed -i "" 's/conntrack_count/conntrackCount/g' net/*.go
+sed -i "" 's/conntrack_max/conntrackMax/g' net/*.go
+
+sed -i "" 's/read_count/readCount/g' process/*.go
+sed -i "" 's/write_count/writeCount/g' process/*.go
+sed -i "" 's/read_bytes/readBytes/g' process/*.go
+sed -i "" 's/write_bytes/writeBytes/g' process/*.go
+sed -i "" 's/shared_clean/sharedClean/g' process/*.go
+sed -i "" 's/shared_dirty/sharedDirty/g' process/*.go
+sed -i "" 's/private_clean/privateClean/g' process/*.go
+sed -i "" 's/private_dirty/privateDirty/g' process/*.go
diff --git a/vendor/github.com/shirou/gopsutil/windows_memo.rst b/vendor/github.com/shirou/gopsutil/windows_memo.rst
new file mode 100644
index 0000000..38abed8
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/windows_memo.rst
@@ -0,0 +1,36 @@
+Windows memo
+=====================
+
+Size
+----------
+
+DWORD
+ 32-bit unsigned integer
+DWORDLONG
+ 64-bit unsigned integer
+DWORD_PTR
+ unsigned long type for pointer precision
+DWORD32
+ 32-bit unsigned integer
+DWORD64
+ 64-bit unsigned integer
+HALF_PTR
+ _WIN64 = int, else short
+INT
+ 32-bit signed integer
+INT_PTR
+ _WIN64 = __int64 else int
+LONG
+ 32-bit signed integer
+LONGLONG
+ 64-bit signed integer
+LONG_PTR
+ _WIN64 = __int64 else long
+SHORT
+ 16-bit integer
+SIZE_T
+ maximum number of bytes to which a pointer can point. typedef ULONG_PTR SIZE_T;
+SSIZE_T
+ signed version of SIZE_T. typedef LONG_PTR SSIZE_T;
+WORD
+ 16-bit unsigned integer
\ No newline at end of file