diff --git a/.gitignore b/.gitignore
index f5893ce4091322dbdd234a646c79f4ca53841b46..5a8f74faf86ea52f0e56a0e160131a48df4dcca8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-*.o
-src/counters_option.h
-bin
-obj
+*.o
+src/counters_option.h
+bin
+obj
diff --git a/LICENSE b/LICENSE
index f288702d2fa16d3cdf0035b15a9fcbc552cd88e7..3877ae0a7ff6f94ac222fd704e112723db776114 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,674 +1,674 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is 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.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  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.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  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 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. Use with the GNU Affero General Public License.
-
-  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 Affero 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 special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU 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 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 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 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.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    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 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 General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  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 GPL, see
-<https://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<https://www.gnu.org/licenses/why-not-lgpl.html>.
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is 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.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  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.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  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 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. Use with the GNU Affero General Public License.
+
+  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 Affero 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 special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU 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 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 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 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.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    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 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  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 GPL, see
+<https://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.
diff --git a/README.md b/README.md
index 2cf04f18a0611162f0c19e04fde35b7a26e727ca..16d5d13d8b6814b9adf1943a08701b687e157367 100644
--- a/README.md
+++ b/README.md
@@ -1,100 +1,100 @@
-# MOJITO/S
-
-An Open Source System, Energy and Network Monitoring Tools at the O/S level
-
-## Documentation
-
-MojitO/S runs on GNU/Linux
-Usage
-
-```python
-Usage : ./mojitos [-t time] [-f freq] [-r] [-p perf_list] [-l]  \
-                  [-u] [-d network_device] [-o logfile] [-e command arguments...]
-```
-
-Timing
-- If time is 0 then mojitos loops infinitively
-- If -e is present, time and freq are not used
-
-Configuration
-- -r activates RAPL (deprecated)
-- -R activates RAPL
-- -p activates performance counters. perf_list is coma separated list of performance counters without space.
-- -l lists the possible performance counters and quits
-- -d activates network monitoring
-- -u activates system-level load monitoring
-- -s activates statistics of overhead in nanoseconds
-
-MojitO/S is published under the GPL3 license and is part of the [Energumen Project](https://www.irit.fr/energumen/)
-
-<img src="https://www.irit.fr/energumen/images/energumen.png" width="100">
-
-## Installation Instructions
-
-Dependencies
-```bash
-sudo apt install libpowercap0 libpowercap-dev powercap-utils python3
-```
-Download the source code
-```bash
-git clone https://gitlab.irit.fr/sepia-pub/mojitos.git
-```
-Compile the code
-```bash
-cd mojitos
-make
-```
-To execute mojitos without being root to monitor performance counters
-```bash
-sudo sh -c 'echo 0 >/proc/sys/kernel/perf_event_paranoid'
-```
-To execute mohitos without being root for accessing RAPL
-```bash
-sudo chmod a+w /sys/class/powercap/intel-rapl/*/*
-sudo chmod a+w /sys/class/powercap/intel-rapl/*/*/*
-```
-
-## Tutorial and Examples
-
-RAPL values during 2 seconds with a frequency of 2 Hz
-```bash
-$ ./mojitos -t 2 -f 2 -r
-#timestamp package-00 core0 dram0 
-1036389.135659868 10986 2869 1526 
-1036389.500183551 1291440 255736 515562 
-1036390.000754048 1333553 228393 689513 
-1036390.500113978 1581967 267944 701536 
-```
-Performance counters (cpu_cycle, cache_ll_r_a and page_faults) during 4 seconds with a frequency of 1Hz. For cache performance counters, _r and _w are respectively read and write, and _a, _m and _p are respectively access, miss, pending.
-
-```bash
-$ ./mojitos -t 4 -f 1 -p cpu_cycles,cache_ll_r_a,page_faults
-#timestamp cpu_cycles cache_ll page_faults 
-1036846.351749455 571199 1232 0 
-1036847.001098880 348173344 2451387 872 
-1036848.000166158 388112961 2509305 791 
-1036849.000191883 402255979 2625283 799 
-```
-
-Network values with no time limit with a frequency of 1Hz. rxp and txp are the number of received and sent packets, while rxb and txp are the number of received and sent bytes.
-```bash
-$ ./mojitos -t 0 -f 1 -d enp0s25
-#timestamp rxp rxb txp txb 
-1036559.277376027 0 0 0 0 
-1036560.000161101 4 581 2 179 
-1036561.000083968 178 268675 55 4954 
-1036562.000076162 11 1010 5 510 
-1036563.000069724 17 1643 12 3602 
-1036564.000113394 990 1493008 369 27299 
-```
-
-Overhead of the monitoring for RAPL and cpu_cycle
-```bash
-$ ./mojitos -t 5 -f 1 -p cpu_cycles -r -s
-#timestamp cpu_cycles package-00 core0 dram0 overhead 
-1036988.197227391 162214 19898 4944 1586 149612 
-1036989.000151326 332613664 2513116 379577 1115171 739573 
-1036990.000116433 482150700 3321341 587218 1380673 315719 
-1036991.000182835 525984292 3592582 691221 1385982 272182 
-1036992.000165117 397678789 2770561 444030 1375729 510379 
-```
+# MOJITO/S
+
+An Open Source System, Energy and Network Monitoring Tools at the O/S level
+
+## Documentation
+
+MojitO/S runs on GNU/Linux
+Usage
+
+```python
+Usage : ./mojitos [-t time] [-f freq] [-r] [-p perf_list] [-l]  \
+                  [-u] [-d network_device] [-o logfile] [-e command arguments...]
+```
+
+Timing
+- If time is 0 then mojitos loops infinitively
+- If -e is present, time and freq are not used
+
+Configuration
+- -r activates RAPL (deprecated)
+- -R activates RAPL
+- -p activates performance counters. perf_list is coma separated list of performance counters without space.
+- -l lists the possible performance counters and quits
+- -d activates network monitoring
+- -u activates system-level load monitoring
+- -s activates statistics of overhead in nanoseconds
+
+MojitO/S is published under the GPL3 license and is part of the [Energumen Project](https://www.irit.fr/energumen/)
+
+<img src="https://www.irit.fr/energumen/images/energumen.png" width="100">
+
+## Installation Instructions
+
+Dependencies
+```bash
+sudo apt install libpowercap0 libpowercap-dev powercap-utils python3
+```
+Download the source code
+```bash
+git clone https://gitlab.irit.fr/sepia-pub/mojitos.git
+```
+Compile the code
+```bash
+cd mojitos
+make
+```
+To execute mojitos without being root to monitor performance counters
+```bash
+sudo sh -c 'echo 0 >/proc/sys/kernel/perf_event_paranoid'
+```
+To execute mohitos without being root for accessing RAPL
+```bash
+sudo chmod a+w /sys/class/powercap/intel-rapl/*/*
+sudo chmod a+w /sys/class/powercap/intel-rapl/*/*/*
+```
+
+## Tutorial and Examples
+
+RAPL values during 2 seconds with a frequency of 2 Hz
+```bash
+$ ./mojitos -t 2 -f 2 -r
+#timestamp package-00 core0 dram0 
+1036389.135659868 10986 2869 1526 
+1036389.500183551 1291440 255736 515562 
+1036390.000754048 1333553 228393 689513 
+1036390.500113978 1581967 267944 701536 
+```
+Performance counters (cpu_cycle, cache_ll_r_a and page_faults) during 4 seconds with a frequency of 1Hz. For cache performance counters, _r and _w are respectively read and write, and _a, _m and _p are respectively access, miss, pending.
+
+```bash
+$ ./mojitos -t 4 -f 1 -p cpu_cycles,cache_ll_r_a,page_faults
+#timestamp cpu_cycles cache_ll page_faults 
+1036846.351749455 571199 1232 0 
+1036847.001098880 348173344 2451387 872 
+1036848.000166158 388112961 2509305 791 
+1036849.000191883 402255979 2625283 799 
+```
+
+Network values with no time limit with a frequency of 1Hz. rxp and txp are the number of received and sent packets, while rxb and txp are the number of received and sent bytes.
+```bash
+$ ./mojitos -t 0 -f 1 -d enp0s25
+#timestamp rxp rxb txp txb 
+1036559.277376027 0 0 0 0 
+1036560.000161101 4 581 2 179 
+1036561.000083968 178 268675 55 4954 
+1036562.000076162 11 1010 5 510 
+1036563.000069724 17 1643 12 3602 
+1036564.000113394 990 1493008 369 27299 
+```
+
+Overhead of the monitoring for RAPL and cpu_cycle
+```bash
+$ ./mojitos -t 5 -f 1 -p cpu_cycles -r -s
+#timestamp cpu_cycles package-00 core0 dram0 overhead 
+1036988.197227391 162214 19898 4944 1586 149612 
+1036989.000151326 332613664 2513116 379577 1115171 739573 
+1036990.000116433 482150700 3321341 587218 1380673 315719 
+1036991.000182835 525984292 3592582 691221 1385982 272182 
+1036992.000165117 397678789 2770561 444030 1375729 510379 
+```
diff --git a/makefile b/makefile
index ab8c2dc7ad3d228663f40b3175a97d83350e111e..7229c46426981b4445de4fd5d123b40e03717231 100644
--- a/makefile
+++ b/makefile
@@ -1,48 +1,48 @@
-.PHONY: all clean mojitos mojitos_group debug format
-
-SRC_DIR = src
-OBJ_DIR = obj
-BIN_DIR = bin
-
-OBJECTS = $(addprefix $(OBJ_DIR)/, mojitos.o counters.o rapl.o frapl.o network.o load.o infiniband.o temperature.o)
-OBJECTS_GRP = $(subst _individual,_group, $(OBJECTS))
-
-CC = gcc
-CFLAGS = -std=gnu99 -O3 -Wall -Wextra -Werror -Wpedantic
-
-ASTYLE = astyle --style=kr -xf -s4 -k3 -n -Z -Q
-
-
-# depending on the context it may need to be changed to all: mojitos mojitos_group
-all: mojitos
-
-mojitos: $(OBJ_DIR) $(BIN_DIR) $(OBJECTS)
-	$(CC) $(CFLAGS) -o $(BIN_DIR)/mojitos $(OBJECTS) -lpowercap
-
-$(OBJ_DIR)/counters_%.o: $(SRC_DIR)/counters_%.c $(SRC_DIR)/counters.h $(SRC_DIR)/counters_option.h
-	$(CC) $(CFLAGS) -c $< -o $@
-
-$(SRC_DIR)/counters_option.h: $(SRC_DIR)/counters_option.py
-	python3 ./$(SRC_DIR)/counters_option.py > $(SRC_DIR)/counters_option.h
-
-$(OBJ_DIR)/mojitos.o: $(SRC_DIR)/mojitos.c $(SRC_DIR)/counters_option.h
-	$(CC) $(CFLAGS) -c $< -o $@
-
-$(OBJ_DIR)/%.o : $(SRC_DIR)/%.c $(SRC_DIR)/%.h
-	$(CC) $(CFLAGS) -c $< -o $@
-
-$(OBJ_DIR):
-	mkdir -p $(OBJ_DIR)
-
-$(BIN_DIR):
-	mkdir -p $(BIN_DIR)
-
-debug: CFLAGS += -DDEBUG -g
-debug: all
-
-format:
-	$(ASTYLE) $(SRC_DIR)/*.c $(SRC_DIR)/*.h
-
-clean:
-	\rm -f $(OBJ_DIR)/* $(BIN_DIR)/*
-	\rm -f $(SRC_DIR)/counters_option.h
+.PHONY: all clean mojitos mojitos_group debug format
+
+SRC_DIR = src
+OBJ_DIR = obj
+BIN_DIR = bin
+
+OBJECTS = $(addprefix $(OBJ_DIR)/, mojitos.o counters.o rapl.o frapl.o network.o load.o infiniband.o temperature.o)
+OBJECTS_GRP = $(subst _individual,_group, $(OBJECTS))
+
+CC = gcc
+CFLAGS = -std=gnu99 -O3 -Wall -Wextra -Werror -Wpedantic
+
+ASTYLE = astyle --style=kr -xf -s4 -k3 -n -Z -Q
+
+
+# depending on the context it may need to be changed to all: mojitos mojitos_group
+all: mojitos
+
+mojitos: $(OBJ_DIR) $(BIN_DIR) $(OBJECTS)
+	$(CC) $(CFLAGS) -o $(BIN_DIR)/mojitos $(OBJECTS) -lpowercap
+
+$(OBJ_DIR)/counters_%.o: $(SRC_DIR)/counters_%.c $(SRC_DIR)/counters.h $(SRC_DIR)/counters_option.h
+	$(CC) $(CFLAGS) -c $< -o $@
+
+$(SRC_DIR)/counters_option.h: $(SRC_DIR)/counters_option.py
+	python3 ./$(SRC_DIR)/counters_option.py > $(SRC_DIR)/counters_option.h
+
+$(OBJ_DIR)/mojitos.o: $(SRC_DIR)/mojitos.c $(SRC_DIR)/counters_option.h
+	$(CC) $(CFLAGS) -c $< -o $@
+
+$(OBJ_DIR)/%.o : $(SRC_DIR)/%.c $(SRC_DIR)/%.h
+	$(CC) $(CFLAGS) -c $< -o $@
+
+$(OBJ_DIR):
+	mkdir -p $(OBJ_DIR)
+
+$(BIN_DIR):
+	mkdir -p $(BIN_DIR)
+
+debug: CFLAGS += -DDEBUG -g
+debug: all
+
+format:
+	$(ASTYLE) $(SRC_DIR)/*.c $(SRC_DIR)/*.h
+
+clean:
+	\rm -f $(OBJ_DIR)/* $(BIN_DIR)/*
+	\rm -f $(SRC_DIR)/counters_option.h
diff --git a/src/counters.c b/src/counters.c
index 5a24eedb4099470762fa938dbf9356259ecb9f0f..643c9a38703906b9b6e6decf584b4add6a158ad0 100644
--- a/src/counters.c
+++ b/src/counters.c
@@ -1,212 +1,212 @@
-/*******************************************************
- Copyright (C) 2018-2021 Georges Da Costa <georges.da-costa@irit.fr>
-
-    This file is part of Mojitos.
-
-    Mojitos 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 3 of the License, or
-    (at your option) any later version.
-
-    Mojitos 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 MojitO/S.  If not, see <https://www.gnu.org/licenses/>.
-
- *******************************************************/
-
-#include <linux/perf_event.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <sys/ioctl.h>
-#include <stdio.h>
-#include <stdint.h>
-#include <asm/unistd.h>
-#include <stdint.h>
-
-struct _counter_t {
-    int nbcores;
-    int nbperf;
-    int **counters;
-    uint64_t *counters_values;
-    uint64_t *tmp_counters_values;
-
-    int *perf_indexes;
-
-};
-typedef struct _counter_t *counter_t;
-
-#include "counters_option.h"
-
-void show_all_counters()
-{
-    for(unsigned int i=0; i<nb_counter_option; i++)
-        printf("%s\n", perf_static_info[i].name);
-}
-
-void perf_type_key(__u32 **perf_type, __u64 **perf_key, int *indexes, int nb)
-{
-    *perf_type = malloc(nb*sizeof(__u32));
-    *perf_key  = malloc(nb*sizeof(__u64));
-    for(int i=0; i<nb; i++) {
-        (*perf_key)[i]  = perf_static_info[indexes[i]].perf_key;
-        (*perf_type)[i] = perf_static_info[indexes[i]].perf_type;
-    }
-}
-void perf_event_list(char *perf_string, int *nb_perf, int **perf_indexes)
-{
-    char *token;
-    *nb_perf=0;
-    *perf_indexes=NULL;
-    while((token=strtok(perf_string, ",")) != NULL) {
-        perf_string = NULL;
-        unsigned int i;
-        for(i=0; i<nb_counter_option; i++) {
-            if(strcmp(perf_static_info[i].name, token) == 0) {
-                (*nb_perf)++;
-                (*perf_indexes) = realloc(*perf_indexes, sizeof(int)*(*nb_perf));
-                (*perf_indexes)[*nb_perf-1]=i;
-                break;
-            }
-        }
-        if(i == nb_counter_option) {
-            fprintf(stderr, "Unknown performance counter: %s\n", token);
-            exit(EXIT_FAILURE);
-        }
-    }
-}
-
-static long perf_event_open(struct perf_event_attr *hw_event, pid_t pid,
-                            int cpu, int group_fd, unsigned long flags)
-{
-    long res = syscall(__NR_perf_event_open, hw_event, pid, cpu, group_fd, flags);
-    if (res == -1) {
-        perror("perf_event_open");
-        fprintf(stderr, "Error opening leader %llx\n", hw_event->config);
-        exit(EXIT_FAILURE);
-    }
-    return res;
-}
-
-counter_t _init_counters(const int nb_perf, const __u32 *types, const __u64 *names)
-{
-    struct perf_event_attr pe;
-    unsigned int nbcores = sysconf(_SC_NPROCESSORS_ONLN);
-    memset(&pe, 0, sizeof(struct perf_event_attr));
-    pe.size = sizeof(struct perf_event_attr);
-    pe.disabled = 1;
-
-    counter_t counters = malloc(sizeof(struct _counter_t));
-    counters->nbperf = nb_perf;
-    counters->nbcores=nbcores;
-    counters->counters=malloc(nb_perf*sizeof(int *));
-    for (int i=0; i<nb_perf; i++) {
-        pe.type = types[i];
-        pe.config = names[i];
-        counters->counters[i] = malloc(nbcores*sizeof(int));
-
-        for (unsigned int core=0; core<nbcores; core++) {
-            counters->counters[i][core] = perf_event_open(&pe, -1, core, -1, PERF_FLAG_FD_CLOEXEC);
-        }
-    }
-    return counters;
-}
-
-void clean_counters(void *ptr)
-{
-    counter_t counters = (counter_t) ptr;
-    for(int counter=0; counter<counters->nbperf; counter++) {
-        for(int core=0; core<counters->nbcores; core++)
-            close(counters->counters[counter][core]);
-        free(counters->counters[counter]);
-    }
-    free(counters->counters);
-    free(counters->counters_values);
-    free(counters->tmp_counters_values);
-    free(counters->perf_indexes);
-
-    free(counters);
-}
-
-void start_counters(counter_t counters)
-{
-    for(int counter=0; counter<counters->nbperf; counter++)
-        for(int core=0; core<counters->nbcores; core++)
-            ioctl(counters->counters[counter][core], PERF_EVENT_IOC_ENABLE, 0);
-}
-
-void reset_counters(counter_t counters)
-{
-    for(int counter=0; counter<counters->nbperf; counter++)
-        for(int core=0; core<counters->nbcores; core++)
-            ioctl(counters->counters[counter][core], PERF_EVENT_IOC_RESET, 0);
-}
-
-void _get_counters(counter_t counters, uint64_t *values)
-{
-    for(int i=0; i<counters->nbperf; i++) {
-        uint64_t accu=0;
-        uint64_t count=0;
-        for (int core=0; core<counters->nbcores; core++) {
-            if (-1 == read(counters->counters[i][core], &count, sizeof(uint64_t))) {
-                fprintf(stderr, "Cannot read result");
-                exit(EXIT_FAILURE);
-            }
-            accu += count;
-        }
-        values[i] = accu;
-    }
-}
-
-
-
-
-
-
-unsigned int init_counters(char *args, void **state)
-{
-    int nb_perf;
-    int *perf_indexes=NULL;
-
-    perf_event_list(args, &nb_perf, &perf_indexes);
-
-    __u32 *perf_type;
-    __u64 *perf_key;
-    perf_type_key(&perf_type, &perf_key, perf_indexes, nb_perf);
-    counter_t fd = _init_counters(nb_perf, perf_type, perf_key);
-    free(perf_type);
-    free(perf_key);
-
-    fd->perf_indexes = perf_indexes;
-    fd->counters_values = malloc(nb_perf*sizeof(uint64_t));
-    fd->tmp_counters_values = malloc(nb_perf*sizeof(uint64_t));
-    start_counters(fd);
-    _get_counters(fd, fd->counters_values);
-    *state = (void *) fd;
-
-    return nb_perf;
-}
-
-unsigned int get_counters(uint64_t *results, void *ptr)
-{
-    counter_t state = (counter_t) ptr;
-
-    _get_counters(state, state->tmp_counters_values);
-    for(int i=0; i<state->nbperf; i++)
-        results[i] = state->tmp_counters_values[i] - state->counters_values[i];
-
-    memcpy(state->counters_values, state->tmp_counters_values, state->nbperf * sizeof(uint64_t));
-    return state->nbperf;
-}
-
-void label_counters(char **labels, void *ptr)
-{
-    counter_t state = (counter_t) ptr;
-    for(int i=0; i<state->nbperf; i++)
-        labels[i] = perf_static_info[state->perf_indexes[i]].name;
-
-}
+/*******************************************************
+ Copyright (C) 2018-2021 Georges Da Costa <georges.da-costa@irit.fr>
+
+    This file is part of Mojitos.
+
+    Mojitos 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 3 of the License, or
+    (at your option) any later version.
+
+    Mojitos 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 MojitO/S.  If not, see <https://www.gnu.org/licenses/>.
+
+ *******************************************************/
+
+#include <linux/perf_event.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <sys/ioctl.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <asm/unistd.h>
+#include <stdint.h>
+
+struct _counter_t {
+    int nbcores;
+    int nbperf;
+    int **counters;
+    uint64_t *counters_values;
+    uint64_t *tmp_counters_values;
+
+    int *perf_indexes;
+
+};
+typedef struct _counter_t *counter_t;
+
+#include "counters_option.h"
+
+void show_all_counters()
+{
+    for(unsigned int i=0; i<nb_counter_option; i++)
+        printf("%s\n", perf_static_info[i].name);
+}
+
+void perf_type_key(__u32 **perf_type, __u64 **perf_key, int *indexes, int nb)
+{
+    *perf_type = malloc(nb*sizeof(__u32));
+    *perf_key  = malloc(nb*sizeof(__u64));
+    for(int i=0; i<nb; i++) {
+        (*perf_key)[i]  = perf_static_info[indexes[i]].perf_key;
+        (*perf_type)[i] = perf_static_info[indexes[i]].perf_type;
+    }
+}
+void perf_event_list(char *perf_string, int *nb_perf, int **perf_indexes)
+{
+    char *token;
+    *nb_perf=0;
+    *perf_indexes=NULL;
+    while((token=strtok(perf_string, ",")) != NULL) {
+        perf_string = NULL;
+        unsigned int i;
+        for(i=0; i<nb_counter_option; i++) {
+            if(strcmp(perf_static_info[i].name, token) == 0) {
+                (*nb_perf)++;
+                (*perf_indexes) = realloc(*perf_indexes, sizeof(int)*(*nb_perf));
+                (*perf_indexes)[*nb_perf-1]=i;
+                break;
+            }
+        }
+        if(i == nb_counter_option) {
+            fprintf(stderr, "Unknown performance counter: %s\n", token);
+            exit(EXIT_FAILURE);
+        }
+    }
+}
+
+static long perf_event_open(struct perf_event_attr *hw_event, pid_t pid,
+                            int cpu, int group_fd, unsigned long flags)
+{
+    long res = syscall(__NR_perf_event_open, hw_event, pid, cpu, group_fd, flags);
+    if (res == -1) {
+        perror("perf_event_open");
+        fprintf(stderr, "Error opening leader %llx\n", hw_event->config);
+        exit(EXIT_FAILURE);
+    }
+    return res;
+}
+
+counter_t _init_counters(const int nb_perf, const __u32 *types, const __u64 *names)
+{
+    struct perf_event_attr pe;
+    unsigned int nbcores = sysconf(_SC_NPROCESSORS_ONLN);
+    memset(&pe, 0, sizeof(struct perf_event_attr));
+    pe.size = sizeof(struct perf_event_attr);
+    pe.disabled = 1;
+
+    counter_t counters = malloc(sizeof(struct _counter_t));
+    counters->nbperf = nb_perf;
+    counters->nbcores=nbcores;
+    counters->counters=malloc(nb_perf*sizeof(int *));
+    for (int i=0; i<nb_perf; i++) {
+        pe.type = types[i];
+        pe.config = names[i];
+        counters->counters[i] = malloc(nbcores*sizeof(int));
+
+        for (unsigned int core=0; core<nbcores; core++) {
+            counters->counters[i][core] = perf_event_open(&pe, -1, core, -1, PERF_FLAG_FD_CLOEXEC);
+        }
+    }
+    return counters;
+}
+
+void clean_counters(void *ptr)
+{
+    counter_t counters = (counter_t) ptr;
+    for(int counter=0; counter<counters->nbperf; counter++) {
+        for(int core=0; core<counters->nbcores; core++)
+            close(counters->counters[counter][core]);
+        free(counters->counters[counter]);
+    }
+    free(counters->counters);
+    free(counters->counters_values);
+    free(counters->tmp_counters_values);
+    free(counters->perf_indexes);
+
+    free(counters);
+}
+
+void start_counters(counter_t counters)
+{
+    for(int counter=0; counter<counters->nbperf; counter++)
+        for(int core=0; core<counters->nbcores; core++)
+            ioctl(counters->counters[counter][core], PERF_EVENT_IOC_ENABLE, 0);
+}
+
+void reset_counters(counter_t counters)
+{
+    for(int counter=0; counter<counters->nbperf; counter++)
+        for(int core=0; core<counters->nbcores; core++)
+            ioctl(counters->counters[counter][core], PERF_EVENT_IOC_RESET, 0);
+}
+
+void _get_counters(counter_t counters, uint64_t *values)
+{
+    for(int i=0; i<counters->nbperf; i++) {
+        uint64_t accu=0;
+        uint64_t count=0;
+        for (int core=0; core<counters->nbcores; core++) {
+            if (-1 == read(counters->counters[i][core], &count, sizeof(uint64_t))) {
+                fprintf(stderr, "Cannot read result");
+                exit(EXIT_FAILURE);
+            }
+            accu += count;
+        }
+        values[i] = accu;
+    }
+}
+
+
+
+
+
+
+unsigned int init_counters(char *args, void **state)
+{
+    int nb_perf;
+    int *perf_indexes=NULL;
+
+    perf_event_list(args, &nb_perf, &perf_indexes);
+
+    __u32 *perf_type;
+    __u64 *perf_key;
+    perf_type_key(&perf_type, &perf_key, perf_indexes, nb_perf);
+    counter_t fd = _init_counters(nb_perf, perf_type, perf_key);
+    free(perf_type);
+    free(perf_key);
+
+    fd->perf_indexes = perf_indexes;
+    fd->counters_values = malloc(nb_perf*sizeof(uint64_t));
+    fd->tmp_counters_values = malloc(nb_perf*sizeof(uint64_t));
+    start_counters(fd);
+    _get_counters(fd, fd->counters_values);
+    *state = (void *) fd;
+
+    return nb_perf;
+}
+
+unsigned int get_counters(uint64_t *results, void *ptr)
+{
+    counter_t state = (counter_t) ptr;
+
+    _get_counters(state, state->tmp_counters_values);
+    for(int i=0; i<state->nbperf; i++)
+        results[i] = state->tmp_counters_values[i] - state->counters_values[i];
+
+    memcpy(state->counters_values, state->tmp_counters_values, state->nbperf * sizeof(uint64_t));
+    return state->nbperf;
+}
+
+void label_counters(char **labels, void *ptr)
+{
+    counter_t state = (counter_t) ptr;
+    for(int i=0; i<state->nbperf; i++)
+        labels[i] = perf_static_info[state->perf_indexes[i]].name;
+
+}
diff --git a/src/counters.h b/src/counters.h
index af2071721ac97ed3dcf5ab3902c4d3869b769eca..bd2d0a55e178c855325418a274812dc540238d99 100644
--- a/src/counters.h
+++ b/src/counters.h
@@ -1,26 +1,26 @@
-/*******************************************************
- Copyright (C) 2018-2019 Georges Da Costa <georges.da-costa@irit.fr>
-
-    This file is part of Mojitos.
-
-    Mojitos 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 3 of the License, or
-    (at your option) any later version.
-
-    Mojitos 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 MojitO/S.  If not, see <https://www.gnu.org/licenses/>.
-
- *******************************************************/
-
-unsigned int init_counters(char *, void **);
-unsigned int get_counters(uint64_t *results, void *);
-void clean_counters(void *);
-void label_counters(char **labels, void *);
-
-void show_all_counters();
+/*******************************************************
+ Copyright (C) 2018-2019 Georges Da Costa <georges.da-costa@irit.fr>
+
+    This file is part of Mojitos.
+
+    Mojitos 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 3 of the License, or
+    (at your option) any later version.
+
+    Mojitos 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 MojitO/S.  If not, see <https://www.gnu.org/licenses/>.
+
+ *******************************************************/
+
+unsigned int init_counters(char *, void **);
+unsigned int get_counters(uint64_t *results, void *);
+void clean_counters(void *);
+void label_counters(char **labels, void *);
+
+void show_all_counters();
diff --git a/src/counters_option.py b/src/counters_option.py
index 877a33afbd61814acf3ddbb4c5311bd043c4ef37..d853e410082a0168dd7edb77dde268c18a076b01 100755
--- a/src/counters_option.py
+++ b/src/counters_option.py
@@ -1,62 +1,62 @@
-#! /usr/bin/python3
-
-# SPDX-License-Identifier: GPL-3.0-or-later
-# Copyright (C) 2018-2021 Georges Da Costa <georges.da-costa@irit.fr>
-
-linux_include = '/usr/include/linux/perf_event.h'
-
-string = """#include <linux/perf_event.h>
-
-typedef struct counter_option {
-  char *name;
-  __u32 perf_type;
-  __u64 perf_key;
-} counter_option;
-
-static counter_option perf_static_info[] = {"""
-print(string)
-
-nb = 0
-
-black_list = ['stalled_cycles_frontend','stalled_cycles_backend',
-              'cache_l1i', 'cache_op_write', 'cache_result_miss']
-
-with open(linux_include, 'r') as infile:
-    mode = ''
-    for line in infile:
-        if 'perf_hw_id' in line:
-            mode = 'PERF_TYPE_HARDWARE'
-        elif 'perf_hw_cache_' in line:
-            mode = 'PERF_TYPE_HW_CACHE'
-        elif 'perf_sw_id' in line:
-            mode = 'PERF_TYPE_SOFTWARE'
-        elif 'PERF_COUNT_' in line and '=' in line:
-            perf_name = line.split()[0]
-            short_perf = perf_name[14:].lower()
-            if short_perf in black_list:
-                continue
-            if mode == 'PERF_TYPE_HW_CACHE':
-                for op_id, op_id_str in enumerate(['r', 'w', 'p']):
-                    op_id_names = ['PERF_COUNT_HW_CACHE_OP_READ', 'PERF_COUNT_HW_CACHE_OP_WRITE', 'PERF_COUNT_HW_CACHE_OP_PREFETCH']
-                    for result_id, result_id_str in enumerate(['a', 'm']):
-                        result_id_names = ['PERF_COUNT_HW_CACHE_RESULT_ACCESS', 'PERF_COUNT_HW_CACHE_RESULT_MISS']
-
-                        res = '{ .name = "%s_%s_%s", .perf_type = %s, .perf_key = %s | (%s >> 8) | (%s >> 16) },' % (
-                            short_perf, op_id_str, result_id_str,
-                            mode,
-                            perf_name,
-                            op_id_names[op_id],
-                            result_id_names[result_id])
-                                                                                     
-                        print(res)
-                        nb += 1
-
-            else:
-                res = '{ .name = "'+short_perf+'", .perf_type = '+mode+', .perf_key = '+perf_name+'},'
-                print(res)
-                nb += 1
-
-
-print('};')
-
-print('static unsigned int nb_counter_option =',nb,';')
+#! /usr/bin/python3
+
+# SPDX-License-Identifier: GPL-3.0-or-later
+# Copyright (C) 2018-2021 Georges Da Costa <georges.da-costa@irit.fr>
+
+linux_include = '/usr/include/linux/perf_event.h'
+
+string = """#include <linux/perf_event.h>
+
+typedef struct counter_option {
+  char *name;
+  __u32 perf_type;
+  __u64 perf_key;
+} counter_option;
+
+static counter_option perf_static_info[] = {"""
+print(string)
+
+nb = 0
+
+black_list = ['stalled_cycles_frontend','stalled_cycles_backend',
+              'cache_l1i', 'cache_op_write', 'cache_result_miss']
+
+with open(linux_include, 'r') as infile:
+    mode = ''
+    for line in infile:
+        if 'perf_hw_id' in line:
+            mode = 'PERF_TYPE_HARDWARE'
+        elif 'perf_hw_cache_' in line:
+            mode = 'PERF_TYPE_HW_CACHE'
+        elif 'perf_sw_id' in line:
+            mode = 'PERF_TYPE_SOFTWARE'
+        elif 'PERF_COUNT_' in line and '=' in line:
+            perf_name = line.split()[0]
+            short_perf = perf_name[14:].lower()
+            if short_perf in black_list:
+                continue
+            if mode == 'PERF_TYPE_HW_CACHE':
+                for op_id, op_id_str in enumerate(['r', 'w', 'p']):
+                    op_id_names = ['PERF_COUNT_HW_CACHE_OP_READ', 'PERF_COUNT_HW_CACHE_OP_WRITE', 'PERF_COUNT_HW_CACHE_OP_PREFETCH']
+                    for result_id, result_id_str in enumerate(['a', 'm']):
+                        result_id_names = ['PERF_COUNT_HW_CACHE_RESULT_ACCESS', 'PERF_COUNT_HW_CACHE_RESULT_MISS']
+
+                        res = '{ .name = "%s_%s_%s", .perf_type = %s, .perf_key = %s | (%s >> 8) | (%s >> 16) },' % (
+                            short_perf, op_id_str, result_id_str,
+                            mode,
+                            perf_name,
+                            op_id_names[op_id],
+                            result_id_names[result_id])
+                                                                                     
+                        print(res)
+                        nb += 1
+
+            else:
+                res = '{ .name = "'+short_perf+'", .perf_type = '+mode+', .perf_key = '+perf_name+'},'
+                print(res)
+                nb += 1
+
+
+print('};')
+
+print('static unsigned int nb_counter_option =',nb,';')
diff --git a/src/frapl.c b/src/frapl.c
index 9874a12071a3721b09ea3dc014518fe06769a9d4..62c94bc79b9f44e7e0bf4340c02bb0cdfc836cbb 100644
--- a/src/frapl.c
+++ b/src/frapl.c
@@ -1,184 +1,184 @@
-/*******************************************************
- Copyright (C) 2022-2023 Georges Da Costa <georges.da-costa@irit.fr>
-
-    This file is part of Mojitos.
-
-    Mojitos 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 3 of the License, or
-    (at your option) any later version.
-
-    Mojitos 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 MojitO/S.  If not, see <https://www.gnu.org/licenses/>.
-
- *******************************************************/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <inttypes.h>
-#include <errno.h>
-
-
-#define MAX_HEADER 128
-#define UNUSED(expr) do { (void)(expr); } while (0)
-
-
-char *get_frapl_string(const char *filename)
-{
-    int fd = open(filename, O_RDONLY);
-    if( fd == -1) {
-        return NULL;
-    }
-    char *result = malloc(MAX_HEADER);
-    int nb = read(fd, result, MAX_HEADER);
-    close(fd);
-    result[nb-1] = 0;
-    return (result);
-}
-
-void test_append(char *name, int i)
-{
-    //char last = name[strlen(name)-1];
-    //if (last>='0' && last <= '9')
-    //  return;
-    sprintf(name+strlen(name), "%d", i);
-}
-
-
-struct _frapl_t {
-    unsigned int nb;
-    char **names;
-    int *fids;
-    uint64_t *values;
-    uint64_t *tmp_values;
-
-};
-typedef struct _frapl_t _frapl_t;
-
-
-void add_frapl_source(_frapl_t *rapl, char *name, char *energy_uj)
-{
-    rapl->nb += 1;
-    rapl->names = realloc(rapl->names, sizeof(char **)*rapl->nb);
-    rapl->fids = realloc(rapl->fids, sizeof(int *)*rapl->nb);
-
-    rapl->names[rapl->nb-1] = malloc(strlen(name)+1);
-    strcpy(rapl->names[rapl->nb-1], name);
-    //printf("%s\n", energy_uj);
-
-    int fd = open(energy_uj, O_RDONLY);
-
-    if (fd < 0) {
-        fprintf(stderr, "%s ", energy_uj);
-        perror("open");
-        exit(1);
-    }
-    rapl->fids[rapl->nb-1] = fd;
-}
-
-
-void _get_frapl(uint64_t *values, _frapl_t *rapl)
-{
-    static char buffer[512];
-
-    for (unsigned int i = 0; i < rapl->nb; i++) {
-
-        if (pread(rapl->fids[i], buffer, 100, 0) < 0) {
-            perror("pread");
-            exit(1);
-        }
-        values[i] = strtoull(buffer, NULL, 10);
-    }
-}
-
-
-unsigned int init_frapl(char *none, void **ptr)
-{
-    UNUSED(none);
-    _frapl_t *rapl = malloc(sizeof(_frapl_t));
-    rapl->nb = 0;
-    rapl->names = NULL;
-    rapl->fids = NULL;
-
-    char buffer[1024];
-    char *name_base = "/sys/devices/virtual/powercap/intel-rapl/intel-rapl:%d/%s";
-    char *name_sub = "/sys/devices/virtual/powercap/intel-rapl/intel-rapl:%d/intel-rapl:%d:%d/%s";
-
-    for (unsigned int i=0;; i++) {
-        sprintf(buffer, name_base, i, "name");
-        char *tmp = get_frapl_string(buffer);
-        if (tmp == NULL) break;
-        //printf("%s\n", tmp);
-        test_append(tmp, i);
-        //printf("%s -> %s\n", buffer, tmp);
-
-        sprintf(buffer, name_base, i, "energy_uj");
-        add_frapl_source(rapl, tmp, buffer);
-        free(tmp);
-
-        for (unsigned int j=0;; j++) {
-            sprintf(buffer, name_sub, i, i, j, "name");
-            char *tmp_sub = get_frapl_string(buffer);
-            if (tmp_sub == NULL) break;
-            //printf("%s\n", tmp_sub);
-            test_append(tmp_sub, i);
-            //printf("%s -> %s\n", buffer, tmp_sub);
-
-
-            sprintf(buffer, name_sub, i, i, j, "energy_uj");
-            add_frapl_source(rapl, tmp_sub, buffer);
-
-            free(tmp_sub);
-        }
-    }
-
-    rapl->values = calloc(sizeof(uint64_t), rapl->nb);
-    rapl->tmp_values = calloc(sizeof(uint64_t), rapl->nb);
-
-    _get_frapl(rapl->values, rapl);
-
-    *ptr = (void *)rapl;
-    return rapl->nb;
-}
-
-
-unsigned int get_frapl(uint64_t *results, void *ptr)
-{
-    _frapl_t *state = (_frapl_t *) ptr;
-    _get_frapl(state->tmp_values, state);
-    for(unsigned int i=0; i<state->nb; i++)
-        results[i] = state->tmp_values[i] - state->values[i];
-
-    memcpy(state->values, state->tmp_values, sizeof(uint64_t)*state->nb);
-    return state->nb;
-}
-
-void clean_frapl(void *ptr)
-{
-    _frapl_t *rapl = (_frapl_t *) ptr;
-    for(unsigned int i=0; i<rapl->nb; i++) {
-        free(rapl->names[i]);
-        close(rapl->fids[i]);
-    }
-    free(rapl->names);
-    free(rapl->fids);
-    free(rapl->values);
-    free(rapl->tmp_values);
-    free(rapl);
-}
-
-
-void label_frapl(char **labels, void *ptr)
-{
-    _frapl_t *rapl = (_frapl_t *) ptr;
-    for(unsigned int i=0; i<rapl->nb; i++)
-        labels[i] = rapl->names[i];
-}
+/*******************************************************
+ Copyright (C) 2022-2023 Georges Da Costa <georges.da-costa@irit.fr>
+
+    This file is part of Mojitos.
+
+    Mojitos 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 3 of the License, or
+    (at your option) any later version.
+
+    Mojitos 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 MojitO/S.  If not, see <https://www.gnu.org/licenses/>.
+
+ *******************************************************/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <inttypes.h>
+#include <errno.h>
+
+
+#define MAX_HEADER 128
+#define UNUSED(expr) do { (void)(expr); } while (0)
+
+
+char *get_frapl_string(const char *filename)
+{
+    int fd = open(filename, O_RDONLY);
+    if( fd == -1) {
+        return NULL;
+    }
+    char *result = malloc(MAX_HEADER);
+    int nb = read(fd, result, MAX_HEADER);
+    close(fd);
+    result[nb-1] = 0;
+    return (result);
+}
+
+void test_append(char *name, int i)
+{
+    //char last = name[strlen(name)-1];
+    //if (last>='0' && last <= '9')
+    //  return;
+    sprintf(name+strlen(name), "%d", i);
+}
+
+
+struct _frapl_t {
+    unsigned int nb;
+    char **names;
+    int *fids;
+    uint64_t *values;
+    uint64_t *tmp_values;
+
+};
+typedef struct _frapl_t _frapl_t;
+
+
+void add_frapl_source(_frapl_t *rapl, char *name, char *energy_uj)
+{
+    rapl->nb += 1;
+    rapl->names = realloc(rapl->names, sizeof(char **)*rapl->nb);
+    rapl->fids = realloc(rapl->fids, sizeof(int *)*rapl->nb);
+
+    rapl->names[rapl->nb-1] = malloc(strlen(name)+1);
+    strcpy(rapl->names[rapl->nb-1], name);
+    //printf("%s\n", energy_uj);
+
+    int fd = open(energy_uj, O_RDONLY);
+
+    if (fd < 0) {
+        fprintf(stderr, "%s ", energy_uj);
+        perror("open");
+        exit(1);
+    }
+    rapl->fids[rapl->nb-1] = fd;
+}
+
+
+void _get_frapl(uint64_t *values, _frapl_t *rapl)
+{
+    static char buffer[512];
+
+    for (unsigned int i = 0; i < rapl->nb; i++) {
+
+        if (pread(rapl->fids[i], buffer, 100, 0) < 0) {
+            perror("pread");
+            exit(1);
+        }
+        values[i] = strtoull(buffer, NULL, 10);
+    }
+}
+
+
+unsigned int init_frapl(char *none, void **ptr)
+{
+    UNUSED(none);
+    _frapl_t *rapl = malloc(sizeof(_frapl_t));
+    rapl->nb = 0;
+    rapl->names = NULL;
+    rapl->fids = NULL;
+
+    char buffer[1024];
+    char *name_base = "/sys/devices/virtual/powercap/intel-rapl/intel-rapl:%d/%s";
+    char *name_sub = "/sys/devices/virtual/powercap/intel-rapl/intel-rapl:%d/intel-rapl:%d:%d/%s";
+
+    for (unsigned int i=0;; i++) {
+        sprintf(buffer, name_base, i, "name");
+        char *tmp = get_frapl_string(buffer);
+        if (tmp == NULL) break;
+        //printf("%s\n", tmp);
+        test_append(tmp, i);
+        //printf("%s -> %s\n", buffer, tmp);
+
+        sprintf(buffer, name_base, i, "energy_uj");
+        add_frapl_source(rapl, tmp, buffer);
+        free(tmp);
+
+        for (unsigned int j=0;; j++) {
+            sprintf(buffer, name_sub, i, i, j, "name");
+            char *tmp_sub = get_frapl_string(buffer);
+            if (tmp_sub == NULL) break;
+            //printf("%s\n", tmp_sub);
+            test_append(tmp_sub, i);
+            //printf("%s -> %s\n", buffer, tmp_sub);
+
+
+            sprintf(buffer, name_sub, i, i, j, "energy_uj");
+            add_frapl_source(rapl, tmp_sub, buffer);
+
+            free(tmp_sub);
+        }
+    }
+
+    rapl->values = calloc(sizeof(uint64_t), rapl->nb);
+    rapl->tmp_values = calloc(sizeof(uint64_t), rapl->nb);
+
+    _get_frapl(rapl->values, rapl);
+
+    *ptr = (void *)rapl;
+    return rapl->nb;
+}
+
+
+unsigned int get_frapl(uint64_t *results, void *ptr)
+{
+    _frapl_t *state = (_frapl_t *) ptr;
+    _get_frapl(state->tmp_values, state);
+    for(unsigned int i=0; i<state->nb; i++)
+        results[i] = state->tmp_values[i] - state->values[i];
+
+    memcpy(state->values, state->tmp_values, sizeof(uint64_t)*state->nb);
+    return state->nb;
+}
+
+void clean_frapl(void *ptr)
+{
+    _frapl_t *rapl = (_frapl_t *) ptr;
+    for(unsigned int i=0; i<rapl->nb; i++) {
+        free(rapl->names[i]);
+        close(rapl->fids[i]);
+    }
+    free(rapl->names);
+    free(rapl->fids);
+    free(rapl->values);
+    free(rapl->tmp_values);
+    free(rapl);
+}
+
+
+void label_frapl(char **labels, void *ptr)
+{
+    _frapl_t *rapl = (_frapl_t *) ptr;
+    for(unsigned int i=0; i<rapl->nb; i++)
+        labels[i] = rapl->names[i];
+}
diff --git a/src/frapl.h b/src/frapl.h
index 937108e612eba02a3d4d3583ccf09a65803315ac..8ce4e000c4e841e4df629a513c818293ed441c72 100644
--- a/src/frapl.h
+++ b/src/frapl.h
@@ -1,25 +1,25 @@
-/*******************************************************
- Copyright (C) 2022-2023 Georges Da Costa <georges.da-costa@irit.fr>
-
-    This file is part of Mojitos.
-
-    Mojitos 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 3 of the License, or
-    (at your option) any later version.
-
-    Mojitos 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 MojitO/S.  If not, see <https://www.gnu.org/licenses/>.
-
- *******************************************************/
-
-unsigned int init_frapl(char *, void **);
-unsigned int get_frapl(uint64_t *results, void *);
-void clean_frapl(void *);
-void label_frapl(char **labels, void *);
-
+/*******************************************************
+ Copyright (C) 2022-2023 Georges Da Costa <georges.da-costa@irit.fr>
+
+    This file is part of Mojitos.
+
+    Mojitos 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 3 of the License, or
+    (at your option) any later version.
+
+    Mojitos 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 MojitO/S.  If not, see <https://www.gnu.org/licenses/>.
+
+ *******************************************************/
+
+unsigned int init_frapl(char *, void **);
+unsigned int get_frapl(uint64_t *results, void *);
+void clean_frapl(void *);
+void label_frapl(char **labels, void *);
+
diff --git a/src/infiniband.c b/src/infiniband.c
index 66217598c3498d0d04eafa52b5b686ebfac5ea3b..bbc2dce28afc175395a14c71ac09d1324043bb24 100644
--- a/src/infiniband.c
+++ b/src/infiniband.c
@@ -1,81 +1,81 @@
-/*******************************************************
- Copyright (C) 2018-2021 Georges Da Costa <georges.da-costa@irit.fr>
-
-    This file is part of Mojitos.
-
-    Mojitos 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 3 of the License, or
-    (at your option) any later version.
-
-    Mojitos 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 MojitO/S.  If not, see <https://www.gnu.org/licenses/>.
-
- *******************************************************/
-#include <stdlib.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <glob.h>
-
-#include <stdint.h>
-
-#define NB_SENSOR 4
-#define UNUSED(expr) do { (void)(expr); } while (0)
-
-struct network_t {
-    uint64_t values[NB_SENSOR];
-    uint64_t tmp_values[NB_SENSOR];
-    int sources[NB_SENSOR];
-};
-unsigned int _get_network(uint64_t *results, int *sources);
-
-
-unsigned int init_infiniband(char *infi_path, void **ptr)
-{
-    if(infi_path==NULL)
-        return 0;
-
-    if(strcmp(infi_path,"X")==0) {
-
-        glob_t res;
-
-        glob("/sys/class/infiniband/*/ports/*/counters/", 0, NULL, &res);
-        if(res.gl_pathc == 0)
-            return 0;
-        infi_path = res.gl_pathv[0];
-    }
-
-    char *filenames[] = {"%s/port_rcv_packets",
-                         "%s/port_rcv_data",
-                         "%s/port_xmit_packets",
-                         "%s/port_xmit_data"
-                        };
-
-    struct network_t *state = malloc(sizeof(struct network_t));
-
-    char buffer[1024];
-    for(int i=0; i<NB_SENSOR; i++) {
-        sprintf(buffer, filenames[i], infi_path);
-        state->sources[i] = open(buffer, O_RDONLY);
-    }
-
-    *ptr = (void *) state;
-    _get_network(state->values, state->sources);
-
-    return NB_SENSOR;
-}
-
-char *_labels_infiniband[NB_SENSOR] = {"irxp", "irxb", "itxp", "itxb"};
-void label_infiniband(char **labels, void *none)
-{
-    UNUSED(none);
-    for(int i=0; i<NB_SENSOR; i++)
-        labels[i] = _labels_infiniband[i];
-}
+/*******************************************************
+ Copyright (C) 2018-2021 Georges Da Costa <georges.da-costa@irit.fr>
+
+    This file is part of Mojitos.
+
+    Mojitos 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 3 of the License, or
+    (at your option) any later version.
+
+    Mojitos 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 MojitO/S.  If not, see <https://www.gnu.org/licenses/>.
+
+ *******************************************************/
+#include <stdlib.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <string.h>
+
+#include <glob.h>
+
+#include <stdint.h>
+
+#define NB_SENSOR 4
+#define UNUSED(expr) do { (void)(expr); } while (0)
+
+struct network_t {
+    uint64_t values[NB_SENSOR];
+    uint64_t tmp_values[NB_SENSOR];
+    int sources[NB_SENSOR];
+};
+unsigned int _get_network(uint64_t *results, int *sources);
+
+
+unsigned int init_infiniband(char *infi_path, void **ptr)
+{
+    if(infi_path==NULL)
+        return 0;
+
+    if(strcmp(infi_path,"X")==0) {
+
+        glob_t res;
+
+        glob("/sys/class/infiniband/*/ports/*/counters/", 0, NULL, &res);
+        if(res.gl_pathc == 0)
+            return 0;
+        infi_path = res.gl_pathv[0];
+    }
+
+    char *filenames[] = {"%s/port_rcv_packets",
+                         "%s/port_rcv_data",
+                         "%s/port_xmit_packets",
+                         "%s/port_xmit_data"
+                        };
+
+    struct network_t *state = malloc(sizeof(struct network_t));
+
+    char buffer[1024];
+    for(int i=0; i<NB_SENSOR; i++) {
+        sprintf(buffer, filenames[i], infi_path);
+        state->sources[i] = open(buffer, O_RDONLY);
+    }
+
+    *ptr = (void *) state;
+    _get_network(state->values, state->sources);
+
+    return NB_SENSOR;
+}
+
+char *_labels_infiniband[NB_SENSOR] = {"irxp", "irxb", "itxp", "itxb"};
+void label_infiniband(char **labels, void *none)
+{
+    UNUSED(none);
+    for(int i=0; i<NB_SENSOR; i++)
+        labels[i] = _labels_infiniband[i];
+}
diff --git a/src/infiniband.h b/src/infiniband.h
index 1f6aaf9826292da97ac482e8f1e77caaa7f8e71e..4234964fab5076ca91928017534372e2c4d7a4fe 100644
--- a/src/infiniband.h
+++ b/src/infiniband.h
@@ -1,22 +1,22 @@
-/*******************************************************
- Copyright (C) 2018-2019 Georges Da Costa <georges.da-costa@irit.fr>
-
-    This file is part of Mojitos.
-
-    Mojitos 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 3 of the License, or
-    (at your option) any later version.
-
-    Mojitos 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 MojitO/S.  If not, see <https://www.gnu.org/licenses/>.
-
- *******************************************************/
-
-unsigned int init_infiniband(char *infi_path, void **ptr);
-void label_infiniband(char **labels, void *);
+/*******************************************************
+ Copyright (C) 2018-2019 Georges Da Costa <georges.da-costa@irit.fr>
+
+    This file is part of Mojitos.
+
+    Mojitos 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 3 of the License, or
+    (at your option) any later version.
+
+    Mojitos 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 MojitO/S.  If not, see <https://www.gnu.org/licenses/>.
+
+ *******************************************************/
+
+unsigned int init_infiniband(char *infi_path, void **ptr);
+void label_infiniband(char **labels, void *);
diff --git a/src/load.c b/src/load.c
index 4f113467f61acfbd0c0675319e54c3d55d3a8cf2..92b10880805e8b4da0a791e37631f42eb0f2c7ac 100644
--- a/src/load.c
+++ b/src/load.c
@@ -1,92 +1,92 @@
-/*******************************************************
- Copyright (C) 2019-2021 Georges Da Costa <georges.da-costa@irit.fr>
-
-    This file is part of Mojitos.
-
-    Mojitos 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 3 of the License, or
-    (at your option) any later version.
-
-    Mojitos 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 MojitO/S.  If not, see <https://www.gnu.org/licenses/>.
-
- *******************************************************/
-#include <unistd.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <string.h>
-#include <stdio.h>
-
-#define LOAD_BUFFER_SIZE 1024
-#define UNUSED(expr) do { (void)(expr); } while (0)
-char buffer[LOAD_BUFFER_SIZE];
-
-static int load_fid=-1;
-static uint64_t load_values[10]= {0,0,0,0,0,0,0,0,0,0};
-static uint64_t tmp_load_values[10]= {0,0,0,0,0,0,0,0,0,0};
-static char *stat = "/proc/stat";
-
-void _get_load(uint64_t *results)
-{
-    if (pread(load_fid, buffer, LOAD_BUFFER_SIZE-1, 0) < 0) {
-        perror("pread");
-        exit(1);
-    }
-    int pos=0;
-    while(buffer[pos] > '9' || buffer[pos] < '0') pos++;
-    for(int i=0; i<10; i++) {
-        results[i] = strtoull(buffer+pos, NULL, 10);
-        while(buffer[pos] <= '9' && buffer[pos] >= '0') pos++;
-        pos++;
-    }
-}
-
-// Public interface
-
-unsigned int init_load(char *argument, void **state)
-{
-    UNUSED(argument);
-    UNUSED(state);
-    load_fid = open(stat, O_RDONLY);
-    if (load_fid < 0) {
-        fprintf(stderr,"%s ",stat);
-        perror("open");
-        exit(1);
-    }
-    _get_load(load_values);
-    return 10;
-}
-
-unsigned int get_load(uint64_t *results, void *state)
-{
-    UNUSED(state);
-    _get_load(tmp_load_values);
-    for(int i=0; i<10; i++)
-        results[i] = tmp_load_values[i] - load_values[i];
-
-    memcpy(load_values, tmp_load_values, sizeof(load_values));
-    return 10;
-}
-
-void clean_load(void *state)
-{
-    UNUSED(state);
-    close(load_fid);
-}
-
-char *_labels[10] = {"user","nice","system","idle","iowait","irq",
-                     "softirq","steal","guest","guest_nice"
-                    };
-void label_load(char **labels, void *none)
-{
-    UNUSED(none);
-    for(int i=0; i<10; i++)
-        labels[i] = _labels[i];
-}
+/*******************************************************
+ Copyright (C) 2019-2021 Georges Da Costa <georges.da-costa@irit.fr>
+
+    This file is part of Mojitos.
+
+    Mojitos 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 3 of the License, or
+    (at your option) any later version.
+
+    Mojitos 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 MojitO/S.  If not, see <https://www.gnu.org/licenses/>.
+
+ *******************************************************/
+#include <unistd.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+#include <stdio.h>
+
+#define LOAD_BUFFER_SIZE 1024
+#define UNUSED(expr) do { (void)(expr); } while (0)
+char buffer[LOAD_BUFFER_SIZE];
+
+static int load_fid=-1;
+static uint64_t load_values[10]= {0,0,0,0,0,0,0,0,0,0};
+static uint64_t tmp_load_values[10]= {0,0,0,0,0,0,0,0,0,0};
+static char *stat = "/proc/stat";
+
+void _get_load(uint64_t *results)
+{
+    if (pread(load_fid, buffer, LOAD_BUFFER_SIZE-1, 0) < 0) {
+        perror("pread");
+        exit(1);
+    }
+    int pos=0;
+    while(buffer[pos] > '9' || buffer[pos] < '0') pos++;
+    for(int i=0; i<10; i++) {
+        results[i] = strtoull(buffer+pos, NULL, 10);
+        while(buffer[pos] <= '9' && buffer[pos] >= '0') pos++;
+        pos++;
+    }
+}
+
+// Public interface
+
+unsigned int init_load(char *argument, void **state)
+{
+    UNUSED(argument);
+    UNUSED(state);
+    load_fid = open(stat, O_RDONLY);
+    if (load_fid < 0) {
+        fprintf(stderr,"%s ",stat);
+        perror("open");
+        exit(1);
+    }
+    _get_load(load_values);
+    return 10;
+}
+
+unsigned int get_load(uint64_t *results, void *state)
+{
+    UNUSED(state);
+    _get_load(tmp_load_values);
+    for(int i=0; i<10; i++)
+        results[i] = tmp_load_values[i] - load_values[i];
+
+    memcpy(load_values, tmp_load_values, sizeof(load_values));
+    return 10;
+}
+
+void clean_load(void *state)
+{
+    UNUSED(state);
+    close(load_fid);
+}
+
+char *_labels[10] = {"user","nice","system","idle","iowait","irq",
+                     "softirq","steal","guest","guest_nice"
+                    };
+void label_load(char **labels, void *none)
+{
+    UNUSED(none);
+    for(int i=0; i<10; i++)
+        labels[i] = _labels[i];
+}
diff --git a/src/load.h b/src/load.h
index 299fa3e839dca6cc1dc7aacbab411e4c402cd86e..78c1b40b4b0a5da3f5a7c9a8ab5e04b8489e6250 100644
--- a/src/load.h
+++ b/src/load.h
@@ -1,24 +1,24 @@
-/*******************************************************
- Copyright (C) 2018-2019 Georges Da Costa <georges.da-costa@irit.fr>
-
-    This file is part of Mojitos.
-
-    Mojitos 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 3 of the License, or
-    (at your option) any later version.
-
-    Mojitos 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 MojitO/S.  If not, see <https://www.gnu.org/licenses/>.
-
- *******************************************************/
-
-unsigned int init_load(char *, void **);
-unsigned int get_load(uint64_t *results, void *);
-void clean_load(void *);
-void label_load(char **labels, void *);
+/*******************************************************
+ Copyright (C) 2018-2019 Georges Da Costa <georges.da-costa@irit.fr>
+
+    This file is part of Mojitos.
+
+    Mojitos 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 3 of the License, or
+    (at your option) any later version.
+
+    Mojitos 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 MojitO/S.  If not, see <https://www.gnu.org/licenses/>.
+
+ *******************************************************/
+
+unsigned int init_load(char *, void **);
+unsigned int get_load(uint64_t *results, void *);
+void clean_load(void *);
+void label_load(char **labels, void *);
diff --git a/src/mojitos.c b/src/mojitos.c
index 3569d1b6f3268eba719fb2a962d38e2c18eccf40..7d680b1b89eab7505ec6773aec8706f74dd40789 100644
--- a/src/mojitos.c
+++ b/src/mojitos.c
@@ -1,296 +1,296 @@
-/*******************************************************
-
- Copyright (C) 2018-2019 Georges Da Costa <georges.da-costa@irit.fr>
-
-    This file is part of Mojitos.
-
-    Mojitos 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 3 of the License, or
-    (at your option) any later version.
-
-    Mojitos 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 MojitO/S.  If not, see <https://www.gnu.org/licenses/>.
-
- *******************************************************/
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <time.h>
-#include <signal.h>
-#include <inttypes.h>
-#include <unistd.h>
-
-#include "counters.h"
-#include "rapl.h"
-#include "frapl.h"
-#include "network.h"
-#include "infiniband.h"
-#include "load.h"
-#include "temperature.h"
-
-#define UNUSED(expr) do { (void)(expr); } while (0)
-#define PANIC(code, fmt, ...)  				 \
-	do {									 \
-		fprintf(stderr, "Exit on error: ");  \
-		fprintf(stderr, fmt, ##__VA_ARGS__); \
-		fprintf(stderr, "\n"); 			     \
-		exit(code); 						 \
-	} while (0)
-
-
-void usage(char **argv)
-{
-    printf("Usage : %s [-rRluc] [-t time] [-f freq] [-p perf_list] [-d network_device]\n"
-           "                    [-i infiniband_path] [-o logfile] [-e command arguments...]\n"
-           "if time==0 then loops infinitively\n"
-           "if -e is present, time and freq are not used\n"
-           "-r activates RAPL\n"
-           "-R activates the file version of RAPL\n"
-           "-p activates performance counters\n"
-           "   perf_list is coma separated list of performance counters without space. Ex: instructions,cache_misses\n"
-           "-l lists the possible performance counters and quits\n"
-           "-d activates network monitoring (if network_device is X, tries to detect it automatically)\n"
-           "-i activates infiniband monitoring (if infiniband_path is X, tries to detect it automatically)\n"
-           "-s activates statistics of overhead in nanoseconds\n"
-           "-u activates report of system load\n"
-           "-c activates report of processor temperature\n"
-           , argv[0]);
-    exit(EXIT_SUCCESS);
-}
-
-void sighandler(int none)
-{
-    UNUSED(none);
-}
-
-void flush(int none)
-{
-    UNUSED(none);
-    exit(0);
-}
-
-FILE *output;
-void flushexit()
-{
-    if (output != NULL) {
-        fflush(output);
-        fclose(output);
-    }
-}
-
-typedef unsigned int (initializer_t)(char *, void **);
-typedef void (labeler_t)(char **, void *);
-typedef unsigned int (*getter_t)(uint64_t *, void *);
-typedef void (*cleaner_t)(void *);
-
-unsigned int nb_sources = 0;
-void **states = NULL;
-getter_t *getter = NULL;
-cleaner_t *cleaner = NULL;
-
-unsigned int nb_sensors = 0;
-char **labels = NULL;
-uint64_t *values = NULL;
-
-void add_source(initializer_t init, char *arg, labeler_t labeler,
-                getter_t get, cleaner_t clean)
-{
-    nb_sources++;
-    states = realloc(states, nb_sources * sizeof(void *));
-    int nb = init(arg, &states[nb_sources - 1]);
-    if (nb == 0) {
-        nb_sources--;
-        states = realloc(states, nb_sources * sizeof(void *));
-        return;
-    }
-
-    getter = realloc(getter, nb_sources * sizeof(void *));
-    getter[nb_sources - 1] = get;
-    cleaner = realloc(cleaner, nb_sources * sizeof(void *));
-    cleaner[nb_sources - 1] = clean;
-
-    labels = realloc(labels, (nb_sensors + nb) * sizeof(char *));
-    labeler(labels + nb_sensors, states[nb_sources - 1]);
-
-    values = realloc(values, (nb_sensors + nb) * sizeof(uint64_t));
-    nb_sensors += nb;
-}
-
-int main(int argc, char **argv)
-{
-    int total_time = 1;
-    int delta = 0;
-    int frequency = 1;
-    char **application = NULL;
-
-    int stat_mode = -1;
-
-    if (argc == 1) {
-        usage(argv);
-    }
-
-    output = stdout;
-
-    atexit(flushexit);
-    signal(15, flush);
-
-    int c;
-    while ((c = getopt (argc, argv, "ilhcftdeoprRsu")) != -1 && application == NULL)
-        switch (c) {
-        case 'f':
-            if (optind >= argc) PANIC(1,"-f, no frequency provided");
-            frequency = atoi(argv[optind]);
-            break;
-        case 't':
-            if (optind >= argc) PANIC(1,"-t, no time provided");
-            total_time = atoi(argv[optind]);
-            delta = 1;
-            if (total_time == 0) {
-                total_time = 1;
-                delta = 0;
-            }
-            break;
-        case 'd':
-            add_source(init_network, argv[optind], label_network, get_network, clean_network);
-            break;
-        case 'i':
-            add_source(init_infiniband, argv[optind], label_infiniband, get_network, clean_network);
-            break;
-        case 'o':
-            if (optind >= argc) PANIC(1,"-o, no logfile provided");
-            if ((output = fopen(argv[optind], "wb")) == NULL) {
-                perror("fopen");
-                PANIC(1, "-o %s", argv[optind]);
-            }
-            break;
-        case 'e':
-            application = &argv[optind];
-            signal(17, sighandler);
-            break;
-        case 'p':
-            if (optind >= argc) PANIC(1,"-p, no counter provided");
-            add_source(init_counters, argv[optind], label_counters, get_counters, clean_counters);
-            break;
-        case 'r':
-            add_source(init_rapl, NULL, label_rapl, get_rapl, clean_rapl);
-            break;
-        case 'R':
-            add_source(init_frapl, NULL, label_frapl, get_frapl, clean_frapl);
-            break;
-        case 'u':
-            add_source(init_load, NULL, label_load, get_load, clean_load);
-            break;
-        case 'c':
-            add_source(init_temperature, NULL, label_temperature, get_temperature, clean_temperature);
-            break;
-        case 's':
-            stat_mode = 0;
-            break;
-        case 'l':
-            show_all_counters();
-            exit(EXIT_SUCCESS);
-        default:
-            usage(argv);
-        }
-
-
-    setvbuf(output, NULL, _IONBF, BUFSIZ);
-    struct timespec ts;
-    struct timespec ts_ref;
-
-    fprintf(output, "#timestamp ");
-
-    for (unsigned int i = 0; i < nb_sensors; i++) {
-        fprintf(output, "%s ", labels[i]);
-    }
-
-    if (stat_mode == 0) {
-        fprintf(output, "overhead ");
-    }
-
-    fprintf(output, "\n");
-
-    unsigned long int stat_data = 0;
-
-    for (int temps = 0; temps < total_time * frequency; temps += delta) {
-        clock_gettime(CLOCK_MONOTONIC, &ts_ref);
-
-        // Get Data
-        unsigned int current = 0;
-        for (unsigned int i = 0; i < nb_sources; i++) {
-            current += getter[i](&values[current], states[i]);
-        }
-
-        if (application != NULL) {
-
-            if (fork() == 0) {
-                execvp(application[0], application);
-                exit(0);
-            }
-            pause();
-            clock_gettime(CLOCK_MONOTONIC, &ts);
-            if (ts.tv_nsec >= ts_ref.tv_nsec) {
-                fprintf(output, "%ld.%09ld ", (ts.tv_sec - ts_ref.tv_sec), ts.tv_nsec - ts_ref.tv_nsec);
-            } else {
-                fprintf(output, "%ld.%09ld ", (ts.tv_sec - ts_ref.tv_sec) - 1, 1000000000 + ts.tv_nsec - ts_ref.tv_nsec);
-            }
-        } else {
-#ifdef DEBUG
-            clock_gettime(CLOCK_MONOTONIC, &ts);
-            fprintf(stderr, "%ld\n", (ts.tv_nsec - ts_ref.tv_nsec) / 1000);
-            //Indiv: mean: 148 std: 31 % med: 141 std: 28 %
-            //Group: mean: 309 std: 41 % med: 297 std: 39 %
-#endif
-            if (stat_mode == 0) {
-                clock_gettime(CLOCK_MONOTONIC, &ts);
-                if (ts.tv_nsec >= ts_ref.tv_nsec) {
-                    stat_data = ts.tv_nsec - ts_ref.tv_nsec;
-                } else {
-                    stat_data = 1000000000 + ts.tv_nsec - ts_ref.tv_nsec;
-                }
-            }
-
-            // Treat Data
-            fprintf(output, "%ld.%09ld ", ts_ref.tv_sec, ts_ref.tv_nsec);
-        }
-
-        for (unsigned int i = 0; i < nb_sensors; i++) {
-            fprintf(output, "%" PRIu64 " ", values[i]);
-        }
-
-        if (stat_mode == 0) {
-            fprintf(output, "%ld ", stat_data);
-        }
-
-        fprintf(output, "\n");
-
-        if (application != NULL) {
-            break;
-        }
-
-        clock_gettime(CLOCK_MONOTONIC, &ts);
-        usleep(1000 * 1000 / frequency - (ts.tv_nsec / 1000) % (1000 * 1000 / frequency));
-    }
-
-    for (unsigned int i = 0; i < nb_sources; i++) {
-        cleaner[i](states[i]);
-    }
-
-    if (nb_sources > 0) {
-        free(getter);
-        free(cleaner);
-        free(labels);
-        free(values);
-        free(states);
-    }
-}
-
-
-
-
+/*******************************************************
+
+ Copyright (C) 2018-2019 Georges Da Costa <georges.da-costa@irit.fr>
+
+    This file is part of Mojitos.
+
+    Mojitos 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 3 of the License, or
+    (at your option) any later version.
+
+    Mojitos 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 MojitO/S.  If not, see <https://www.gnu.org/licenses/>.
+
+ *******************************************************/
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <time.h>
+#include <signal.h>
+#include <inttypes.h>
+#include <unistd.h>
+
+#include "counters.h"
+#include "rapl.h"
+#include "frapl.h"
+#include "network.h"
+#include "infiniband.h"
+#include "load.h"
+#include "temperature.h"
+
+#define UNUSED(expr) do { (void)(expr); } while (0)
+#define PANIC(code, fmt, ...)  				 \
+	do {									 \
+		fprintf(stderr, "Exit on error: ");  \
+		fprintf(stderr, fmt, ##__VA_ARGS__); \
+		fprintf(stderr, "\n"); 			     \
+		exit(code); 						 \
+	} while (0)
+
+
+void usage(char **argv)
+{
+    printf("Usage : %s [-rRluc] [-t time] [-f freq] [-p perf_list] [-d network_device]\n"
+           "                    [-i infiniband_path] [-o logfile] [-e command arguments...]\n"
+           "if time==0 then loops infinitively\n"
+           "if -e is present, time and freq are not used\n"
+           "-r activates RAPL\n"
+           "-R activates the file version of RAPL\n"
+           "-p activates performance counters\n"
+           "   perf_list is coma separated list of performance counters without space. Ex: instructions,cache_misses\n"
+           "-l lists the possible performance counters and quits\n"
+           "-d activates network monitoring (if network_device is X, tries to detect it automatically)\n"
+           "-i activates infiniband monitoring (if infiniband_path is X, tries to detect it automatically)\n"
+           "-s activates statistics of overhead in nanoseconds\n"
+           "-u activates report of system load\n"
+           "-c activates report of processor temperature\n"
+           , argv[0]);
+    exit(EXIT_SUCCESS);
+}
+
+void sighandler(int none)
+{
+    UNUSED(none);
+}
+
+void flush(int none)
+{
+    UNUSED(none);
+    exit(0);
+}
+
+FILE *output;
+void flushexit()
+{
+    if (output != NULL) {
+        fflush(output);
+        fclose(output);
+    }
+}
+
+typedef unsigned int (initializer_t)(char *, void **);
+typedef void (labeler_t)(char **, void *);
+typedef unsigned int (*getter_t)(uint64_t *, void *);
+typedef void (*cleaner_t)(void *);
+
+unsigned int nb_sources = 0;
+void **states = NULL;
+getter_t *getter = NULL;
+cleaner_t *cleaner = NULL;
+
+unsigned int nb_sensors = 0;
+char **labels = NULL;
+uint64_t *values = NULL;
+
+void add_source(initializer_t init, char *arg, labeler_t labeler,
+                getter_t get, cleaner_t clean)
+{
+    nb_sources++;
+    states = realloc(states, nb_sources * sizeof(void *));
+    int nb = init(arg, &states[nb_sources - 1]);
+    if (nb == 0) {
+        nb_sources--;
+        states = realloc(states, nb_sources * sizeof(void *));
+        return;
+    }
+
+    getter = realloc(getter, nb_sources * sizeof(void *));
+    getter[nb_sources - 1] = get;
+    cleaner = realloc(cleaner, nb_sources * sizeof(void *));
+    cleaner[nb_sources - 1] = clean;
+
+    labels = realloc(labels, (nb_sensors + nb) * sizeof(char *));
+    labeler(labels + nb_sensors, states[nb_sources - 1]);
+
+    values = realloc(values, (nb_sensors + nb) * sizeof(uint64_t));
+    nb_sensors += nb;
+}
+
+int main(int argc, char **argv)
+{
+    int total_time = 1;
+    int delta = 0;
+    int frequency = 1;
+    char **application = NULL;
+
+    int stat_mode = -1;
+
+    if (argc == 1) {
+        usage(argv);
+    }
+
+    output = stdout;
+
+    atexit(flushexit);
+    signal(15, flush);
+
+    int c;
+    while ((c = getopt (argc, argv, "ilhcftdeoprRsu")) != -1 && application == NULL)
+        switch (c) {
+        case 'f':
+            if (optind >= argc) PANIC(1,"-f, no frequency provided");
+            frequency = atoi(argv[optind]);
+            break;
+        case 't':
+            if (optind >= argc) PANIC(1,"-t, no time provided");
+            total_time = atoi(argv[optind]);
+            delta = 1;
+            if (total_time == 0) {
+                total_time = 1;
+                delta = 0;
+            }
+            break;
+        case 'd':
+            add_source(init_network, argv[optind], label_network, get_network, clean_network);
+            break;
+        case 'i':
+            add_source(init_infiniband, argv[optind], label_infiniband, get_network, clean_network);
+            break;
+        case 'o':
+            if (optind >= argc) PANIC(1,"-o, no logfile provided");
+            if ((output = fopen(argv[optind], "wb")) == NULL) {
+                perror("fopen");
+                PANIC(1, "-o %s", argv[optind]);
+            }
+            break;
+        case 'e':
+            application = &argv[optind];
+            signal(17, sighandler);
+            break;
+        case 'p':
+            if (optind >= argc) PANIC(1,"-p, no counter provided");
+            add_source(init_counters, argv[optind], label_counters, get_counters, clean_counters);
+            break;
+        case 'r':
+            add_source(init_rapl, NULL, label_rapl, get_rapl, clean_rapl);
+            break;
+        case 'R':
+            add_source(init_frapl, NULL, label_frapl, get_frapl, clean_frapl);
+            break;
+        case 'u':
+            add_source(init_load, NULL, label_load, get_load, clean_load);
+            break;
+        case 'c':
+            add_source(init_temperature, NULL, label_temperature, get_temperature, clean_temperature);
+            break;
+        case 's':
+            stat_mode = 0;
+            break;
+        case 'l':
+            show_all_counters();
+            exit(EXIT_SUCCESS);
+        default:
+            usage(argv);
+        }
+
+
+    setvbuf(output, NULL, _IONBF, BUFSIZ);
+    struct timespec ts;
+    struct timespec ts_ref;
+
+    fprintf(output, "#timestamp ");
+
+    for (unsigned int i = 0; i < nb_sensors; i++) {
+        fprintf(output, "%s ", labels[i]);
+    }
+
+    if (stat_mode == 0) {
+        fprintf(output, "overhead ");
+    }
+
+    fprintf(output, "\n");
+
+    unsigned long int stat_data = 0;
+
+    for (int temps = 0; temps < total_time * frequency; temps += delta) {
+        clock_gettime(CLOCK_MONOTONIC, &ts_ref);
+
+        // Get Data
+        unsigned int current = 0;
+        for (unsigned int i = 0; i < nb_sources; i++) {
+            current += getter[i](&values[current], states[i]);
+        }
+
+        if (application != NULL) {
+
+            if (fork() == 0) {
+                execvp(application[0], application);
+                exit(0);
+            }
+            pause();
+            clock_gettime(CLOCK_MONOTONIC, &ts);
+            if (ts.tv_nsec >= ts_ref.tv_nsec) {
+                fprintf(output, "%ld.%09ld ", (ts.tv_sec - ts_ref.tv_sec), ts.tv_nsec - ts_ref.tv_nsec);
+            } else {
+                fprintf(output, "%ld.%09ld ", (ts.tv_sec - ts_ref.tv_sec) - 1, 1000000000 + ts.tv_nsec - ts_ref.tv_nsec);
+            }
+        } else {
+#ifdef DEBUG
+            clock_gettime(CLOCK_MONOTONIC, &ts);
+            fprintf(stderr, "%ld\n", (ts.tv_nsec - ts_ref.tv_nsec) / 1000);
+            //Indiv: mean: 148 std: 31 % med: 141 std: 28 %
+            //Group: mean: 309 std: 41 % med: 297 std: 39 %
+#endif
+            if (stat_mode == 0) {
+                clock_gettime(CLOCK_MONOTONIC, &ts);
+                if (ts.tv_nsec >= ts_ref.tv_nsec) {
+                    stat_data = ts.tv_nsec - ts_ref.tv_nsec;
+                } else {
+                    stat_data = 1000000000 + ts.tv_nsec - ts_ref.tv_nsec;
+                }
+            }
+
+            // Treat Data
+            fprintf(output, "%ld.%09ld ", ts_ref.tv_sec, ts_ref.tv_nsec);
+        }
+
+        for (unsigned int i = 0; i < nb_sensors; i++) {
+            fprintf(output, "%" PRIu64 " ", values[i]);
+        }
+
+        if (stat_mode == 0) {
+            fprintf(output, "%ld ", stat_data);
+        }
+
+        fprintf(output, "\n");
+
+        if (application != NULL) {
+            break;
+        }
+
+        clock_gettime(CLOCK_MONOTONIC, &ts);
+        usleep(1000 * 1000 / frequency - (ts.tv_nsec / 1000) % (1000 * 1000 / frequency));
+    }
+
+    for (unsigned int i = 0; i < nb_sources; i++) {
+        cleaner[i](states[i]);
+    }
+
+    if (nb_sources > 0) {
+        free(getter);
+        free(cleaner);
+        free(labels);
+        free(values);
+        free(states);
+    }
+}
+
+
+
+
diff --git a/src/network.c b/src/network.c
index 647b4b3c606b4361b46b7b4f4614e5a4a002ed5c..6896efcb4638c0e6df3c36f88d097ce9997c3ffc 100644
--- a/src/network.c
+++ b/src/network.c
@@ -1,128 +1,128 @@
-/*******************************************************
- Copyright (C) 2018-2019 Georges Da Costa <georges.da-costa@irit.fr>
-
-    This file is part of Mojitos.
-
-    Mojitos 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 3 of the License, or
-    (at your option) any later version.
-
-    Mojitos 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 MojitO/S.  If not, see <https://www.gnu.org/licenses/>.
-
- *******************************************************/
-#include <unistd.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdint.h>
-
-#define NB_SENSOR 4
-#define UNUSED(expr) do { (void)(expr); } while (0)
-
-static char *route = "/proc/net/route";
-struct network_t {
-    uint64_t values[NB_SENSOR];
-    uint64_t tmp_values[NB_SENSOR];
-    int sources[NB_SENSOR];
-};
-
-unsigned int _get_network(uint64_t *results, int *sources)
-{
-    if(sources==NULL)
-        return 0;
-    char buffer[128];
-    for(int i=0; i<NB_SENSOR; i++) {
-        if (pread(sources[i], buffer, 127, 0) < 0) {
-            perror("pread");
-            exit(1);
-        }
-
-        results[i] = strtoull(buffer, NULL, 10);
-    }
-    return NB_SENSOR;
-}
-
-
-
-unsigned int init_network(char *dev, void **ptr)
-{
-    if(dev==NULL)
-        return 0;
-
-    if(strcmp(dev,"X")==0) {
-        int fd = open(route, O_RDONLY);
-        if (fd < 0) {
-            fprintf(stderr, "%s ", route);
-            perror("open");
-            exit(1);
-        }
-        char buffer[1000];
-
-        if ( read(fd, buffer, 999) < 0 ) {
-            perror("read");
-            close(fd);
-            exit(1);
-        }
-
-        char *start_of_dev = index(buffer, '\n')+1;
-        char *end_of_dev = index(start_of_dev, '\t');
-        *end_of_dev='\0';
-        dev = start_of_dev;
-        close(fd);
-    }
-
-    char *filenames[] = {"/sys/class/net/%s/statistics/rx_packets",
-                         "/sys/class/net/%s/statistics/rx_bytes",
-                         "/sys/class/net/%s/statistics/tx_packets",
-                         "/sys/class/net/%s/statistics/tx_bytes"
-                        };
-
-    struct network_t *state = malloc(sizeof(struct network_t));
-
-    char buffer2[256];
-    for(int i=0; i<NB_SENSOR; i++) {
-        sprintf(buffer2, filenames[i], dev);
-        state->sources[i] = open(buffer2, O_RDONLY);
-    }
-    *ptr = (void *) state;
-    _get_network(state->values, state->sources);
-
-    return NB_SENSOR;
-}
-
-unsigned int get_network(uint64_t *results, void *ptr)
-{
-    struct network_t *state = (struct network_t *) ptr;
-    _get_network(state->tmp_values, state->sources);
-    for(int i=0; i<NB_SENSOR; i++)
-        results[i] = state->tmp_values[i] - state->values[i];
-
-    memcpy(state->values, state->tmp_values, NB_SENSOR*sizeof(uint64_t));
-    return NB_SENSOR;
-}
-
-void clean_network(void *ptr)
-{
-    struct network_t *state = (struct network_t *) ptr;
-    if(state==NULL)
-        return;
-    for(int i=0; i<NB_SENSOR; i++)
-        close(state->sources[i]);
-    free(state);
-}
-
-char *_labels_network[NB_SENSOR] = {"rxp", "rxb", "txp", "txb"};
-void label_network(char **labels, void *none)
-{
-    UNUSED(none);
-    for(int i=0; i<NB_SENSOR; i++)
-        labels[i] = _labels_network[i];
-}
+/*******************************************************
+ Copyright (C) 2018-2019 Georges Da Costa <georges.da-costa@irit.fr>
+
+    This file is part of Mojitos.
+
+    Mojitos 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 3 of the License, or
+    (at your option) any later version.
+
+    Mojitos 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 MojitO/S.  If not, see <https://www.gnu.org/licenses/>.
+
+ *******************************************************/
+#include <unistd.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdint.h>
+
+#define NB_SENSOR 4
+#define UNUSED(expr) do { (void)(expr); } while (0)
+
+static char *route = "/proc/net/route";
+struct network_t {
+    uint64_t values[NB_SENSOR];
+    uint64_t tmp_values[NB_SENSOR];
+    int sources[NB_SENSOR];
+};
+
+unsigned int _get_network(uint64_t *results, int *sources)
+{
+    if(sources==NULL)
+        return 0;
+    char buffer[128];
+    for(int i=0; i<NB_SENSOR; i++) {
+        if (pread(sources[i], buffer, 127, 0) < 0) {
+            perror("pread");
+            exit(1);
+        }
+
+        results[i] = strtoull(buffer, NULL, 10);
+    }
+    return NB_SENSOR;
+}
+
+
+
+unsigned int init_network(char *dev, void **ptr)
+{
+    if(dev==NULL)
+        return 0;
+
+    if(strcmp(dev,"X")==0) {
+        int fd = open(route, O_RDONLY);
+        if (fd < 0) {
+            fprintf(stderr, "%s ", route);
+            perror("open");
+            exit(1);
+        }
+        char buffer[1000];
+
+        if ( read(fd, buffer, 999) < 0 ) {
+            perror("read");
+            close(fd);
+            exit(1);
+        }
+
+        char *start_of_dev = index(buffer, '\n')+1;
+        char *end_of_dev = index(start_of_dev, '\t');
+        *end_of_dev='\0';
+        dev = start_of_dev;
+        close(fd);
+    }
+
+    char *filenames[] = {"/sys/class/net/%s/statistics/rx_packets",
+                         "/sys/class/net/%s/statistics/rx_bytes",
+                         "/sys/class/net/%s/statistics/tx_packets",
+                         "/sys/class/net/%s/statistics/tx_bytes"
+                        };
+
+    struct network_t *state = malloc(sizeof(struct network_t));
+
+    char buffer2[256];
+    for(int i=0; i<NB_SENSOR; i++) {
+        sprintf(buffer2, filenames[i], dev);
+        state->sources[i] = open(buffer2, O_RDONLY);
+    }
+    *ptr = (void *) state;
+    _get_network(state->values, state->sources);
+
+    return NB_SENSOR;
+}
+
+unsigned int get_network(uint64_t *results, void *ptr)
+{
+    struct network_t *state = (struct network_t *) ptr;
+    _get_network(state->tmp_values, state->sources);
+    for(int i=0; i<NB_SENSOR; i++)
+        results[i] = state->tmp_values[i] - state->values[i];
+
+    memcpy(state->values, state->tmp_values, NB_SENSOR*sizeof(uint64_t));
+    return NB_SENSOR;
+}
+
+void clean_network(void *ptr)
+{
+    struct network_t *state = (struct network_t *) ptr;
+    if(state==NULL)
+        return;
+    for(int i=0; i<NB_SENSOR; i++)
+        close(state->sources[i]);
+    free(state);
+}
+
+char *_labels_network[NB_SENSOR] = {"rxp", "rxb", "txp", "txb"};
+void label_network(char **labels, void *none)
+{
+    UNUSED(none);
+    for(int i=0; i<NB_SENSOR; i++)
+        labels[i] = _labels_network[i];
+}
diff --git a/src/network.h b/src/network.h
index 3ba9ae56d07a768406141f86fb553694117675f8..b770560195b1f9b1d7739c0a086815acb7aa7d64 100644
--- a/src/network.h
+++ b/src/network.h
@@ -1,25 +1,25 @@
-/*******************************************************
- Copyright (C) 2018-2019 Georges Da Costa <georges.da-costa@irit.fr>
-
-    This file is part of Mojitos.
-
-    Mojitos 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 3 of the License, or
-    (at your option) any later version.
-
-    Mojitos 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 MojitO/S.  If not, see <https://www.gnu.org/licenses/>.
-
- *******************************************************/
-
-unsigned int init_network(char *, void **);
-unsigned int get_network(uint64_t *results, void *);
-void clean_network(void *);
-void label_network(char **labels, void *);
-
+/*******************************************************
+ Copyright (C) 2018-2019 Georges Da Costa <georges.da-costa@irit.fr>
+
+    This file is part of Mojitos.
+
+    Mojitos 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 3 of the License, or
+    (at your option) any later version.
+
+    Mojitos 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 MojitO/S.  If not, see <https://www.gnu.org/licenses/>.
+
+ *******************************************************/
+
+unsigned int init_network(char *, void **);
+unsigned int get_network(uint64_t *results, void *);
+void clean_network(void *);
+void label_network(char **labels, void *);
+
diff --git a/src/rapl.c b/src/rapl.c
index 30d38c109fe68484b3ed941f70829d5fdf3d57e8..eb4666af24dfe68da23f3afea383da32127785dd 100644
--- a/src/rapl.c
+++ b/src/rapl.c
@@ -1,174 +1,174 @@
-/*******************************************************
- Copyright (C) 2018-2019 Georges Da Costa <georges.da-costa@irit.fr>
-
-    This file is part of Mojitos.
-
-    Mojitos 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 3 of the License, or
-    (at your option) any later version.
-
-    Mojitos 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 MojitO/S.  If not, see <https://www.gnu.org/licenses/>.
-
- *******************************************************/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <powercap/powercap-rapl.h>
-
-#define UNUSED(expr) do { (void)(expr); } while (0)
-
-struct _rapl_t {
-    powercap_rapl_pkg *pkgs;
-    uint32_t nb_pkgs;
-    uint32_t nb;
-    char **names;
-    uint32_t *zones;
-    uint32_t *packages;
-    uint64_t *values;
-    uint64_t *tmp_values;
-};
-
-typedef struct _rapl_t _rapl_t;
-
-
-
-
-
-
-const int nb_zones = 3;
-const int rapl_zones[3] = { POWERCAP_RAPL_ZONE_PACKAGE,   POWERCAP_RAPL_ZONE_CORE,   POWERCAP_RAPL_ZONE_DRAM};
-
-
-#define MAX_LEN_NAME 100
-
-// values [zone + package *nbzones] microjoules
-void _get_rapl(uint64_t *values, _rapl_t *rapl)
-{
-    for (unsigned int i = 0; i < rapl->nb; i++) {
-#ifdef DEBUG
-        int ret =
-#endif
-            powercap_rapl_get_energy_uj(&rapl->pkgs[rapl->packages[i]],
-                                        rapl->zones[i],
-                                        &values[i]);
-#ifdef DEBUG
-        printf("GETRAPL: package %d, zone %d, name %s, ret: %d\n", rapl->packages[i], rapl->zones[i], rapl->names[i], ret);
-#endif
-    }
-}
-
-unsigned int init_rapl(char *none, void **ptr)
-{
-    UNUSED(none);
-    // get number of processor sockets
-    _rapl_t *rapl= malloc(sizeof(struct _rapl_t));
-    rapl->nb = 0;
-    rapl->packages = NULL;
-    rapl->zones = NULL;
-
-    rapl->nb_pkgs = powercap_rapl_get_num_instances();
-    //rapl->nb_pkgs = powercap_rapl_get_num_packages();
-
-    if (rapl->nb_pkgs == 0) {
-        perror("no packages found (maybe the kernel module isn't loaded?)");
-        exit(-1);
-    }
-    rapl->pkgs = malloc(rapl->nb_pkgs * sizeof(powercap_rapl_pkg));
-    for (unsigned int package = 0; package < rapl->nb_pkgs; package++)
-        if (powercap_rapl_init(package, &rapl->pkgs[package], 0)) {
-            perror("powercap_rapl_init, check access (root needed ?)");
-            exit(-1);
-        }
-
-    rapl->names = NULL;
-
-    char _name[MAX_LEN_NAME+1];
-    char _name2[MAX_LEN_NAME+11];
-
-    for (unsigned int package = 0; package < rapl->nb_pkgs; package++) {
-        for(unsigned int zone=0; zone < nb_zones; zone++) {
-            int length=powercap_rapl_get_name(&rapl->pkgs[package], rapl_zones[zone],
-                                              _name, MAX_LEN_NAME);
-            if (length>0) {
-
-                sprintf(_name2, "%s%u", _name, package);
-
-                rapl->nb++;
-                rapl->names = realloc(rapl->names, sizeof(char *)*rapl->nb);
-                rapl->names[rapl->nb-1] = malloc(sizeof(char) * (strlen(_name2)+1));
-                rapl->zones = realloc(rapl->zones, sizeof(uint32_t)*rapl->nb);
-                rapl->packages = realloc(rapl->packages, sizeof(uint32_t)*rapl->nb);
-
-                strcpy(rapl->names[rapl->nb-1], _name2);
-                rapl->zones[rapl->nb-1] = rapl_zones[zone];
-                rapl->packages[rapl->nb-1] = package;
-            }
-#ifdef DEBUG
-            printf("%d %d %d %d %s\n\n", length, package, zone, rapl_zones[zone], _name2);
-#endif
-        }
-    }
-#ifdef DEBUG
-    printf("Result of init\n");
-    for(unsigned int i=0; i<rapl->nb; i++)
-        printf("package %d, zone %d, name %s\n", rapl->packages[i], rapl->zones[i], rapl->names[i]);
-#endif
-
-    rapl->values = calloc(sizeof(uint64_t), rapl->nb);
-    rapl->tmp_values = calloc(sizeof(uint64_t), rapl->nb);
-
-    _get_rapl(rapl->values, rapl);
-
-    *ptr = (void *)rapl;
-    return rapl->nb;
-}
-
-
-
-unsigned int get_rapl(uint64_t *results, void *ptr)
-{
-    _rapl_t *state = (_rapl_t *) ptr;
-    _get_rapl(state->tmp_values, state);
-    for(unsigned int i=0; i<state->nb; i++)
-        results[i] = state->tmp_values[i] - state->values[i];
-
-    memcpy(state->values, state->tmp_values, sizeof(uint64_t)*state->nb);
-    return state->nb;
-}
-
-
-
-
-void clean_rapl(void *ptr)
-{
-    _rapl_t *rapl = (_rapl_t *) ptr;
-    for (unsigned int package = 0; package < rapl->nb_pkgs; package++)
-        if (powercap_rapl_destroy(&rapl->pkgs[package]))
-            perror("powercap_rapl_destroy");
-    for (unsigned int elem=0; elem<rapl->nb; elem++)
-        free(rapl->names[elem]);
-
-    free(rapl->names);
-    free(rapl->pkgs);
-    free(rapl->zones);
-    free(rapl->packages);
-    free(rapl->values);
-    free(rapl->tmp_values);
-    free(rapl);
-}
-
-void label_rapl(char **labels, void *ptr)
-{
-    _rapl_t *rapl = (_rapl_t *) ptr;
-    for(unsigned int i=0; i<rapl->nb; i++)
-        labels[i] = rapl->names[i];
-}
+/*******************************************************
+ Copyright (C) 2018-2019 Georges Da Costa <georges.da-costa@irit.fr>
+
+    This file is part of Mojitos.
+
+    Mojitos 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 3 of the License, or
+    (at your option) any later version.
+
+    Mojitos 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 MojitO/S.  If not, see <https://www.gnu.org/licenses/>.
+
+ *******************************************************/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <powercap/powercap-rapl.h>
+
+#define UNUSED(expr) do { (void)(expr); } while (0)
+
+struct _rapl_t {
+    powercap_rapl_pkg *pkgs;
+    uint32_t nb_pkgs;
+    uint32_t nb;
+    char **names;
+    uint32_t *zones;
+    uint32_t *packages;
+    uint64_t *values;
+    uint64_t *tmp_values;
+};
+
+typedef struct _rapl_t _rapl_t;
+
+
+
+
+
+
+const int nb_zones = 3;
+const int rapl_zones[3] = { POWERCAP_RAPL_ZONE_PACKAGE,   POWERCAP_RAPL_ZONE_CORE,   POWERCAP_RAPL_ZONE_DRAM};
+
+
+#define MAX_LEN_NAME 100
+
+// values [zone + package *nbzones] microjoules
+void _get_rapl(uint64_t *values, _rapl_t *rapl)
+{
+    for (unsigned int i = 0; i < rapl->nb; i++) {
+#ifdef DEBUG
+        int ret =
+#endif
+            powercap_rapl_get_energy_uj(&rapl->pkgs[rapl->packages[i]],
+                                        rapl->zones[i],
+                                        &values[i]);
+#ifdef DEBUG
+        printf("GETRAPL: package %d, zone %d, name %s, ret: %d\n", rapl->packages[i], rapl->zones[i], rapl->names[i], ret);
+#endif
+    }
+}
+
+unsigned int init_rapl(char *none, void **ptr)
+{
+    UNUSED(none);
+    // get number of processor sockets
+    _rapl_t *rapl= malloc(sizeof(struct _rapl_t));
+    rapl->nb = 0;
+    rapl->packages = NULL;
+    rapl->zones = NULL;
+
+    rapl->nb_pkgs = powercap_rapl_get_num_instances();
+    //rapl->nb_pkgs = powercap_rapl_get_num_packages();
+
+    if (rapl->nb_pkgs == 0) {
+        perror("no packages found (maybe the kernel module isn't loaded?)");
+        exit(-1);
+    }
+    rapl->pkgs = malloc(rapl->nb_pkgs * sizeof(powercap_rapl_pkg));
+    for (unsigned int package = 0; package < rapl->nb_pkgs; package++)
+        if (powercap_rapl_init(package, &rapl->pkgs[package], 0)) {
+            perror("powercap_rapl_init, check access (root needed ?)");
+            exit(-1);
+        }
+
+    rapl->names = NULL;
+
+    char _name[MAX_LEN_NAME+1];
+    char _name2[MAX_LEN_NAME+11];
+
+    for (unsigned int package = 0; package < rapl->nb_pkgs; package++) {
+        for(unsigned int zone=0; zone < nb_zones; zone++) {
+            int length=powercap_rapl_get_name(&rapl->pkgs[package], rapl_zones[zone],
+                                              _name, MAX_LEN_NAME);
+            if (length>0) {
+
+                sprintf(_name2, "%s%u", _name, package);
+
+                rapl->nb++;
+                rapl->names = realloc(rapl->names, sizeof(char *)*rapl->nb);
+                rapl->names[rapl->nb-1] = malloc(sizeof(char) * (strlen(_name2)+1));
+                rapl->zones = realloc(rapl->zones, sizeof(uint32_t)*rapl->nb);
+                rapl->packages = realloc(rapl->packages, sizeof(uint32_t)*rapl->nb);
+
+                strcpy(rapl->names[rapl->nb-1], _name2);
+                rapl->zones[rapl->nb-1] = rapl_zones[zone];
+                rapl->packages[rapl->nb-1] = package;
+            }
+#ifdef DEBUG
+            printf("%d %d %d %d %s\n\n", length, package, zone, rapl_zones[zone], _name2);
+#endif
+        }
+    }
+#ifdef DEBUG
+    printf("Result of init\n");
+    for(unsigned int i=0; i<rapl->nb; i++)
+        printf("package %d, zone %d, name %s\n", rapl->packages[i], rapl->zones[i], rapl->names[i]);
+#endif
+
+    rapl->values = calloc(sizeof(uint64_t), rapl->nb);
+    rapl->tmp_values = calloc(sizeof(uint64_t), rapl->nb);
+
+    _get_rapl(rapl->values, rapl);
+
+    *ptr = (void *)rapl;
+    return rapl->nb;
+}
+
+
+
+unsigned int get_rapl(uint64_t *results, void *ptr)
+{
+    _rapl_t *state = (_rapl_t *) ptr;
+    _get_rapl(state->tmp_values, state);
+    for(unsigned int i=0; i<state->nb; i++)
+        results[i] = state->tmp_values[i] - state->values[i];
+
+    memcpy(state->values, state->tmp_values, sizeof(uint64_t)*state->nb);
+    return state->nb;
+}
+
+
+
+
+void clean_rapl(void *ptr)
+{
+    _rapl_t *rapl = (_rapl_t *) ptr;
+    for (unsigned int package = 0; package < rapl->nb_pkgs; package++)
+        if (powercap_rapl_destroy(&rapl->pkgs[package]))
+            perror("powercap_rapl_destroy");
+    for (unsigned int elem=0; elem<rapl->nb; elem++)
+        free(rapl->names[elem]);
+
+    free(rapl->names);
+    free(rapl->pkgs);
+    free(rapl->zones);
+    free(rapl->packages);
+    free(rapl->values);
+    free(rapl->tmp_values);
+    free(rapl);
+}
+
+void label_rapl(char **labels, void *ptr)
+{
+    _rapl_t *rapl = (_rapl_t *) ptr;
+    for(unsigned int i=0; i<rapl->nb; i++)
+        labels[i] = rapl->names[i];
+}
diff --git a/src/rapl.h b/src/rapl.h
index 74cc515d497667c4d957751663f9a1c2240e74b3..78006d380c90e721310317137adda9467ec4df41 100644
--- a/src/rapl.h
+++ b/src/rapl.h
@@ -1,25 +1,25 @@
-/*******************************************************
- Copyright (C) 2018-2019 Georges Da Costa <georges.da-costa@irit.fr>
-
-    This file is part of Mojitos.
-
-    Mojitos 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 3 of the License, or
-    (at your option) any later version.
-
-    Mojitos 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 MojitO/S.  If not, see <https://www.gnu.org/licenses/>.
-
- *******************************************************/
-
-unsigned int init_rapl(char *, void **);
-unsigned int get_rapl(uint64_t *results, void *);
-void clean_rapl(void *);
-void label_rapl(char **labels, void *);
-
+/*******************************************************
+ Copyright (C) 2018-2019 Georges Da Costa <georges.da-costa@irit.fr>
+
+    This file is part of Mojitos.
+
+    Mojitos 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 3 of the License, or
+    (at your option) any later version.
+
+    Mojitos 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 MojitO/S.  If not, see <https://www.gnu.org/licenses/>.
+
+ *******************************************************/
+
+unsigned int init_rapl(char *, void **);
+unsigned int get_rapl(uint64_t *results, void *);
+void clean_rapl(void *);
+void label_rapl(char **labels, void *);
+
diff --git a/src/temperature.c b/src/temperature.c
index cdef158500767cac032d8f5bed858756f9f16b3e..7f673b4113a4e91158665eb78f24316943d6c6fb 100644
--- a/src/temperature.c
+++ b/src/temperature.c
@@ -1,155 +1,155 @@
-/*******************************************************
- Copyright (C) 2018-2021 Georges Da Costa <georges.da-costa@irit.fr>
-
-    This file is part of Mojitos.
-
-    Mojitos 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 3 of the License, or
-    (at your option) any later version.
-
-    Mojitos 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 MojitO/S.  If not, see <https://www.gnu.org/licenses/>.
-
- *******************************************************/
-
-#include <stdlib.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdint.h>
-
-#define UNUSED(expr) do { (void)(expr); } while (0)
-
-struct temperature_t {
-    char **label_list;
-    int *fid_list;
-    int nb_elem;
-};
-
-int get_string(char *filename, char *buffer, int max_size)
-{
-    int fid = open(filename, O_RDONLY);
-    //printf("Tries to open : %s : %d\n", filename, fid);
-    if(fid == -1)
-        return -1;
-
-    int nb = read(fid, buffer, max_size);
-    if(nb == -1) {
-        close(fid);
-        return -1;
-    }
-
-    buffer[nb]=0;
-    close(fid);
-    return 0;
-}
-
-void add_to_list(char ***list_name, char *source, int nb_elem)
-{
-    //printf("Adds: %s\n", source);
-    *list_name = realloc(*list_name, (nb_elem+1)*sizeof(char *));
-    (*list_name)[nb_elem] = malloc(strlen(source)+1);
-    strcpy((*list_name)[nb_elem], source);
-
-}
-
-void add_temperature_sensor(int id_rep, struct temperature_t *state)
-{
-    static int key=0;
-    static char buffer_filename[512];
-    static char buffer_label[512];
-
-    int delta = sprintf(buffer_label, "Temp_%d_", key);
-
-    for(int i=1;; i++) {
-        sprintf(buffer_filename, "/sys/class/hwmon/hwmon%d/temp%d_label", id_rep, i);
-        if(get_string(buffer_filename, buffer_label+delta, 100) == -1)
-            break;
-
-        for(unsigned int pos = 0; pos < strlen(buffer_label); pos++) {
-            if (buffer_label[pos] == ' ')  buffer_label[pos] = '_';
-            if (buffer_label[pos] == '\n') buffer_label[pos] = '\0';
-        }
-        add_to_list(&state->label_list, buffer_label, state->nb_elem);
-
-        sprintf(buffer_filename, "/sys/class/hwmon/hwmon%d/temp%d_input", id_rep, i);
-        state->fid_list = realloc(state->fid_list, (state->nb_elem+1)*sizeof(int));
-        int fd = open(buffer_filename, O_RDONLY);
-        if (fd < 0) {
-            fprintf(stderr, "%s ", buffer_filename);
-            perror("open");
-            exit(1);
-        }
-        state->fid_list[state->nb_elem] = fd;
-        state->nb_elem++;
-        // printf("%s : %s\n", buffer_label, buffer_filename);
-    }
-
-    key++;
-}
-
-unsigned int init_temperature(char *args, void **ptr)
-{
-    UNUSED(args);
-    struct temperature_t *state = malloc(sizeof(struct temperature_t));
-    state->nb_elem = 0;
-    state->label_list = NULL;
-    state->fid_list = NULL;
-
-    char base_name[] = "/sys/class/hwmon/hwmon%d/name";
-    static char name[512];
-    static char buffer[512];
-
-    int i = 0;
-    sprintf(name, base_name, i);
-    while(get_string(name, buffer, 8) != -1) {
-        if (strcmp(buffer, "coretemp")==0)
-            add_temperature_sensor(i, state);
-
-        i++;
-        sprintf(name, base_name, i);
-    }
-    *ptr = (void *) state;
-    return state->nb_elem;
-}
-
-unsigned int get_temperature(uint64_t *results, void *ptr)
-{
-    struct temperature_t *state = (struct temperature_t *)ptr;
-    static char buffer[512];
-    for(int i=0; i<state->nb_elem; i++) {
-        if (pread(state->fid_list[i], buffer, 100, 0) < 0) {
-            perror("pread");
-            exit(1);
-        }
-        results[i] = strtoull(buffer, NULL, 10);
-    }
-    return state->nb_elem;
-}
-
-void clean_temperature(void *ptr)
-{
-    struct temperature_t *state = (struct temperature_t *)ptr;
-
-    for(int i=0; i<state->nb_elem; i++) {
-        free(state->label_list[i]);
-        close(state->fid_list[i]);
-    }
-    free(state->label_list);
-    free(state->fid_list);
-    free(state);
-}
-
-void label_temperature(char **labels, void *ptr)
-{
-    struct temperature_t *state = (struct temperature_t *)ptr;
-    for(int i=0; i<state->nb_elem; i++)
-        labels[i] = state->label_list[i];
-}
+/*******************************************************
+ Copyright (C) 2018-2021 Georges Da Costa <georges.da-costa@irit.fr>
+
+    This file is part of Mojitos.
+
+    Mojitos 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 3 of the License, or
+    (at your option) any later version.
+
+    Mojitos 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 MojitO/S.  If not, see <https://www.gnu.org/licenses/>.
+
+ *******************************************************/
+
+#include <stdlib.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdint.h>
+
+#define UNUSED(expr) do { (void)(expr); } while (0)
+
+struct temperature_t {
+    char **label_list;
+    int *fid_list;
+    int nb_elem;
+};
+
+int get_string(char *filename, char *buffer, int max_size)
+{
+    int fid = open(filename, O_RDONLY);
+    //printf("Tries to open : %s : %d\n", filename, fid);
+    if(fid == -1)
+        return -1;
+
+    int nb = read(fid, buffer, max_size);
+    if(nb == -1) {
+        close(fid);
+        return -1;
+    }
+
+    buffer[nb]=0;
+    close(fid);
+    return 0;
+}
+
+void add_to_list(char ***list_name, char *source, int nb_elem)
+{
+    //printf("Adds: %s\n", source);
+    *list_name = realloc(*list_name, (nb_elem+1)*sizeof(char *));
+    (*list_name)[nb_elem] = malloc(strlen(source)+1);
+    strcpy((*list_name)[nb_elem], source);
+
+}
+
+void add_temperature_sensor(int id_rep, struct temperature_t *state)
+{
+    static int key=0;
+    static char buffer_filename[512];
+    static char buffer_label[512];
+
+    int delta = sprintf(buffer_label, "Temp_%d_", key);
+
+    for(int i=1;; i++) {
+        sprintf(buffer_filename, "/sys/class/hwmon/hwmon%d/temp%d_label", id_rep, i);
+        if(get_string(buffer_filename, buffer_label+delta, 100) == -1)
+            break;
+
+        for(unsigned int pos = 0; pos < strlen(buffer_label); pos++) {
+            if (buffer_label[pos] == ' ')  buffer_label[pos] = '_';
+            if (buffer_label[pos] == '\n') buffer_label[pos] = '\0';
+        }
+        add_to_list(&state->label_list, buffer_label, state->nb_elem);
+
+        sprintf(buffer_filename, "/sys/class/hwmon/hwmon%d/temp%d_input", id_rep, i);
+        state->fid_list = realloc(state->fid_list, (state->nb_elem+1)*sizeof(int));
+        int fd = open(buffer_filename, O_RDONLY);
+        if (fd < 0) {
+            fprintf(stderr, "%s ", buffer_filename);
+            perror("open");
+            exit(1);
+        }
+        state->fid_list[state->nb_elem] = fd;
+        state->nb_elem++;
+        // printf("%s : %s\n", buffer_label, buffer_filename);
+    }
+
+    key++;
+}
+
+unsigned int init_temperature(char *args, void **ptr)
+{
+    UNUSED(args);
+    struct temperature_t *state = malloc(sizeof(struct temperature_t));
+    state->nb_elem = 0;
+    state->label_list = NULL;
+    state->fid_list = NULL;
+
+    char base_name[] = "/sys/class/hwmon/hwmon%d/name";
+    static char name[512];
+    static char buffer[512];
+
+    int i = 0;
+    sprintf(name, base_name, i);
+    while(get_string(name, buffer, 8) != -1) {
+        if (strcmp(buffer, "coretemp")==0)
+            add_temperature_sensor(i, state);
+
+        i++;
+        sprintf(name, base_name, i);
+    }
+    *ptr = (void *) state;
+    return state->nb_elem;
+}
+
+unsigned int get_temperature(uint64_t *results, void *ptr)
+{
+    struct temperature_t *state = (struct temperature_t *)ptr;
+    static char buffer[512];
+    for(int i=0; i<state->nb_elem; i++) {
+        if (pread(state->fid_list[i], buffer, 100, 0) < 0) {
+            perror("pread");
+            exit(1);
+        }
+        results[i] = strtoull(buffer, NULL, 10);
+    }
+    return state->nb_elem;
+}
+
+void clean_temperature(void *ptr)
+{
+    struct temperature_t *state = (struct temperature_t *)ptr;
+
+    for(int i=0; i<state->nb_elem; i++) {
+        free(state->label_list[i]);
+        close(state->fid_list[i]);
+    }
+    free(state->label_list);
+    free(state->fid_list);
+    free(state);
+}
+
+void label_temperature(char **labels, void *ptr)
+{
+    struct temperature_t *state = (struct temperature_t *)ptr;
+    for(int i=0; i<state->nb_elem; i++)
+        labels[i] = state->label_list[i];
+}
diff --git a/src/temperature.h b/src/temperature.h
index e49e4169b63316f1415b215e9c3e866e36acdfbc..ac8e34b3731fdbe04f296ca35afeed57d50f2ec6 100644
--- a/src/temperature.h
+++ b/src/temperature.h
@@ -1,24 +1,24 @@
-/*******************************************************
- Copyright (C) 2018-2021 Georges Da Costa <georges.da-costa@irit.fr>
-
-    This file is part of Mojitos.
-
-    Mojitos 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 3 of the License, or
-    (at your option) any later version.
-
-    Mojitos 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 MojitO/S.  If not, see <https://www.gnu.org/licenses/>.
-
- *******************************************************/
-
-unsigned int init_temperature(char *, void **);
-unsigned int get_temperature(uint64_t *results, void *);
-void clean_temperature(void *);
-void label_temperature(char **labels, void *);
+/*******************************************************
+ Copyright (C) 2018-2021 Georges Da Costa <georges.da-costa@irit.fr>
+
+    This file is part of Mojitos.
+
+    Mojitos 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 3 of the License, or
+    (at your option) any later version.
+
+    Mojitos 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 MojitO/S.  If not, see <https://www.gnu.org/licenses/>.
+
+ *******************************************************/
+
+unsigned int init_temperature(char *, void **);
+unsigned int get_temperature(uint64_t *results, void *);
+void clean_temperature(void *);
+void label_temperature(char **labels, void *);