From 0e9f183b15bee24f647b7640a360584563268b0f Mon Sep 17 00:00:00 2001 From: "Arnaud G. GIBERT" Date: Sun, 21 Apr 2024 20:16:18 +0200 Subject: [PATCH] - Drop local libnode version, now use the official one, V2.3.x, - Replace internal log system with LibLog V1.0.x, - Code cleanup, - Add GPL Licenses files. --- COPYING | 675 +----- COPYING.LESSER | 1 + GNU_FDL-1.3.txt | 451 ++++ GNU_GPL-3.0.txt | 674 ++++++ GNU_LGPL-3.0.txt | 165 ++ ReadMe.txt | 21 + ReleaseNotes.txt | 5 + ToDo.txt | 3 + datastruct.c | 151 +- datastruct.h | 733 ++---- drummer.c | 29 +- drummer.h | 54 +- go.sh | 6 +- libnode.c | 5965 ---------------------------------------------- libnode.h | 347 --- lv2_plugin.c | 262 +- lv2_plugin.h | 76 +- lv2_ui.c | 211 +- lv2_ui.h | 62 +- lv2_utils.c | 2 + lv2_utils.h | 68 +- utils.c | 6 +- utils.h | 76 +- 23 files changed, 1994 insertions(+), 8049 deletions(-) mode change 100644 => 120000 COPYING create mode 120000 COPYING.LESSER create mode 100644 GNU_FDL-1.3.txt create mode 100644 GNU_GPL-3.0.txt create mode 100644 GNU_LGPL-3.0.txt create mode 100644 ReadMe.txt create mode 100644 ReleaseNotes.txt create mode 100644 ToDo.txt delete mode 100644 libnode.c delete mode 100644 libnode.h diff --git a/COPYING b/COPYING deleted file mode 100644 index f288702..0000000 --- a/COPYING +++ /dev/null @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - 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. - - - Copyright (C) - - 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 . - -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: - - Copyright (C) - 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 -. - - 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 -. diff --git a/COPYING b/COPYING new file mode 120000 index 0000000..fe7151e --- /dev/null +++ b/COPYING @@ -0,0 +1 @@ +GNU_GPL-3.0.txt \ No newline at end of file diff --git a/COPYING.LESSER b/COPYING.LESSER new file mode 120000 index 0000000..a88d7bf --- /dev/null +++ b/COPYING.LESSER @@ -0,0 +1 @@ +GNU_LGPL-3.0.txt \ No newline at end of file diff --git a/GNU_FDL-1.3.txt b/GNU_FDL-1.3.txt new file mode 100644 index 0000000..857214d --- /dev/null +++ b/GNU_FDL-1.3.txt @@ -0,0 +1,451 @@ + + GNU Free Documentation License + Version 1.3, 3 November 2008 + + + Copyright (C) 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc. + + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +0. PREAMBLE + +The purpose of this License is to make a manual, textbook, or other +functional and useful document "free" in the sense of freedom: to +assure everyone the effective freedom to copy and redistribute it, +with or without modifying it, either commercially or noncommercially. +Secondarily, this License preserves for the author and publisher a way +to get credit for their work, while not being considered responsible +for modifications made by others. + +This License is a kind of "copyleft", which means that derivative +works of the document must themselves be free in the same sense. It +complements the GNU General Public License, which is a copyleft +license designed for free software. + +We have designed this License in order to use it for manuals for free +software, because free software needs free documentation: a free +program should come with manuals providing the same freedoms that the +software does. But this License is not limited to software manuals; +it can be used for any textual work, regardless of subject matter or +whether it is published as a printed book. We recommend this License +principally for works whose purpose is instruction or reference. + + +1. APPLICABILITY AND DEFINITIONS + +This License applies to any manual or other work, in any medium, that +contains a notice placed by the copyright holder saying it can be +distributed under the terms of this License. Such a notice grants a +world-wide, royalty-free license, unlimited in duration, to use that +work under the conditions stated herein. The "Document", below, +refers to any such manual or work. Any member of the public is a +licensee, and is addressed as "you". You accept the license if you +copy, modify or distribute the work in a way requiring permission +under copyright law. + +A "Modified Version" of the Document means any work containing the +Document or a portion of it, either copied verbatim, or with +modifications and/or translated into another language. + +A "Secondary Section" is a named appendix or a front-matter section of +the Document that deals exclusively with the relationship of the +publishers or authors of the Document to the Document's overall +subject (or to related matters) and contains nothing that could fall +directly within that overall subject. (Thus, if the Document is in +part a textbook of mathematics, a Secondary Section may not explain +any mathematics.) The relationship could be a matter of historical +connection with the subject or with related matters, or of legal, +commercial, philosophical, ethical or political position regarding +them. + +The "Invariant Sections" are certain Secondary Sections whose titles +are designated, as being those of Invariant Sections, in the notice +that says that the Document is released under this License. If a +section does not fit the above definition of Secondary then it is not +allowed to be designated as Invariant. The Document may contain zero +Invariant Sections. If the Document does not identify any Invariant +Sections then there are none. + +The "Cover Texts" are certain short passages of text that are listed, +as Front-Cover Texts or Back-Cover Texts, in the notice that says that +the Document is released under this License. A Front-Cover Text may +be at most 5 words, and a Back-Cover Text may be at most 25 words. + +A "Transparent" copy of the Document means a machine-readable copy, +represented in a format whose specification is available to the +general public, that is suitable for revising the document +straightforwardly with generic text editors or (for images composed of +pixels) generic paint programs or (for drawings) some widely available +drawing editor, and that is suitable for input to text formatters or +for automatic translation to a variety of formats suitable for input +to text formatters. A copy made in an otherwise Transparent file +format whose markup, or absence of markup, has been arranged to thwart +or discourage subsequent modification by readers is not Transparent. +An image format is not Transparent if used for any substantial amount +of text. A copy that is not "Transparent" is called "Opaque". + +Examples of suitable formats for Transparent copies include plain +ASCII without markup, Texinfo input format, LaTeX input format, SGML +or XML using a publicly available DTD, and standard-conforming simple +HTML, PostScript or PDF designed for human modification. Examples of +transparent image formats include PNG, XCF and JPG. Opaque formats +include proprietary formats that can be read and edited only by +proprietary word processors, SGML or XML for which the DTD and/or +processing tools are not generally available, and the +machine-generated HTML, PostScript or PDF produced by some word +processors for output purposes only. + +The "Title Page" means, for a printed book, the title page itself, +plus such following pages as are needed to hold, legibly, the material +this License requires to appear in the title page. For works in +formats which do not have any title page as such, "Title Page" means +the text near the most prominent appearance of the work's title, +preceding the beginning of the body of the text. + +The "publisher" means any person or entity that distributes copies of +the Document to the public. + +A section "Entitled XYZ" means a named subunit of the Document whose +title either is precisely XYZ or contains XYZ in parentheses following +text that translates XYZ in another language. (Here XYZ stands for a +specific section name mentioned below, such as "Acknowledgements", +"Dedications", "Endorsements", or "History".) To "Preserve the Title" +of such a section when you modify the Document means that it remains a +section "Entitled XYZ" according to this definition. + +The Document may include Warranty Disclaimers next to the notice which +states that this License applies to the Document. These Warranty +Disclaimers are considered to be included by reference in this +License, but only as regards disclaiming warranties: any other +implication that these Warranty Disclaimers may have is void and has +no effect on the meaning of this License. + +2. VERBATIM COPYING + +You may copy and distribute the Document in any medium, either +commercially or noncommercially, provided that this License, the +copyright notices, and the license notice saying this License applies +to the Document are reproduced in all copies, and that you add no +other conditions whatsoever to those of this License. You may not use +technical measures to obstruct or control the reading or further +copying of the copies you make or distribute. However, you may accept +compensation in exchange for copies. If you distribute a large enough +number of copies you must also follow the conditions in section 3. + +You may also lend copies, under the same conditions stated above, and +you may publicly display copies. + + +3. COPYING IN QUANTITY + +If you publish printed copies (or copies in media that commonly have +printed covers) of the Document, numbering more than 100, and the +Document's license notice requires Cover Texts, you must enclose the +copies in covers that carry, clearly and legibly, all these Cover +Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on +the back cover. Both covers must also clearly and legibly identify +you as the publisher of these copies. The front cover must present +the full title with all words of the title equally prominent and +visible. You may add other material on the covers in addition. +Copying with changes limited to the covers, as long as they preserve +the title of the Document and satisfy these conditions, can be treated +as verbatim copying in other respects. + +If the required texts for either cover are too voluminous to fit +legibly, you should put the first ones listed (as many as fit +reasonably) on the actual cover, and continue the rest onto adjacent +pages. + +If you publish or distribute Opaque copies of the Document numbering +more than 100, you must either include a machine-readable Transparent +copy along with each Opaque copy, or state in or with each Opaque copy +a computer-network location from which the general network-using +public has access to download using public-standard network protocols +a complete Transparent copy of the Document, free of added material. +If you use the latter option, you must take reasonably prudent steps, +when you begin distribution of Opaque copies in quantity, to ensure +that this Transparent copy will remain thus accessible at the stated +location until at least one year after the last time you distribute an +Opaque copy (directly or through your agents or retailers) of that +edition to the public. + +It is requested, but not required, that you contact the authors of the +Document well before redistributing any large number of copies, to +give them a chance to provide you with an updated version of the +Document. + + +4. MODIFICATIONS + +You may copy and distribute a Modified Version of the Document under +the conditions of sections 2 and 3 above, provided that you release +the Modified Version under precisely this License, with the Modified +Version filling the role of the Document, thus licensing distribution +and modification of the Modified Version to whoever possesses a copy +of it. In addition, you must do these things in the Modified Version: + +A. Use in the Title Page (and on the covers, if any) a title distinct + from that of the Document, and from those of previous versions + (which should, if there were any, be listed in the History section + of the Document). You may use the same title as a previous version + if the original publisher of that version gives permission. +B. List on the Title Page, as authors, one or more persons or entities + responsible for authorship of the modifications in the Modified + Version, together with at least five of the principal authors of the + Document (all of its principal authors, if it has fewer than five), + unless they release you from this requirement. +C. State on the Title page the name of the publisher of the + Modified Version, as the publisher. +D. Preserve all the copyright notices of the Document. +E. Add an appropriate copyright notice for your modifications + adjacent to the other copyright notices. +F. Include, immediately after the copyright notices, a license notice + giving the public permission to use the Modified Version under the + terms of this License, in the form shown in the Addendum below. +G. Preserve in that license notice the full lists of Invariant Sections + and required Cover Texts given in the Document's license notice. +H. Include an unaltered copy of this License. +I. Preserve the section Entitled "History", Preserve its Title, and add + to it an item stating at least the title, year, new authors, and + publisher of the Modified Version as given on the Title Page. If + there is no section Entitled "History" in the Document, create one + stating the title, year, authors, and publisher of the Document as + given on its Title Page, then add an item describing the Modified + Version as stated in the previous sentence. +J. Preserve the network location, if any, given in the Document for + public access to a Transparent copy of the Document, and likewise + the network locations given in the Document for previous versions + it was based on. These may be placed in the "History" section. + You may omit a network location for a work that was published at + least four years before the Document itself, or if the original + publisher of the version it refers to gives permission. +K. For any section Entitled "Acknowledgements" or "Dedications", + Preserve the Title of the section, and preserve in the section all + the substance and tone of each of the contributor acknowledgements + and/or dedications given therein. +L. Preserve all the Invariant Sections of the Document, + unaltered in their text and in their titles. Section numbers + or the equivalent are not considered part of the section titles. +M. Delete any section Entitled "Endorsements". Such a section + may not be included in the Modified Version. +N. Do not retitle any existing section to be Entitled "Endorsements" + or to conflict in title with any Invariant Section. +O. Preserve any Warranty Disclaimers. + +If the Modified Version includes new front-matter sections or +appendices that qualify as Secondary Sections and contain no material +copied from the Document, you may at your option designate some or all +of these sections as invariant. To do this, add their titles to the +list of Invariant Sections in the Modified Version's license notice. +These titles must be distinct from any other section titles. + +You may add a section Entitled "Endorsements", provided it contains +nothing but endorsements of your Modified Version by various +parties--for example, statements of peer review or that the text has +been approved by an organization as the authoritative definition of a +standard. + +You may add a passage of up to five words as a Front-Cover Text, and a +passage of up to 25 words as a Back-Cover Text, to the end of the list +of Cover Texts in the Modified Version. Only one passage of +Front-Cover Text and one of Back-Cover Text may be added by (or +through arrangements made by) any one entity. If the Document already +includes a cover text for the same cover, previously added by you or +by arrangement made by the same entity you are acting on behalf of, +you may not add another; but you may replace the old one, on explicit +permission from the previous publisher that added the old one. + +The author(s) and publisher(s) of the Document do not by this License +give permission to use their names for publicity for or to assert or +imply endorsement of any Modified Version. + + +5. COMBINING DOCUMENTS + +You may combine the Document with other documents released under this +License, under the terms defined in section 4 above for modified +versions, provided that you include in the combination all of the +Invariant Sections of all of the original documents, unmodified, and +list them all as Invariant Sections of your combined work in its +license notice, and that you preserve all their Warranty Disclaimers. + +The combined work need only contain one copy of this License, and +multiple identical Invariant Sections may be replaced with a single +copy. If there are multiple Invariant Sections with the same name but +different contents, make the title of each such section unique by +adding at the end of it, in parentheses, the name of the original +author or publisher of that section if known, or else a unique number. +Make the same adjustment to the section titles in the list of +Invariant Sections in the license notice of the combined work. + +In the combination, you must combine any sections Entitled "History" +in the various original documents, forming one section Entitled +"History"; likewise combine any sections Entitled "Acknowledgements", +and any sections Entitled "Dedications". You must delete all sections +Entitled "Endorsements". + + +6. COLLECTIONS OF DOCUMENTS + +You may make a collection consisting of the Document and other +documents released under this License, and replace the individual +copies of this License in the various documents with a single copy +that is included in the collection, provided that you follow the rules +of this License for verbatim copying of each of the documents in all +other respects. + +You may extract a single document from such a collection, and +distribute it individually under this License, provided you insert a +copy of this License into the extracted document, and follow this +License in all other respects regarding verbatim copying of that +document. + + +7. AGGREGATION WITH INDEPENDENT WORKS + +A compilation of the Document or its derivatives with other separate +and independent documents or works, in or on a volume of a storage or +distribution medium, is called an "aggregate" if the copyright +resulting from the compilation is not used to limit the legal rights +of the compilation's users beyond what the individual works permit. +When the Document is included in an aggregate, this License does not +apply to the other works in the aggregate which are not themselves +derivative works of the Document. + +If the Cover Text requirement of section 3 is applicable to these +copies of the Document, then if the Document is less than one half of +the entire aggregate, the Document's Cover Texts may be placed on +covers that bracket the Document within the aggregate, or the +electronic equivalent of covers if the Document is in electronic form. +Otherwise they must appear on printed covers that bracket the whole +aggregate. + + +8. TRANSLATION + +Translation is considered a kind of modification, so you may +distribute translations of the Document under the terms of section 4. +Replacing Invariant Sections with translations requires special +permission from their copyright holders, but you may include +translations of some or all Invariant Sections in addition to the +original versions of these Invariant Sections. You may include a +translation of this License, and all the license notices in the +Document, and any Warranty Disclaimers, provided that you also include +the original English version of this License and the original versions +of those notices and disclaimers. In case of a disagreement between +the translation and the original version of this License or a notice +or disclaimer, the original version will prevail. + +If a section in the Document is Entitled "Acknowledgements", +"Dedications", or "History", the requirement (section 4) to Preserve +its Title (section 1) will typically require changing the actual +title. + + +9. TERMINATION + +You may not copy, modify, sublicense, or distribute the Document +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense, or distribute it is void, and +will automatically terminate your rights under this License. + +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, receipt of a copy of some or all of the same material does +not give you any rights to use it. + + +10. FUTURE REVISIONS OF THIS LICENSE + +The Free Software Foundation may publish new, revised versions of the +GNU Free Documentation 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. See +https://www.gnu.org/licenses/. + +Each version of the License is given a distinguishing version number. +If the Document specifies that a particular numbered version of this +License "or any later version" applies to it, you have the option of +following the terms and conditions either of that specified version or +of any later version that has been published (not as a draft) by the +Free Software Foundation. If the Document does not specify a version +number of this License, you may choose any version ever published (not +as a draft) by the Free Software Foundation. If the Document +specifies that a proxy can decide which future versions of this +License can be used, that proxy's public statement of acceptance of a +version permanently authorizes you to choose that version for the +Document. + +11. RELICENSING + +"Massive Multiauthor Collaboration Site" (or "MMC Site") means any +World Wide Web server that publishes copyrightable works and also +provides prominent facilities for anybody to edit those works. A +public wiki that anybody can edit is an example of such a server. A +"Massive Multiauthor Collaboration" (or "MMC") contained in the site +means any set of copyrightable works thus published on the MMC site. + +"CC-BY-SA" means the Creative Commons Attribution-Share Alike 3.0 +license published by Creative Commons Corporation, a not-for-profit +corporation with a principal place of business in San Francisco, +California, as well as future copyleft versions of that license +published by that same organization. + +"Incorporate" means to publish or republish a Document, in whole or in +part, as part of another Document. + +An MMC is "eligible for relicensing" if it is licensed under this +License, and if all works that were first published under this License +somewhere other than this MMC, and subsequently incorporated in whole or +in part into the MMC, (1) had no cover texts or invariant sections, and +(2) were thus incorporated prior to November 1, 2008. + +The operator of an MMC Site may republish an MMC contained in the site +under CC-BY-SA on the same site at any time before August 1, 2009, +provided the MMC is eligible for relicensing. + + +ADDENDUM: How to use this License for your documents + +To use this License in a document you have written, include a copy of +the License in the document and put the following copyright and +license notices just after the title page: + + Copyright (c) YEAR YOUR NAME. + Permission is granted to copy, distribute and/or modify this document + under the terms of the GNU Free Documentation License, Version 1.3 + or any later version published by the Free Software Foundation; + with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. + A copy of the license is included in the section entitled "GNU + Free Documentation License". + +If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts, +replace the "with...Texts." line with this: + + with the Invariant Sections being LIST THEIR TITLES, with the + Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST. + +If you have Invariant Sections without Cover Texts, or some other +combination of the three, merge those two alternatives to suit the +situation. + +If your document contains nontrivial examples of program code, we +recommend releasing these examples in parallel under your choice of +free software license, such as the GNU General Public License, +to permit their use in free software. diff --git a/GNU_GPL-3.0.txt b/GNU_GPL-3.0.txt new file mode 100644 index 0000000..f288702 --- /dev/null +++ b/GNU_GPL-3.0.txt @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + 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. + + + Copyright (C) + + 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 . + +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: + + Copyright (C) + 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 +. + + 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 +. diff --git a/GNU_LGPL-3.0.txt b/GNU_LGPL-3.0.txt new file mode 100644 index 0000000..0a04128 --- /dev/null +++ b/GNU_LGPL-3.0.txt @@ -0,0 +1,165 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser 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 +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. diff --git a/ReadMe.txt b/ReadMe.txt new file mode 100644 index 0000000..cf523e4 --- /dev/null +++ b/ReadMe.txt @@ -0,0 +1,21 @@ +Welcome to Drummer 1.0.x ! + + + +This release of Drummer supports the following OS: + - Linux 5.15.x, (tested on Mageia 8). + + + +Drummer is licensed under the LGPL/GPL GNU Licenses. +For more information, please read the corresponding source file headers. +The license details can be found in the GNU_GPL-3.0.txt, GNU_LGPL-3.0.txt and GNU_FDL-1.3.txt files. + + + +Enjoy it! + +Your Drummer Team. + +arnaud@rx3.net +https://git.rx3.org/gitea/rx3/drummer diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt new file mode 100644 index 0000000..2ebb85a --- /dev/null +++ b/ReleaseNotes.txt @@ -0,0 +1,5 @@ +------------------------------------------------------------------------------------------------------------------------------------ +Drummer V 1.0.0-1 - A. GIBERT - 24/??/?? +------------------------------------------------------------------------------------------------------------------------------------ + +All: First released version diff --git a/ToDo.txt b/ToDo.txt new file mode 100644 index 0000000..e2a40fc --- /dev/null +++ b/ToDo.txt @@ -0,0 +1,3 @@ +- A lot... :) + + diff --git a/datastruct.c b/datastruct.c index fe17620..0cf3d90 100644 --- a/datastruct.c +++ b/datastruct.c @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* datastruct.x */ +/* datastruct.c */ /*----------------------------------------------------------------------------*/ /*----------------------------------------------------------------------------*/ @@ -19,6 +19,8 @@ /* along with Drummer. If not, see . */ /*----------------------------------------------------------------------------*/ + + /*----------------------------------------------------------------------------*/ /* Includes */ /*----------------------------------------------------------------------------*/ @@ -33,98 +35,6 @@ -/*----------------------------------------------------------------------------*/ -/* */ -/*----------------------------------------------------------------------------*/ - -DRT_Status DR_Log_Format( char *Out_Fmt, DRT_Log_Type_Id Log_Type_Id, DRT_Log_Level Log_Level, char *Module_Name, char *File_Name, long Line_Id, bool LF_Flag, char *Log_Fmt) -{ - struct timeval cur_timeval; - struct tm *tm_ptr; - - - gettimeofday( &cur_timeval, NULL); - - if( ( tm_ptr = localtime( &( cur_timeval.tv_sec))) == NULL) - { - fprintf( DRG_Base.Log_Stream_Out, "DR_Log: %s: can't convert localtime (%d) !\n", __FILE__, errno); - - return( DRS_KO); - } - - sprintf( Out_Fmt, "%02d/%02d/%02d %02d:%02d:%02d.%04d %3s %03d %-4s %-21s %-4d %s%s", - ( tm_ptr->tm_year - 100), tm_ptr->tm_mon, tm_ptr->tm_mday, tm_ptr->tm_hour, tm_ptr->tm_min, tm_ptr->tm_sec, ( cur_timeval.tv_usec / 100), - DRG_Base.Log_Type_Name_Tab[ Log_Type_Id], Log_Level, Module_Name, File_Name, Line_Id, - Log_Fmt, - ( ( LF_Flag == true) ? "\n" : "")); - - return( DRS_OK); -} - - - - - -/*----------------------------------------------------------------------------*/ -/* */ -/*----------------------------------------------------------------------------*/ - -DRT_Status DR_Log_Write( DRT_Log_Type_Id Log_Type_Id, char *Out_Fmt, va_list Args) -{ - int rc; - - - rc = vfprintf( DRG_Base.Log_Stream_Out, Out_Fmt, Args); - - if( rc < 0) - { - fprintf( stderr, "DR_Log: Can't log messages (%d)!!!\n", errno); - return( DRS_KO); - } - - fflush( DRG_Base.Log_Stream_Out); - - return( DRS_OK); -} - - - - - -/*----------------------------------------------------------------------------*/ -/* */ -/*----------------------------------------------------------------------------*/ - -DRT_Status DR_Log( DRT_Log_Type_Id Log_Type_Id, DRT_Log_Level Log_Level, char *Module_Name, char *File_Name, long Line_Id, bool LF_Flag, char *Log_Fmt, ...) -{ - va_list args; - char fmt[255]; - int rc; - DRT_Log_Writer_Ptr log_writer_ptr; - DRT_Status status; - - - if( DR_Log_Format( fmt, Log_Type_Id, Log_Level, Module_Name, File_Name, Line_Id, LF_Flag, Log_Fmt) != DRS_OK) - { - fprintf( stderr, "DR_Log: Can't format log messages (%d)!!!\n", errno); - return( DRS_KO); - } - - va_start( args, Log_Fmt); - - log_writer_ptr = ( ( DRG_Base.Log_Writer_Ptr == NULL) ? &DR_Log_Write : DRG_Base.Log_Writer_Ptr); - - status = ( *log_writer_ptr)( Log_Type_Id, fmt, args); - - va_end( args); - - return( status); -} - - - - - /*----------------------------------------------------------------------------*/ /* */ /*----------------------------------------------------------------------------*/ @@ -1491,7 +1401,7 @@ DRT_Status DR_Layer_Sample_Load( DRT_Layer *Layer_Ptr) if( ( sndf_ptr = sf_open( Layer_Ptr->FileName, SFM_READ, Layer_Ptr->SF_Info_Ptr)) == NULL) { - DR_LOG_WARNING_2( "Can't open sample file [%s] (%ld)!", Layer_Ptr->FileName, (long)sf_strerror( (SNDFILE *)( Layer_Ptr->Sample_Ptr))); + LG_LOG_WARNING_2( "Can't open sample file [%s] (%ld)!", Layer_Ptr->FileName, (long)sf_strerror( (SNDFILE *)( Layer_Ptr->Sample_Ptr))); status = DRS_KO; } else @@ -1795,14 +1705,14 @@ DRT_Status DR_Kit_Id_Find( DRT_Kit **Kit_Ptr_Ptr, DRT_Kit_Id Kit_Id) if( ( nd_status = ND_DataStruct_Value_Find( (void **)Kit_Ptr_Ptr, DRG_Base.Kit_DS_Ptr, &kit_template)) != NDS_OK) { - DR_LOG_ERROR_1( "DR_Kit_Id_Find: Find error: (%d)!", nd_status); + LG_LOG_ERROR_1( "DR_Kit_Id_Find: Find error: (%d)!", nd_status); status = DRS_KO; } else { if( *Kit_Ptr_Ptr == NULL) { - DR_LOG_WARNING_1( "Can't find: Kit with id: (%ld)!", Kit_Id); + LG_LOG_WARNING_1( "Can't find: Kit with id: (%ld)!", Kit_Id); status = DRS_KO; } else @@ -1835,14 +1745,14 @@ DRT_Status DR_Kit_Logical_Id_Find( DRT_Kit **Kit_Ptr_Ptr, DRT_Kit_Id Kit_Logi if( ( nd_status = ND_DataStruct_Value_Find( (void **)Kit_Ptr_Ptr, DRG_Base.Kit_DS_Ptr, &kit_template)) != NDS_OK) { - DR_LOG_ERROR_1( "DR_Kit_Logical_Id_Find: Find error: (%d)!", nd_status); + LG_LOG_ERROR_1( "DR_Kit_Logical_Id_Find: Find error: (%d)!", nd_status); status = DRS_KO; } else { if( *Kit_Ptr_Ptr == NULL) { - DR_LOG_WARNING_1( "DR_Kit_Logical_Id_Find: Can't find: kit with logical id: [%d]!", Kit_Logical_Id); + LG_LOG_WARNING_1( "DR_Kit_Logical_Id_Find: Can't find: kit with logical id: [%d]!", Kit_Logical_Id); status = DRS_KO; } else @@ -2016,14 +1926,14 @@ DRT_Status DR_XML_Value_Get( char *Value_Ptr, long Max_Len, xmlDocPtr Xml_Do if( xmlXPathNodeSetIsEmpty( nodeset)) { - DR_LOG_WARNING_1( "[%s] not found!", xpath_request); + LG_LOG_WARNING_1( "[%s] not found!", xpath_request); status = DRS_KO; } else { if( ( tmpval_ptr = (char *)xmlNodeListGetString( Xml_Doc, nodeset->nodeTab[0]->xmlChildrenNode, 1)) == NULL) { - DR_LOG_WARNING_1( "[%s] value not found!", xpath_request); + LG_LOG_WARNING_1( "[%s] value not found!", xpath_request); status = DRS_KO; } else @@ -2167,7 +2077,7 @@ DRT_Status DR_Kit_Load( char *FileName) // fprintf( stderr, "Loading: [%s]...\n", FileName); - DR_LOG_INFO_1( "Loading: [%s]...", FileName); + LG_LOG_INFO_1( "Loading: [%s]...", FileName); if( strlen( FileName) > DRD_FILENAME_LEN) { @@ -2300,11 +2210,11 @@ DRT_Status DR_Kit_Sample_Load( DRT_Kit *Kit_Ptr) if( DR_LOAD_STATUS_LOADED_IS( Kit_Ptr)) { - DR_LOG_INFO_1( "Loading kit samples: [%s] Skiped!", Kit_Ptr->Name); + LG_LOG_INFO_1( "Loading kit samples: [%s] Skiped!", Kit_Ptr->Name); } else { - DR_LOG_INFO_1( "Loading kit samples: [%s]!", Kit_Ptr->Name); + LG_LOG_INFO_1( "Loading kit samples: [%s]!", Kit_Ptr->Name); if( ( nd_status = ND_DataStruct_Traverse( Kit_Ptr->Instrument_DS_Ptr, NDD_CMD_SAMPLE_LOAD)) != NDS_OK) { @@ -2342,11 +2252,11 @@ DRT_Status DR_Kit_Sample_UnLoad( DRT_Kit *Kit_Ptr) if( !DR_LOAD_STATUS_LOADED_IS( Kit_Ptr)) { - DR_LOG_INFO_1( "UnLoading kit samples: [%s] Skiped!", Kit_Ptr->Name); + LG_LOG_INFO_1( "UnLoading kit samples: [%s] Skiped!", Kit_Ptr->Name); } else { - DR_LOG_INFO_1( "UnLoading kit samples: [%s]!", Kit_Ptr->Name); + LG_LOG_INFO_1( "UnLoading kit samples: [%s]!", Kit_Ptr->Name); if( ( nd_status = ND_DataStruct_Traverse( Kit_Ptr->Instrument_DS_Ptr, NDD_CMD_SAMPLE_UNLOAD, Kit_Ptr)) != NDS_OK) { @@ -2373,7 +2283,7 @@ DRT_Status DR_Kits_Sample_Load() NDT_Status nd_status; - DR_LOG_INFO_0( "Loading kits samples!"); + LG_LOG_INFO_0( "Loading kits samples!"); if( ( nd_status = ND_DataStruct_Traverse( DRG_Base.Kit_DS_Ptr, NDD_CMD_SAMPLE_LOAD)) != NDS_OK) { @@ -2383,7 +2293,7 @@ DRT_Status DR_Kits_Sample_Load() if( DRG_Base.Task_Sync_Kits_Flag == DRD_TRUE) { - DR_LOG_INFO_0( "Synchronising..."); + LG_LOG_INFO_0( "Synchronising..."); if( DR_Task_Wait() != DRS_OK) { @@ -2391,7 +2301,7 @@ DRT_Status DR_Kits_Sample_Load() return( DRS_KO); } - DR_LOG_INFO_0( "Sync done!"); + LG_LOG_INFO_0( "Sync done!"); } return( DRS_OK); @@ -2410,7 +2320,7 @@ DRT_Status DR_Kits_Sample_UnLoad() NDT_Status nd_status; - DR_LOG_INFO_0( "UnLoading kits samples!"); + LG_LOG_INFO_0( "UnLoading kits samples!"); if( ( nd_status = ND_DataStruct_Traverse( DRG_Base.Kit_DS_Ptr, NDD_CMD_SAMPLE_UNLOAD, DRG_Base.SampleRate)) != NDS_OK) { @@ -2536,7 +2446,7 @@ DRT_Status DR_Kits_Name_Get( DRT_Kit_Name **Kit_Name_Tab_Ptr, long *Kit_Numbe { if( ( nd_status = ND_Index_Node_First_Get( &node_cur_ptr, DRG_Base.Kit_DS_Ptr, 1)) != NDS_OK) { - DR_LOG_INFO_1( "Can't find the first kit: ND_Index_Node_First_Get() failed (%d)!", nd_status); + LG_LOG_INFO_1( "Can't find the first kit: ND_Index_Node_First_Get() failed (%d)!", nd_status); *Kit_Name_Tab_Ptr = NULL; return( DRS_KO); @@ -2545,7 +2455,7 @@ DRT_Status DR_Kits_Name_Get( DRT_Kit_Name **Kit_Name_Tab_Ptr, long *Kit_Numbe { if( ( *Kit_Name_Tab_Ptr = malloc( sizeof( DRT_Kit_Name) * *Kit_Number_Ptr)) == NULL) { - DR_LOG_INFO_0( "Can't allocate kit name tab memory!"); + LG_LOG_INFO_0( "Can't allocate kit name tab memory!"); *Kit_Name_Tab_Ptr = NULL; return( DRS_KO); @@ -2557,7 +2467,7 @@ DRT_Status DR_Kits_Name_Get( DRT_Kit_Name **Kit_Name_Tab_Ptr, long *Kit_Numbe while( node_cur_ptr != NULL) { kit_cur_ptr = node_cur_ptr->Value; -// DR_LOG_INFO_1( "Kit Name: [%s]", kit_cur_ptr->Name); +// LG_LOG_INFO_1( "Kit Name: [%s]", kit_cur_ptr->Name); (*Kit_Name_Tab_Ptr)[ kit_id].Id = kit_cur_ptr->Id; (*Kit_Name_Tab_Ptr)[ kit_id].Logical_Id = kit_cur_ptr->Logical_Id; @@ -2567,7 +2477,7 @@ DRT_Status DR_Kits_Name_Get( DRT_Kit_Name **Kit_Name_Tab_Ptr, long *Kit_Numbe if( ( nd_status = ND_Index_Node_Next_Get( &node_cur_ptr, node_cur_ptr)) != NDS_OK) { - DR_LOG_INFO_1( "Can't find the next kit: ND_Index_Node_Next_Get() failed (%d)!", nd_status); + LG_LOG_INFO_1( "Can't find the next kit: ND_Index_Node_Next_Get() failed (%d)!", nd_status); node_cur_ptr = NULL; } } @@ -2601,7 +2511,7 @@ DRT_Status DR_Kits_Stats_Dump() return( DRS_KO); } - DR_LOG_INFO_4( "Number of Kits: (%ld) Number of Instruments: (%ld) Number of Layers: (%ld) Number of Loaded Samples: (%ld)", kit_count, instrument_count, layer_count, sample_count); + LG_LOG_INFO_4( "Number of Kits: (%ld) Number of Instruments: (%ld) Number of Layers: (%ld) Number of Loaded Samples: (%ld)", kit_count, instrument_count, layer_count, sample_count); return( DRS_OK); } @@ -3033,17 +2943,17 @@ DRT_Status DR_Tasks_Dump() // pthread_mutex_lock( &( DRG_Base.Task_Mutex)); - DR_LOG_INFO_6( "Task Number: (%d) Task Load Layer: [%s] Task Load Instrument: [%s] Task Load Kit: [%s] Task Sync Kit: [%s] Task Sync Kits: [%s]", + LG_LOG_INFO_6( "Task Number: (%d) Task Load Layer: [%s] Task Load Instrument: [%s] Task Load Kit: [%s] Task Sync Kit: [%s] Task Sync Kits: [%s]", DRG_Base.Task_Number, DR_BOOLEAN_VALUE_ASCII_GET( DRG_Base.Task_Load_Layer_Flag), DR_BOOLEAN_VALUE_ASCII_GET( DRG_Base.Task_Load_Instrument_Flag), DR_BOOLEAN_VALUE_ASCII_GET( DRG_Base.Task_Load_Kit_Flag), DR_BOOLEAN_VALUE_ASCII_GET( DRG_Base.Task_Sync_Kit_Flag), DR_BOOLEAN_VALUE_ASCII_GET( DRG_Base.Task_Sync_Kits_Flag)); - DR_LOG_INFO_0( "Task Tab:"); + LG_LOG_INFO_0( "Task Tab:"); for( task_id = 0; task_id < DRG_Base.Task_Number; task_id++) { - DR_LOG_INFO_6( " Id: (%02d) Status: [%s] Thread: (%ld) Command: [%s] Target Ptr: [%lx] Count: (%ld)", + LG_LOG_INFO_6( " Id: (%02d) Status: [%s] Thread: (%ld) Command: [%s] Target Ptr: [%lx] Count: (%ld)", task_id, DR_TASK_STATUS_ASCII_GET( &( DRG_Base.Task_Tab[task_id])), (long)( DRG_Base.Task_Tab[task_id].Thread), DR_TASK_CMD_ASCII_GET( &( DRG_Base.Task_Tab[task_id])), DRG_Base.Task_Tab[task_id].Target_Ptr, DRG_Base.Task_Tab[task_id].Count); } - DR_LOG_INFO_4( "Task Count Waiting: (%ld) Task Count Run: (%ld) Task Count Sleep: (%ld) Task Count FakeWU: (%ld)", DRG_Base.Task_Count_Waiting, DRG_Base.Task_Count_Run, DRG_Base.Task_Count_Sleep, DRG_Base.Task_Count_FakeWU); + LG_LOG_INFO_4( "Task Count Waiting: (%ld) Task Count Run: (%ld) Task Count Sleep: (%ld) Task Count FakeWU: (%ld)", DRG_Base.Task_Count_Waiting, DRG_Base.Task_Count_Run, DRG_Base.Task_Count_Sleep, DRG_Base.Task_Count_FakeWU); // pthread_mutex_unlock( &( DRG_Base.Task_Mutex)); @@ -3058,15 +2968,12 @@ DRT_Status DR_Tasks_Dump() /* DR_DataStruct_Init */ /*----------------------------------------------------------------------------*/ -DRT_Status DR_DataStruct_Init( DRT_Log_Writer_Ptr Log_Writer_Ptr, DRT_SampleRate SampleRate, DRT_Task_Id Task_Number) +DRT_Status DR_DataStruct_Init( DRT_SampleRate SampleRate, DRT_Task_Id Task_Number) { NDT_Status nd_status; DRT_Task_Id task_id; - DRG_Base.Log_Stream_Out = stderr; - DRG_Base.Log_Writer_Ptr = Log_Writer_Ptr; - if( ( nd_status = ND_Library_Open( NDD_TRUE)) != NDS_OK) { fprintf( stderr, "Can't open node library (%d)!\n", nd_status); diff --git a/datastruct.h b/datastruct.h index 960729d..fe416fc 100644 --- a/datastruct.h +++ b/datastruct.h @@ -19,6 +19,8 @@ /* along with Drummer. If not, see . */ /*----------------------------------------------------------------------------*/ + + /*----------------------------------------------------------------------------*/ /* Includes */ /*----------------------------------------------------------------------------*/ @@ -45,8 +47,6 @@ typedef struct DRT_Kit DRT_Kit; /* Global definitions */ /*----------------------------------------------------------------------------*/ -#define DRD_LOG_WRITER_DEFAULT DR_Log_Write - #define DRD_CHANNEL_ID_DEFAULT 10 #define DRD_BASE_NOTE_DEFAULT 36 #define DRD_VELOCITY_IGNORE_NOTE_DEFAULT 24 @@ -64,69 +64,6 @@ typedef struct DRT_Kit DRT_Kit; -/*----------------------------------------------------------------------------*/ -/* Log Definitions */ -/*----------------------------------------------------------------------------*/ - -#define DRD_LOG_TYPE_NB 5 - -typedef short DRT_Log_Type_Id; - -#define DRD_LOG_TYPE_ID_UNKNOWN ( DRT_Log_Type_Id) 0 -#define DRD_LOG_TYPE_ID_TRACE ( DRT_Log_Type_Id) 1 -#define DRD_LOG_TYPE_ID_INFO ( DRT_Log_Type_Id) 2 -#define DRD_LOG_TYPE_ID_WARNING ( DRT_Log_Type_Id) 3 -#define DRD_LOG_TYPE_ID_ERROR ( DRT_Log_Type_Id) 4 - -typedef char *DRT_Log_Type_Name; - -#define DRD_LOG_TYPE_NAME_UNKNOWN ( DRT_Log_Type_Name) "???" -#define DRD_LOG_TYPE_NAME_TRACE ( DRT_Log_Type_Name) "TRA" -#define DRD_LOG_TYPE_NAME_INFO ( DRT_Log_Type_Name) "INF" -#define DRD_LOG_TYPE_NAME_WARNING ( DRT_Log_Type_Name) "WRN" -#define DRD_LOG_TYPE_NAME_ERROR ( DRT_Log_Type_Name) "ERR" - -typedef short DRT_Log_Level; - -#define DRD_LOG_LEVEL_UNKNOWN ( DRT_Log_Level) 0 -#define DRD_LOG_LEVEL_DEFAULT ( DRT_Log_Level) 1 - -#define DR_LOG_TRACE_0( Level, Fmt) DR_Log( DRD_LOG_TYPE_ID_TRACE, (Level), DRD_MODULE_NAME, __FILE__, __LINE__, true, (Fmt)) -#define DR_LOG_TRACE_1( Level, Fmt, Arg1) DR_Log( DRD_LOG_TYPE_ID_TRACE, (Level), DRD_MODULE_NAME, __FILE__, __LINE__, true, (Fmt), (Arg1)) -#define DR_LOG_TRACE_2( Level, Fmt, Arg1, Arg2) DR_Log( DRD_LOG_TYPE_ID_TRACE, (Level), DRD_MODULE_NAME, __FILE__, __LINE__, true, (Fmt), (Arg1), (Arg2)) -#define DR_LOG_TRACE_3( Level, Fmt, Arg1, Arg2, Arg3) DR_Log( DRD_LOG_TYPE_ID_TRACE, (Level), DRD_MODULE_NAME, __FILE__, __LINE__, true, (Fmt), (Arg1), (Arg2), (Arg3)) -#define DR_LOG_TRACE_4( Level, Fmt, Arg1, Arg2, Arg3, Arg4) DR_Log( DRD_LOG_TYPE_ID_TRACE, (Level), DRD_MODULE_NAME, __FILE__, __LINE__, true, (Fmt), (Arg1), (Arg2), (Arg3), (Arg4)) -#define DR_LOG_TRACE_5( Level, Fmt, Arg1, Arg2, Arg3, Arg4, Arg5) DR_Log( DRD_LOG_TYPE_ID_TRACE, (Level), DRD_MODULE_NAME, __FILE__, __LINE__, true, (Fmt), (Arg1), (Arg2), (Arg3), (Arg4), (Arg5)) -#define DR_LOG_TRACE_6( Level, Fmt, Arg1, Arg2, Arg3, Arg4, Arg5, Arg6) DR_Log( DRD_LOG_TYPE_ID_TRACE, (Level), DRD_MODULE_NAME, __FILE__, __LINE__, true, (Fmt), (Arg1), (Arg2), (Arg3), (Arg4), (Arg5), (Arg6)) - -#define DR_LOG_INFO_0( Fmt) DR_Log( DRD_LOG_TYPE_ID_INFO, DRD_LOG_LEVEL_DEFAULT, DRD_MODULE_NAME, __FILE__, __LINE__, true, (Fmt)) -#define DR_LOG_INFO_1( Fmt, Arg1) DR_Log( DRD_LOG_TYPE_ID_INFO, DRD_LOG_LEVEL_DEFAULT, DRD_MODULE_NAME, __FILE__, __LINE__, true, (Fmt), (Arg1)) -#define DR_LOG_INFO_2( Fmt, Arg1, Arg2) DR_Log( DRD_LOG_TYPE_ID_INFO, DRD_LOG_LEVEL_DEFAULT, DRD_MODULE_NAME, __FILE__, __LINE__, true, (Fmt), (Arg1), (Arg2)) -#define DR_LOG_INFO_3( Fmt, Arg1, Arg2, Arg3) DR_Log( DRD_LOG_TYPE_ID_INFO, DRD_LOG_LEVEL_DEFAULT, DRD_MODULE_NAME, __FILE__, __LINE__, true, (Fmt), (Arg1), (Arg2), (Arg3)) -#define DR_LOG_INFO_4( Fmt, Arg1, Arg2, Arg3, Arg4) DR_Log( DRD_LOG_TYPE_ID_INFO, DRD_LOG_LEVEL_DEFAULT, DRD_MODULE_NAME, __FILE__, __LINE__, true, (Fmt), (Arg1), (Arg2), (Arg3), (Arg4)) -#define DR_LOG_INFO_5( Fmt, Arg1, Arg2, Arg3, Arg4, Arg5) DR_Log( DRD_LOG_TYPE_ID_INFO, DRD_LOG_LEVEL_DEFAULT, DRD_MODULE_NAME, __FILE__, __LINE__, true, (Fmt), (Arg1), (Arg2), (Arg3), (Arg4), (Arg5)) -#define DR_LOG_INFO_6( Fmt, Arg1, Arg2, Arg3, Arg4, Arg5, Arg6) DR_Log( DRD_LOG_TYPE_ID_INFO, DRD_LOG_LEVEL_DEFAULT, DRD_MODULE_NAME, __FILE__, __LINE__, true, (Fmt), (Arg1), (Arg2), (Arg3), (Arg4), (Arg5), (Arg6)) - -#define DR_LOG_WARNING_0( Fmt) DR_Log( DRD_LOG_TYPE_ID_WARNING, DRD_LOG_LEVEL_DEFAULT, DRD_MODULE_NAME, __FILE__, __LINE__, true, (Fmt)) -#define DR_LOG_WARNING_1( Fmt, Arg1) DR_Log( DRD_LOG_TYPE_ID_WARNING, DRD_LOG_LEVEL_DEFAULT, DRD_MODULE_NAME, __FILE__, __LINE__, true, (Fmt), (Arg1)) -#define DR_LOG_WARNING_2( Fmt, Arg1, Arg2) DR_Log( DRD_LOG_TYPE_ID_WARNING, DRD_LOG_LEVEL_DEFAULT, DRD_MODULE_NAME, __FILE__, __LINE__, true, (Fmt), (Arg1), (Arg2)) -#define DR_LOG_WARNING_3( Fmt, Arg1, Arg2, Arg3) DR_Log( DRD_LOG_TYPE_ID_WARNING, DRD_LOG_LEVEL_DEFAULT, DRD_MODULE_NAME, __FILE__, __LINE__, true, (Fmt), (Arg1), (Arg2), (Arg3)) -#define DR_LOG_WARNING_4( Fmt, Arg1, Arg2, Arg3, Arg4) DR_Log( DRD_LOG_TYPE_ID_WARNING, DRD_LOG_LEVEL_DEFAULT, DRD_MODULE_NAME, __FILE__, __LINE__, true, (Fmt), (Arg1), (Arg2), (Arg3), (Arg4)) -#define DR_LOG_WARNING_5( Fmt, Arg1, Arg2, Arg3, Arg4, Arg5) DR_Log( DRD_LOG_TYPE_ID_WARNING, DRD_LOG_LEVEL_DEFAULT, DRD_MODULE_NAME, __FILE__, __LINE__, true, (Fmt), (Arg1), (Arg2), (Arg3), (Arg4), (Arg5)) -#define DR_LOG_WARNING_6( Fmt, Arg1, Arg2, Arg3, Arg4, Arg5, Arg6) DR_Log( DRD_LOG_TYPE_ID_WARNING, DRD_LOG_LEVEL_DEFAULT, DRD_MODULE_NAME, __FILE__, __LINE__, true, (Fmt), (Arg1), (Arg2), (Arg3), (Arg4), (Arg5), (Arg6)) - -#define DR_LOG_ERROR_0( Fmt) DR_Log( DRD_LOG_TYPE_ID_ERROR, DRD_LOG_LEVEL_DEFAULT, DRD_MODULE_NAME, __FILE__, __LINE__, true, (Fmt)) -#define DR_LOG_ERROR_1( Fmt, Arg1) DR_Log( DRD_LOG_TYPE_ID_ERROR, DRD_LOG_LEVEL_DEFAULT, DRD_MODULE_NAME, __FILE__, __LINE__, true, (Fmt), (Arg1)) -#define DR_LOG_ERROR_2( Fmt, Arg1, Arg2) DR_Log( DRD_LOG_TYPE_ID_ERROR, DRD_LOG_LEVEL_DEFAULT, DRD_MODULE_NAME, __FILE__, __LINE__, true, (Fmt), (Arg1), (Arg2)) -#define DR_LOG_ERROR_3( Fmt, Arg1, Arg2, Arg3) DR_Log( DRD_LOG_TYPE_ID_ERROR, DRD_LOG_LEVEL_DEFAULT, DRD_MODULE_NAME, __FILE__, __LINE__, true, (Fmt), (Arg1), (Arg2), (Arg3)) -#define DR_LOG_ERROR_4( Fmt, Arg1, Arg2, Arg3, Arg4) DR_Log( DRD_LOG_TYPE_ID_ERROR, DRD_LOG_LEVEL_DEFAULT, DRD_MODULE_NAME, __FILE__, __LINE__, true, (Fmt), (Arg1), (Arg2), (Arg3), (Arg4)) -#define DR_LOG_ERROR_5( Fmt, Arg1, Arg2, Arg3, Arg4, Arg5) DR_Log( DRD_LOG_TYPE_ID_ERROR, DRD_LOG_LEVEL_DEFAULT, DRD_MODULE_NAME, __FILE__, __LINE__, true, (Fmt), (Arg1), (Arg2), (Arg3), (Arg4), (Arg5)) -#define DR_LOG_ERROR_6( Fmt, Arg1, Arg2, Arg3, Arg4, Arg5, Arg6) DR_Log( DRD_LOG_TYPE_ID_ERROR, DRD_LOG_LEVEL_DEFAULT, DRD_MODULE_NAME, __FILE__, __LINE__, true, (Fmt), (Arg1), (Arg2), (Arg3), (Arg4), (Arg5), (Arg6)) - - - - - /*----------------------------------------------------------------------------*/ /* Definitions */ /*----------------------------------------------------------------------------*/ @@ -260,16 +197,10 @@ typedef struct DRT_Task /* DRT_Base */ /*---------------------------------------------------------------------------------*/ -typedef DRT_Status (*DRT_Log_Writer_Ptr)( DRT_Log_Type_Id, char *, va_list); - typedef int DRT_SampleRate; typedef struct DRT_Base { - FILE *Log_Stream_Out; - char *Log_Type_Name_Tab[ DRD_LOG_TYPE_NB]; - DRT_Log_Writer_Ptr Log_Writer_Ptr; - NDT_Root *Kit_DS_Ptr; DRT_SampleRate SampleRate; @@ -358,25 +289,258 @@ typedef struct DRT_Kit_Name -# ifdef _DATASTRUCT_C_ +/*----------------------------------------------------------------------------*/ +/* DRD DATA & API definition */ +/*----------------------------------------------------------------------------*/ + +# ifdef _DATASTRUCT_C_ +# define DRD_DS_DATA +# define DRD_DS_API +# else +# define DRD_DS_DATA extern +# define DRD_DS_API extern +# endif + + + + + +/*----------------------------------------------------------------------------*/ +/* Public Data */ +/*----------------------------------------------------------------------------*/ + +/*----------------------------------------------------------------------------*/ +/* DRT_Base */ +/*----------------------------------------------------------------------------*/ + +DRD_DS_DATA DRT_Base DRG_Base; + + + + + +/*----------------------------------------------------------------------------*/ +/* Public Prototypes */ +/*----------------------------------------------------------------------------*/ + +/*----------------------------------------------------------------------------*/ +/* */ +/*----------------------------------------------------------------------------*/ + +//DRD_DS_API DRT_Status DR_Log_Write( DRT_Log_Type_Id, char *, va_list); + + + +/*----------------------------------------------------------------------------*/ +/* DR_Log */ +/*----------------------------------------------------------------------------*/ + +//DRD_DS_API DRT_Status DR_Log( DRT_Log_Type_Id, DRT_Log_Level, char *, char *, long, bool, char *, ...); + + + +/*----------------------------------------------------------------------------*/ +/* DR_Layer_Dump */ +/*----------------------------------------------------------------------------*/ + +DRD_DS_API DRT_Status DR_Layer_Dump( DRT_Layer *, long); + + + +/*---------------------------------------------------------------------------------*/ +/* DR_Kit_Id_Find */ +/*---------------------------------------------------------------------------------*/ + +DRD_DS_API DRT_Status DR_Kit_Id_Find( DRT_Kit **, DRT_Kit_Id); + + + +/*----------------------------------------------------------------------------*/ +/* DR_Kit_Logical_Id_Find */ +/*----------------------------------------------------------------------------*/ + +DRD_DS_API DRT_Status DR_Kit_Logical_Id_Find( DRT_Kit **, DRT_Kit_Id); + + + +/*---------------------------------------------------------------------------------*/ +/* DR_Kit_Name_Find */ +/*---------------------------------------------------------------------------------*/ + +DRD_DS_API DRT_Status DR_Kit_Name_Find( DRT_Kit **, char *); + + + +/*----------------------------------------------------------------------------*/ +/* DR_Kit_Dump */ +/*----------------------------------------------------------------------------*/ + +DRD_DS_API DRT_Status DR_Kit_Dump( DRT_Kit *, long); + + + +/*---------------------------------------------------------------------------------*/ +/* DR_Kit_Load */ +/*---------------------------------------------------------------------------------*/ + +DRD_DS_API DRT_Status DR_Kit_Load( char *); + + + +/*---------------------------------------------------------------------------------*/ +/* DR_Kit_Sample_Load */ +/*---------------------------------------------------------------------------------*/ + +DRD_DS_API DRT_Status DR_Kit_Sample_Load( DRT_Kit *); + + + +/*---------------------------------------------------------------------------------*/ +/* DR_Kit_Sample_UnLoad */ +/*---------------------------------------------------------------------------------*/ + +DRD_DS_API DRT_Status DR_Kit_Sample_UnLoad( DRT_Kit *); + + + +/*----------------------------------------------------------------------------*/ +/* DR_Kits_Sample_Load */ +/*----------------------------------------------------------------------------*/ + +DRD_DS_API DRT_Status DR_Kits_Sample_Load(); + + + +/*----------------------------------------------------------------------------*/ +/* DR_Kits_Sample_UnLoad */ +/*----------------------------------------------------------------------------*/ + +DRD_DS_API DRT_Status DR_Kits_Sample_UnLoad(); + + + +/*----------------------------------------------------------------------------*/ +/* DR_Kits_Load */ +/*----------------------------------------------------------------------------*/ + +DRD_DS_API DRT_Status DR_Kits_Load(); + + + +/*----------------------------------------------------------------------------*/ +/* DR_Kits_Name_Get */ +/*----------------------------------------------------------------------------*/ + +DRD_DS_API DRT_Status DR_Kits_Name_Get( DRT_Kit_Name **, long *); + + + +/*----------------------------------------------------------------------------*/ +/* DR_Kits_Stats_Dump */ +/*----------------------------------------------------------------------------*/ + +DRD_DS_API DRT_Status DR_Kits_Stats_Dump(); + + + +/*----------------------------------------------------------------------------*/ +/* DR_Kits_Dump */ +/*----------------------------------------------------------------------------*/ + +DRD_DS_API DRT_Status DR_Kits_Dump(); + + + +/*----------------------------------------------------------------------------*/ +/* DR_Kits_Graph_Dump */ +/*----------------------------------------------------------------------------*/ + +DRD_DS_API DRT_Status DR_Kits_Graph_Dump(); + + + +/*----------------------------------------------------------------------------*/ +/* DR_Task_Id_Run */ +/*----------------------------------------------------------------------------*/ + +DRD_DS_API DRT_Status DR_Task_Id_Run( DRT_Task_Id, DRT_Task_Command, void *); + + + +/*----------------------------------------------------------------------------*/ +/* DR_Task_Id_Kill */ +/*----------------------------------------------------------------------------*/ + +DRD_DS_API DRT_Status DR_Task_Id_Kill( DRT_Task_Id); + + + +/*----------------------------------------------------------------------------*/ +/* DR_Task_Run */ +/*----------------------------------------------------------------------------*/ + +DRD_DS_API DRT_Status DR_Task_Run( DRT_Task_Command, void *); + + + +/*----------------------------------------------------------------------------*/ +/* DR_Task_Wait */ +/*----------------------------------------------------------------------------*/ + +DRD_DS_API DRT_Status DR_Task_Wait(); + + + +/*----------------------------------------------------------------------------*/ +/* DR_Tasks_Dump */ +/*----------------------------------------------------------------------------*/ + +DRD_DS_API DRT_Status DR_Tasks_Dump(); + + + +/*---------------------------------------------------------------------------------*/ +/* DR_DataStruct_Init */ +/*---------------------------------------------------------------------------------*/ + +DRD_DS_API DRT_Status DR_DataStruct_Init( DRT_SampleRate, DRT_Task_Id); + + + +/*---------------------------------------------------------------------------------*/ +/* DR_DataStruct_DeInit */ +/*---------------------------------------------------------------------------------*/ + +DRD_DS_API DRT_Status DR_DataStruct_DeInit(); + + + + + +# ifdef _DATASTRUCT_C_ + + /*----------------------------------------------------------------------------*/ /* Private Definitions */ /*----------------------------------------------------------------------------*/ #define DRD_MODULE_NAME "ds" +#define LGD_MODULE_NAME "ds" + + +/*----------------------------------------------------------------------------*/ +/* Private Data */ +/*----------------------------------------------------------------------------*/ + /*----------------------------------------------------------------------------*/ /* DRT_Base */ /*----------------------------------------------------------------------------*/ -DRT_Base DRG_Base = -{ - NULL, - { DRD_LOG_TYPE_NAME_UNKNOWN, DRD_LOG_TYPE_NAME_TRACE, DRD_LOG_TYPE_NAME_INFO, DRD_LOG_TYPE_NAME_WARNING, DRD_LOG_TYPE_NAME_ERROR} -}; +DRT_Base DRG_Base; @@ -555,34 +719,12 @@ DRT_XML_Query DRG_XML_Query_Tab_Kit[] = + + /*----------------------------------------------------------------------------*/ /* Private Prototypes */ /*----------------------------------------------------------------------------*/ -/*----------------------------------------------------------------------------*/ -/* */ -/*----------------------------------------------------------------------------*/ - -DRT_Status DR_Log_Format( char *, DRT_Log_Type_Id, DRT_Log_Level, char *, char *, long, bool, char *); - - - -/*----------------------------------------------------------------------------*/ -/* */ -/*----------------------------------------------------------------------------*/ - -DRT_Status DR_Log_Write( DRT_Log_Type_Id, char *, va_list); - - - -/*----------------------------------------------------------------------------*/ -/* DR_Log */ -/*----------------------------------------------------------------------------*/ - -DRT_Status DR_Log( DRT_Log_Type_Id, DRT_Log_Level, char *, char *, long, bool, char *, ...); - - - /*---------------------------------------------------------------------------------*/ /* DS Managers */ /*---------------------------------------------------------------------------------*/ @@ -617,14 +759,6 @@ DRT_Status DR_Layer_Sample_UnLoad( DRT_Layer *); -/*---------------------------------------------------------------------------------*/ -/* DR_Layer_Dump */ -/*---------------------------------------------------------------------------------*/ - -DRT_Status DR_Layer_Dump( DRT_Layer *, long); - - - /*----------------------------------------------------------------------------*/ /* DR_Instrument_Add */ /*----------------------------------------------------------------------------*/ @@ -665,38 +799,6 @@ DRT_Status DR_Kit_Add( DRT_Kit **, NDT_Root *, DRT_Kit *); -/*---------------------------------------------------------------------------------*/ -/* DR_Kit_Id_Find */ -/*---------------------------------------------------------------------------------*/ - -DRT_Status DR_Kit_Id_Find( DRT_Kit **, DRT_Kit_Id); - - - -/*----------------------------------------------------------------------------*/ -/* DR_Kit_Logical_Id_Find */ -/*----------------------------------------------------------------------------*/ - -DRT_Status DR_Kit_Logical_Id_Find( DRT_Kit **, DRT_Kit_Id); - - - -/*---------------------------------------------------------------------------------*/ -/* DR_Kit_Name_Find */ -/*---------------------------------------------------------------------------------*/ - -DRT_Status DR_Kit_Name_Find( DRT_Kit **, char *); - - - -/*---------------------------------------------------------------------------------*/ -/* DR_Kit_Dump */ -/*---------------------------------------------------------------------------------*/ - -DRT_Status DR_Kit_Dump( DRT_Kit *, long); - - - /*---------------------------------------------------------------------------------*/ /* DR_XML_Node_Exist */ /*---------------------------------------------------------------------------------*/ @@ -721,86 +823,6 @@ DRT_Status DR_XML_Value_Get( char *, long, xmlDocPtr, xmlXPathContextPtr, char -/*---------------------------------------------------------------------------------*/ -/* DR_Kit_Load */ -/*---------------------------------------------------------------------------------*/ - -DRT_Status DR_Kit_Load( char *); - - - -/*---------------------------------------------------------------------------------*/ -/* DR_Kit_Sample_Load */ -/*---------------------------------------------------------------------------------*/ - -DRT_Status DR_Kit_Sample_Load( DRT_Kit *); - - - -/*---------------------------------------------------------------------------------*/ -/* DR_Kit_Sample_UnLoad */ -/*---------------------------------------------------------------------------------*/ - -DRT_Status DR_Kit_Sample_UnLoad( DRT_Kit *); - - - -/*----------------------------------------------------------------------------*/ -/* DR_Kits_Sample_Load */ -/*----------------------------------------------------------------------------*/ - -DRT_Status DR_Kits_Sample_Load(); - - - -/*----------------------------------------------------------------------------*/ -/* DR_Kits_Sample_UnLoad */ -/*----------------------------------------------------------------------------*/ - -DRT_Status DR_Kits_Sample_UnLoad(); - - - -/*----------------------------------------------------------------------------*/ -/* DR_Kits_Load */ -/*----------------------------------------------------------------------------*/ - -DRT_Status DR_Kits_Load(); - - - -/*----------------------------------------------------------------------------*/ -/* DR_Kits_Name_Get */ -/*----------------------------------------------------------------------------*/ - -DRT_Status DR_Kits_Name_Get( DRT_Kit_Name **, long *); - - - -/*----------------------------------------------------------------------------*/ -/* DR_Kits_Stats_Dump */ -/*----------------------------------------------------------------------------*/ - -DRT_Status DR_Kits_Stats_Dump(); - - - -/*----------------------------------------------------------------------------*/ -/* DR_Kits_Dump */ -/*----------------------------------------------------------------------------*/ - -DRT_Status DR_Kits_Dump(); - - - -/*----------------------------------------------------------------------------*/ -/* DR_Kits_Graph_Dump */ -/*----------------------------------------------------------------------------*/ - -DRT_Status DR_Kits_Graph_Dump(); - - - /*----------------------------------------------------------------------------*/ /* DR_Task_Tread */ /*----------------------------------------------------------------------------*/ @@ -809,280 +831,15 @@ static void *DR_Task_Thread(); -/*----------------------------------------------------------------------------*/ -/* DR_Task_Id_Run */ -/*----------------------------------------------------------------------------*/ -DRT_Status DR_Task_Id_Run( DRT_Task_Id, DRT_Task_Command, void *); +# else // ifdef _DATASTRUCT_C_ -/*----------------------------------------------------------------------------*/ -/* DR_Task_Id_Kill */ -/*----------------------------------------------------------------------------*/ -DRT_Status DR_Task_Id_Kill( DRT_Task_Id); - -/*----------------------------------------------------------------------------*/ -/* DR_Task_Run */ -/*----------------------------------------------------------------------------*/ - -DRT_Status DR_Task_Run( DRT_Task_Command, void *); - - - -/*----------------------------------------------------------------------------*/ -/* DR_Task_Wait */ -/*----------------------------------------------------------------------------*/ - -DRT_Status DR_Task_Wait(); - - - -/*----------------------------------------------------------------------------*/ -/* DR_Tasks_Dump */ -/*----------------------------------------------------------------------------*/ - -DRT_Status DR_Tasks_Dump(); - - - -/*---------------------------------------------------------------------------------*/ -/* DR_DataStruct_Init */ -/*---------------------------------------------------------------------------------*/ - -DRT_Status DR_DataStruct_Init( DRT_Log_Writer_Ptr, DRT_SampleRate, DRT_Task_Id); - - - -/*---------------------------------------------------------------------------------*/ -/* DR_DataStruct_DeInit */ -/*---------------------------------------------------------------------------------*/ - -DRT_Status DR_DataStruct_DeInit(); - - - - -# else // ifdef _DATASTRUCT_C_ - - - - - -/*----------------------------------------------------------------------------*/ -/* Public Definitions */ -/*----------------------------------------------------------------------------*/ - -/*----------------------------------------------------------------------------*/ -/* DRT_Base */ -/*----------------------------------------------------------------------------*/ - -extern DRT_Base DRG_Base; - - - - - -/*----------------------------------------------------------------------------*/ -/* Public Prototypes */ -/*----------------------------------------------------------------------------*/ - -/*----------------------------------------------------------------------------*/ -/* */ -/*----------------------------------------------------------------------------*/ - -extern DRT_Status DR_Log_Write( DRT_Log_Type_Id, char *, va_list); - - - -/*----------------------------------------------------------------------------*/ -/* DR_Log */ -/*----------------------------------------------------------------------------*/ - -extern DRT_Status DR_Log( DRT_Log_Type_Id, DRT_Log_Level, char *, char *, long, bool, char *, ...); - - - -/*----------------------------------------------------------------------------*/ -/* DR_Layer_Dump */ -/*----------------------------------------------------------------------------*/ - -extern DRT_Status DR_Layer_Dump( DRT_Layer *, long); - - - -/*---------------------------------------------------------------------------------*/ -/* DR_Kit_Id_Find */ -/*---------------------------------------------------------------------------------*/ - -extern DRT_Status DR_Kit_Id_Find( DRT_Kit **, DRT_Kit_Id); - - - -/*----------------------------------------------------------------------------*/ -/* DR_Kit_Logical_Id_Find */ -/*----------------------------------------------------------------------------*/ - -extern DRT_Status DR_Kit_Logical_Id_Find( DRT_Kit **, DRT_Kit_Id); - - - -/*---------------------------------------------------------------------------------*/ -/* DR_Kit_Name_Find */ -/*---------------------------------------------------------------------------------*/ - -extern DRT_Status DR_Kit_Name_Find( DRT_Kit **, char *); - - - -/*----------------------------------------------------------------------------*/ -/* DR_Kit_Dump */ -/*----------------------------------------------------------------------------*/ - -extern DRT_Status DR_Kit_Dump( DRT_Kit *, long); - - - -/*---------------------------------------------------------------------------------*/ -/* DR_Kit_Load */ -/*---------------------------------------------------------------------------------*/ - -extern DRT_Status DR_Kit_Load( char *); - - - -/*---------------------------------------------------------------------------------*/ -/* DR_Kit_Sample_Load */ -/*---------------------------------------------------------------------------------*/ - -extern DRT_Status DR_Kit_Sample_Load( DRT_Kit *); - - - -/*---------------------------------------------------------------------------------*/ -/* DR_Kit_Sample_UnLoad */ -/*---------------------------------------------------------------------------------*/ - -extern DRT_Status DR_Kit_Sample_UnLoad( DRT_Kit *); - - - -/*----------------------------------------------------------------------------*/ -/* DR_Kits_Sample_Load */ -/*----------------------------------------------------------------------------*/ - -extern DRT_Status DR_Kits_Sample_Load(); - - - -/*----------------------------------------------------------------------------*/ -/* DR_Kits_Sample_UnLoad */ -/*----------------------------------------------------------------------------*/ - -extern DRT_Status DR_Kits_Sample_UnLoad(); - - - -/*----------------------------------------------------------------------------*/ -/* DR_Kits_Load */ -/*----------------------------------------------------------------------------*/ - -extern DRT_Status DR_Kits_Load(); - - - -/*----------------------------------------------------------------------------*/ -/* DR_Kits_Name_Get */ -/*----------------------------------------------------------------------------*/ - -extern DRT_Status DR_Kits_Name_Get( DRT_Kit_Name **, long *); - - - -/*----------------------------------------------------------------------------*/ -/* DR_Kits_Stats_Dump */ -/*----------------------------------------------------------------------------*/ - -extern DRT_Status DR_Kits_Stats_Dump(); - - - -/*----------------------------------------------------------------------------*/ -/* DR_Kits_Dump */ -/*----------------------------------------------------------------------------*/ - -extern DRT_Status DR_Kits_Dump(); - - - -/*----------------------------------------------------------------------------*/ -/* DR_Kits_Graph_Dump */ -/*----------------------------------------------------------------------------*/ - -extern DRT_Status DR_Kits_Graph_Dump(); - - - -/*----------------------------------------------------------------------------*/ -/* DR_Task_Id_Run */ -/*----------------------------------------------------------------------------*/ - -extern DRT_Status DR_Task_Id_Run( DRT_Task_Id, DRT_Task_Command, void *); - - - -/*----------------------------------------------------------------------------*/ -/* DR_Task_Id_Kill */ -/*----------------------------------------------------------------------------*/ - -extern DRT_Status DR_Task_Id_Kill( DRT_Task_Id); - - - -/*----------------------------------------------------------------------------*/ -/* DR_Task_Run */ -/*----------------------------------------------------------------------------*/ - -extern DRT_Status DR_Task_Run( void *); - - - -/*----------------------------------------------------------------------------*/ -/* DR_Task_Wait */ -/*----------------------------------------------------------------------------*/ - -extern DRT_Status DR_Task_Wait(); - - - -/*----------------------------------------------------------------------------*/ -/* DR_Tasks_Dump */ -/*----------------------------------------------------------------------------*/ - -extern DRT_Status DR_Tasks_Dump(); - - - -/*---------------------------------------------------------------------------------*/ -/* DR_DataStruct_Init */ -/*---------------------------------------------------------------------------------*/ - -extern DRT_Status DR_DataStruct_Init( DRT_Log_Writer_Ptr, DRT_SampleRate, DRT_Task_Id); - - - -/*---------------------------------------------------------------------------------*/ -/* DR_DataStruct_DeInit */ -/*---------------------------------------------------------------------------------*/ - -extern DRT_Status DR_DataStruct_DeInit(); - - - -# endif // ifdef _DATASTRUCT_C_ +# endif // ifdef _DATASTRUCT_C_ diff --git a/drummer.c b/drummer.c index 529b95a..a885429 100644 --- a/drummer.c +++ b/drummer.c @@ -19,6 +19,8 @@ /* along with Drummer. If not, see . */ /*----------------------------------------------------------------------------*/ + + /*----------------------------------------------------------------------------*/ /* Includes */ /*----------------------------------------------------------------------------*/ @@ -42,9 +44,9 @@ DRT_Status DR_Init() DRT_Status status; - if( ( status = DR_DataStruct_Init( DRD_LOG_WRITER_DEFAULT, DRD_SAMPLE_RATE_DEFAULT, DRD_THREAD_NUMBER_DEFAULT)) != DRS_OK) + if( ( status = DR_DataStruct_Init( DRD_SAMPLE_RATE_DEFAULT, DRD_THREAD_NUMBER_DEFAULT)) != DRS_OK) { - fprintf( stderr, "Can't init data structures (%d) !", status); + LG_LOG_ERROR_1( "Can't init data structures (%d)!", status); return( status); } @@ -66,7 +68,7 @@ DRT_Status DR_DeInit() if( ( status = DR_DataStruct_DeInit()) != DRS_OK) { - printf( "Can't deinit data structures (%d)!\n", status); + LG_LOG_ERROR_1( "Can't deinit data structures (%d)!", status); return( status); } @@ -84,11 +86,20 @@ DRT_Status DR_DeInit() int main( int argc, char **argv) { + LGT_Status lg_status; DRT_Status status; DRT_Kit *kit_ptr; DRT_Id i; + if( ( lg_status = LG_Library_Open( LGD_LOG_WRITER_DEFAULT, true)) != LGS_OK) + { + fprintf( stderr, "Can't open LibLog library: (%d)\n", lg_status); + exit( -1); + } + + LG_LOG_INFO_0( "Drummer starting..."); + if( ( status = DR_Init()) != DRS_OK) { exit( -1); @@ -150,7 +161,7 @@ int main( int argc, char **argv) } */ - DR_LOG_INFO_0( "hello world!"); + LG_LOG_INFO_0( "hello world!"); @@ -192,7 +203,7 @@ int main( int argc, char **argv) { for( kit_id = 0; kit_id < kit_number; kit_id++) { - DR_LOG_INFO_4( "Kit #: (%d) Id: (%d) Logical_Id: (%d) Name: [%s]", + LG_LOG_INFO_4( "Kit #: (%d) Id: (%d) Logical_Id: (%d) Name: [%s]", kit_id, kit_name_tab[ kit_id].Id, kit_name_tab[ kit_id].Logical_Id, kit_name_tab[ kit_id].Name); } } @@ -213,5 +224,13 @@ int main( int argc, char **argv) exit( -1); } + LG_LOG_INFO_0( "Drummer Ending!"); + + if( ( lg_status = LG_Library_Close( true)) != LGS_OK) + { + fprintf( stderr, "Can't close LibLog library: (%d)\n", lg_status); + exit( -1); + } + exit( 0); } diff --git a/drummer.h b/drummer.h index 6a59fd1..57535b0 100644 --- a/drummer.h +++ b/drummer.h @@ -19,6 +19,8 @@ /* along with Drummer. If not, see . */ /*----------------------------------------------------------------------------*/ + + /*----------------------------------------------------------------------------*/ /* Includes */ /*----------------------------------------------------------------------------*/ @@ -44,6 +46,7 @@ #include +#include #include #include @@ -122,13 +125,54 @@ typedef short DRT_Status; -# ifdef _DRUMMER_C_ +/*----------------------------------------------------------------------------*/ +/* DRD_API definition */ +/*----------------------------------------------------------------------------*/ + +/*----------------------------------------------------------------------------*/ +/* DRD DATA & API definition */ +/*----------------------------------------------------------------------------*/ + +# ifdef _DRUMMER_C_ +# define DRD_DRU_DATA +# define DRD_DRU_API +# else +# define DRD_DRU_DATA extern +# define DRD_DRU_API extern +# endif + + + + + +/*----------------------------------------------------------------------------*/ +/* Public Data */ +/*----------------------------------------------------------------------------*/ + + + + + + +/*----------------------------------------------------------------------------*/ +/* Public Prototypes */ +/*----------------------------------------------------------------------------*/ + + + + + + +# ifdef _DRUMMER_C_ + + /*----------------------------------------------------------------------------*/ /* Private Definitions */ /*----------------------------------------------------------------------------*/ #define DRD_MODULE_NAME "dru" +#define LGD_MODULE_NAME "dru" @@ -163,13 +207,9 @@ int main( int, char **); -# else // ifdef _DRUMMER_C_ +# else // ifdef _DRUMMER_C_ -/*----------------------------------------------------------------------------*/ -/* Public Prototypes */ -/*----------------------------------------------------------------------------*/ - -# endif // ifdef _DRUMMER_C_ +# endif // ifdef _DRUMMER_C_ diff --git a/go.sh b/go.sh index 0dfd969..c55c4c3 100755 --- a/go.sh +++ b/go.sh @@ -1,12 +1,12 @@ #!/bin/bash - common_src_list="libnode.c utils.c datastruct.c" + common_src_list="utils.c datastruct.c" main_src_list="drummer.c" common_lv2_src_list="lv2_utils.c" lv2_src_list="lv2_plugin.c lv2_ui.c" # gtk_includes="-I/usr/include/gtk-3.0 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/cairo -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0" gtk_includes="-I/usr/include/gtk-2.0 -I/usr/lib64/gtk-2.0/include/ -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0" - includes="-I/usr/include/libxml2 ${gtk_includes}" + includes="-I/usr/include/libxml2 ${gtk_includes} -I../liblog/include -I../libnode/include" cflags="-DGTK_DISABLE_DEPRECATED" for module in ${common_src_list} ${main_src_list} ${common_lv2_src_list} ${lv2_src_list} @@ -17,7 +17,7 @@ do eval ${cmd} done -common_libs="-ldl -lpthread -lxml2 -lz -llzma -lm -lsndfile -lsamplerate" +common_libs="-ldl -lpthread -lxml2 -lz -llzma -lm -lsndfile -lsamplerate ../libnode/lib/libnode.a ../liblog/lib/liblog.a" main_libs="" lv2_libs="" diff --git a/libnode.c b/libnode.c deleted file mode 100644 index 94e43f5..0000000 --- a/libnode.c +++ /dev/null @@ -1,5965 +0,0 @@ -/*---------------------------------------------------------------------------------*/ -/* $RCSfile: libnode.c,v $ */ -/*---------------------------------------------------------------------------------*/ -/* $Revision: 2.17 $ */ -/* $Name: libnode-2_2_0-1 $ */ -/* $Date: 2010/06/06 21:26:31 $ */ -/* $Author: agibert $ */ -/*---------------------------------------------------------------------------------*/ - -/*---------------------------------------------------------------------------------*/ -/* This file is part of LibNode */ -/* */ -/* LibNode is free software; you can redistribute it and/or modify */ -/* it under the terms of the GNU Lesser General Public Licence as published by */ -/* the Free Software Foundation; either version 2.1 of the License, or */ -/* (at your option) any later version. */ -/* */ -/* LibNode 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 Lesser General Public License for more details. */ -/* */ -/* You should have received a copy of the GNU Lesser General Public License */ -/* along with LibNode; if not, write to the Free Software */ -/* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/*---------------------------------------------------------------------------------*/ - - - - - -#define _LIBNODE_C_ - -#include - -#ifdef _LIBVER_SUPPORT -VER_INFO_EXPORT( libnode, "$Revision: 2.17 $", "$Name: libnode-2_2_0-1 $", __FILE__, "$Author: agibert $") -#endif - - - - - - - -/*------------------------------------------------------------------------------*/ -/*------------------------------------------------------------------------------*/ -/* Node Manager Template */ -/*------------------------------------------------------------------------------*/ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_Default_Manager( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id, NDT_Node *Node_Ptr, NDT_Command Command, va_list *Args_Ptr) -{ - NDT_Command_Name Command_Name; - - - switch( Command) - { - case NDD_CMD_MANAGER_VERSION: - { - ND_VA_ARG_GET( Version_Name_Ptr, *Args_Ptr, NDT_Version_Name *); - - - Command_Name = "NDD_CMD_MANAGER_VERSION"; - - *Version_Name_Ptr = "$Revision: 2.17 $ $Name: libnode-2_2_0-1 $ $Date: 2010/06/06 21:26:31 $ $Author: agibert $"; - - return( NDS_OK); - } - - case NDD_CMD_INDEX_GET: - { - /* - ND_VA_ARG_GET( Reply_Index_Id_Ptr, *Args_Ptr, NDT_Index_Id *); - ND_VA_ARG_GET( Reply_Command_Ptr, *Args_Ptr, NDT_Command *); - ND_VA_ARG_GET( Cmd, *Args_Ptr, NDT_Command); - ND_VA_ARG_GET( Value_Ptr, *Args_Ptr, void *); - */ - ND_VA_ARG_GET( Reply_Index_Id_Ptr, *Args_Ptr, NDT_Index_Id *); - ND_VA_ARG_GET( Reply_Command_Ptr, *Args_Ptr, NDT_Command *); - ND_VA_ARG_GET( Cmd, *Args_Ptr, NDT_Command); - ND_VA_ARG_GET( Value_Ptr, *Args_Ptr, void *); - - - Command_Name = "NDD_CMD_INDEX_GET"; - - switch(Cmd) - { - /* - case NDT_CMD_SOME_USER_CMD: - { - *Reply_Index_Id_Ptr = 0; - *Reply_Command_Ptr = NDD_CMD_SOME_OTHER_CMD; - break; - } - - ... - */ - - default: - { - *Reply_Index_Id_Ptr = Index_Id; - *Reply_Command_Ptr = Cmd; - break; - } - } - - return( NDS_OK); - } - - case NDD_CMD_VALUE_ALLOC: - { - /* - ND_VA_ARG_GET( Value_Ptr_Ptr, *Args_Ptr, void **); - - ND_VA_LIST_OPEN( user_args, *Args_Ptr); - - ND_VA_ARG_GET( user_data, user_args, user_type); - ND_VA_ARG_GET( ..., user_args, ...); - - ND_VA_LIST_CLOSE( user_args); - */ - - - Command_Name = "NDD_CMD_VALUE_ALLOC"; - - /* - if( ( *Value_Ptr_Ptr = (void *)malloc( sizeof(void))) == NULL) - { - return(NDS_ERRMEM); - } - else - { - ... - - return( NDS_OK); - } - */ - } - - case NDD_CMD_VALUE_FREE: - { - /* - ND_VA_ARG_GET( Value_Ptr, *Args_Ptr, void *); - - ND_VA_LIST_OPEN( user_args, *Args_Ptr); - - ND_VA_ARG_GET( user_data, user_args, user_type); - ND_VA_ARG_GET( ..., user_args, ...); - - ND_VA_LIST_CLOSE( user_args); - */ - - - Command_Name = "NDD_CMD_VALUE_FREE"; - - /* - free( Value_Ptr); - - return( NDS_OK); - */ - } - - case NDD_CMD_VALUE_COMP: - { - /* - ND_VA_ARG_GET( Value1_Ptr, *Args_Ptr, void *); - ND_VA_ARG_GET( Value2_Ptr, *Args_Ptr, void *); - - ND_VA_LIST_OPEN( user_args, *Args_Ptr); - - ND_VA_ARG_GET( user_data, user_args, user_type); - ND_VA_ARG_GET( ..., user_args, ...); - - ND_VA_LIST_CLOSE( user_args); - */ - - - Command_Name = "NDD_CMD_VALUE_COMP"; - - /* - switch( Index_Id) - { - case 0: - { - int rc; - - - rc = strcmp( Value1_Ptr->..., Value2_Ptr->...); - - if( rc < 0) - { - return(NDS_LOWER); - } - else - { - if( rc > 0) - { - return(NDS_GREATER); - } - else - { - return(NDS_EQUAL); - } - } - } - - case 1: - { - int val1 = atoi(Value1_Ptr->...); - int val2 = atoi(Value2_Ptr->...); - - - if( val1 < val2) - { - return(NDS_LOWER); - } - else - { - if( val1 > val2) - { - return(NDS_GREATER); - } - else - { - return(NDS_EQUAL); - } - } - } - - case 2: - { - ... - } - - default: - { - printf( "Unknown COMP idx (%d) !\n", Index_Id); - return( NDS_KO); - } - } - */ - return( NDS_OK); - - } - - case NDD_CMD_VALUE_ADD: - { - /* - ND_VA_ARG_GET( Value_Ptr, *Args_Ptr, void *); - - ND_VA_LIST_OPEN( user_args, *Args_Ptr); - - ND_VA_ARG_GET( user_data, user_args, user_type); - ND_VA_ARG_GET( ..., user_args, ...); - - ND_VA_LIST_CLOSE( user_args); - */ - - - Command_Name = "NDD_CMD_VALUE_ADD"; - - /* - return( NDS_OK); - */ - } - - case NDD_CMD_VALUE_REMOVE: - { - /* - ND_VA_ARG_GET( Value_Ptr, *Args_Ptr, void *); - - ND_VA_LIST_OPEN( user_args, *Args_Ptr); - - ND_VA_ARG_GET( user_data, user_args, user_type); - ND_VA_ARG_GET( ..., user_args, ...); - - ND_VA_LIST_CLOSE( user_args); - */ - - - Command_Name = "NDD_CMD_VALUE_REMOVE"; - /* - return( NDS_OK); - */ - } - - case NDD_CMD_VALUE_PRINT: - { - /* - ND_VA_ARG_GET( Next_Node_Ptr, *Args_Ptr, NDT_Node *); - - ND_VA_LIST_OPEN( lib_args, *Args_Ptr); - - ND_VA_ARG_GET( Out, lib_args, FILE *); - ND_VA_ARG_GET( Recursive_Mode, lib_args, NDT_Recursive_Mode); - ND_VA_ARG_GET( Recursive_Depth, lib_args, NDT_Recursive_Depth); - ND_VA_ARG_GET( Recursive_Offset, lib_args, NDT_Recursive_Offset); - - ND_VA_LIST_OPEN( user_args, lib_args); - - ND_VA_ARG_GET( user_data, user_args, user_type); - ND_VA_ARG_GET( ..., user_args, ...); - - ND_VA_LIST_CLOSE( user_args); - ND_VA_LIST_CLOSE( lib_args); - - void *Value_Ptr = Node_Ptr->Value; - */ - - - Command_Name = "NDD_CMD_VALUE_PRINT"; - - /* - fprintf( Out, "...\n", Value_Ptr->..., ...); - - return( NDS_OK); - */ - } - - case NDD_CMD_INFO_PRINT: - { - /* - ND_VA_ARG_GET( Next_Node_Ptr, *Args_Ptr, NDT_Node *); - - ND_VA_LIST_OPEN( lib_args, *Args_Ptr); - - ND_VA_ARG_GET( Out, lib_args, FILE *); - ND_VA_ARG_GET( Recursive_Mode, lib_args, NDT_Recursive_Mode); - ND_VA_ARG_GET( Recursive_Depth, lib_args, NDT_Recursive_Depth); - ND_VA_ARG_GET( Recursive_Offset, lib_args, NDT_Recursive_Offset); - - ND_VA_LIST_OPEN( user_args, lib_args); - - ND_VA_ARG_GET( user_data, user_args, user_type); - ND_VA_ARG_GET( ..., user_args, ...); - - ND_VA_LIST_CLOSE( user_args); - ND_VA_LIST_CLOSE( lib_args); - */ - - - Command_Name = "NDD_CMD_INFO_PRINT"; - - /* - return( NDS_OK); - */ - } - - case NDD_CMD_USER_TRAVERSE: - { - /* - ND_VA_ARG_GET( Next_Node_Ptr, *Args_Ptr, NDT_Node *); - - ND_VA_LIST_OPEN( user_args, *Args_Ptr); - - ND_VA_ARG_GET( user_data, user_args, user_type); - ND_VA_ARG_GET( ..., user_args, ...); - - ND_VA_LIST_CLOSE( user_args); - - - void *Value_Ptr = Node_Ptr->Value; - */ - - - Command_Name = "NDD_CMD_USER_TRAVERSE"; - - /* - return( NDS_OK); - */ - } - - default: - { - printf( "ND_Default_Manager() called with an undefined command %d\n", Command); - return(NDS_ERRAPI); - } - } - - printf( "ND_Default_Manager() called with command %d (%s)\n", Command, Command_Name); - return(NDS_OK); -} - - - - - - - -/*------------------------------------------------------------------------------*/ -/* OpenStruct Manager */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_OpenStruct_Manager( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id, NDT_Node *Node_Ptr, NDT_Command Command, va_list *Args_Ptr) -{ - NDT_Command_Name Command_Name; - - - switch( Command) - { - case NDD_CMD_MANAGER_VERSION: - { - ND_VA_ARG_GET( Version_Name_Ptr, *Args_Ptr, NDT_Version_Name *); - - - Command_Name = "NDD_CMD_MANAGER_VERSION"; - - *Version_Name_Ptr = "$Revision: 2.17 $ $Name: libnode-2_2_0-1 $ $Date: 2010/06/06 21:26:31 $ $Author: agibert $"; - - return( NDS_OK); - } - - case NDD_CMD_INDEX_GET: - { - /* - ND_VA_ARG_GET( Reply_Index_Id_Ptr, *Args_Ptr, NDT_Index_Id *); - ND_VA_ARG_GET( Reply_Command_Ptr, *Args_Ptr, NDT_Command *); - ND_VA_ARG_GET( Cmd, *Args_Ptr, NDT_Command); - ND_VA_ARG_GET( Value_Ptr, *Args_Ptr, void *); - */ - ND_VA_ARG_GET( Reply_Index_Id_Ptr, *Args_Ptr, NDT_Index_Id *); - ND_VA_ARG_GET( Reply_Command_Ptr, *Args_Ptr, NDT_Command *); - ND_VA_ARG_GET( Cmd, *Args_Ptr, NDT_Command); - ND_VA_ARG_GET( Value_Ptr, *Args_Ptr, void *); - - - Command_Name = "NDD_CMD_INDEX_GET"; - - switch(Cmd) - { - default: - { - *Reply_Index_Id_Ptr = Index_Id; - *Reply_Command_Ptr = Cmd; - break; - } - } - - return( NDS_OK); - } - - case NDD_CMD_VALUE_ALLOC: - { - /* - ND_VA_ARG_GET( Value_Ptr_Ptr, *Args_Ptr, void **); - - ND_VA_LIST_OPEN( user_args, *Args_Ptr); - - ND_VA_ARG_GET( user_data, user_args, user_type); - ND_VA_ARG_GET( ..., user_args, ...); - - ND_VA_LIST_CLOSE( user_args); - */ - - - Command_Name = "NDD_CMD_VALUE_ALLOC"; - - return( NDS_OK); - } - - case NDD_CMD_VALUE_FREE: - { - /* - ND_VA_ARG_GET( Value_Ptr, *Args_Ptr, void *); - - ND_VA_LIST_OPEN( user_args, *Args_Ptr); - - ND_VA_ARG_GET( user_data, user_args, user_type); - ND_VA_ARG_GET( ..., user_args, ...); - - ND_VA_LIST_CLOSE( user_args); - */ - - - Command_Name = "NDD_CMD_VALUE_FREE"; - - return( NDS_OK); - } - - case NDD_CMD_VALUE_COMP: - { - /* - ND_VA_ARG_GET( Value1_Ptr, *Args_Ptr, void *); - ND_VA_ARG_GET( Value2_Ptr, *Args_Ptr, void *); - - ND_VA_LIST_OPEN( user_args, *Args_Ptr); - - ND_VA_ARG_GET( user_data, user_args, user_type); - ND_VA_ARG_GET( ..., user_args, ...); - - ND_VA_LIST_CLOSE( user_args); - */ - ND_VA_ARG_GET( Value1_Ptr, *Args_Ptr, void *); - ND_VA_ARG_GET( Value2_Ptr, *Args_Ptr, void *); - - - Command_Name = "NDD_CMD_VALUE_COMP"; - - switch( Index_Id) - { - case 0: - { - if( Value1_Ptr < Value2_Ptr) - { - return(NDS_LOWER); - } - else - { - if( Value1_Ptr > Value2_Ptr) - { - return(NDS_GREATER); - } - else - { - return(NDS_EQUAL); - } - } - } - - default: - { - printf( "Unknown COMP idx (%d) !\n", Index_Id); - return( NDS_KO); - } - } - - return( NDS_OK); - } - - case NDD_CMD_VALUE_ADD: - { - /* - ND_VA_ARG_GET( Value_Ptr, *Args_Ptr, void *); - - ND_VA_LIST_OPEN( user_args, *Args_Ptr); - - ND_VA_ARG_GET( user_data, user_args, user_type); - ND_VA_ARG_GET( ..., user_args, ...); - - ND_VA_LIST_CLOSE( user_args); - */ - - - Command_Name = "NDD_CMD_VALUE_ADD"; - - return( NDS_OK); - } - - case NDD_CMD_VALUE_REMOVE: - { - /* - ND_VA_ARG_GET( Value_Ptr, *Args_Ptr, void *); - - ND_VA_LIST_OPEN( user_args, *Args_Ptr); - - ND_VA_ARG_GET( user_data, user_args, user_type); - ND_VA_ARG_GET( ..., user_args, ...); - - ND_VA_LIST_CLOSE( user_args); - */ - - - Command_Name = "NDD_CMD_VALUE_REMOVE"; - - return( NDS_OK); - } - - case NDD_CMD_VALUE_PRINT: - { - /* - ND_VA_ARG_GET( Next_Node_Ptr, *Args_Ptr, NDT_Node *); - - ND_VA_LIST_OPEN( lib_args, *Args_Ptr); - - ND_VA_ARG_GET( Out, lib_args, FILE *); - ND_VA_ARG_GET( Recursive_Mode, lib_args, NDT_Recursive_Mode); - ND_VA_ARG_GET( Recursive_Depth, lib_args, NDT_Recursive_Depth); - ND_VA_ARG_GET( Recursive_Offset, lib_args, NDT_Recursive_Offset); - - ND_VA_LIST_OPEN( user_args, lib_args); - - ND_VA_ARG_GET( user_data, user_args, user_type); - ND_VA_ARG_GET( ..., user_args, ...); - - ND_VA_LIST_CLOSE( user_args); - ND_VA_LIST_CLOSE( lib_args); - - void *Value_Ptr = Node_Ptr->Value; - */ - - - Command_Name = "NDD_CMD_VALUE_PRINT"; - - return( NDS_OK); - } - - case NDD_CMD_INFO_PRINT: - { - /* - ND_VA_ARG_GET( Next_Node_Ptr, *Args_Ptr, NDT_Node *); - - ND_VA_LIST_OPEN( lib_args, *Args_Ptr); - - ND_VA_ARG_GET( Out, lib_args, FILE *); - ND_VA_ARG_GET( Recursive_Mode, lib_args, NDT_Recursive_Mode); - ND_VA_ARG_GET( Recursive_Depth, lib_args, NDT_Recursive_Depth); - ND_VA_ARG_GET( Recursive_Offset, lib_args, NDT_Recursive_Offset); - - ND_VA_LIST_OPEN( user_args, lib_args); - - ND_VA_ARG_GET( user_data, user_args, user_type); - ND_VA_ARG_GET( ..., user_args, ...); - - ND_VA_LIST_CLOSE( user_args); - ND_VA_LIST_CLOSE( lib_args); - */ - ND_VA_ARG_GET( Next_Node_Ptr, *Args_Ptr, NDT_Node *); - - ND_VA_LIST_OPEN( lib_args, *Args_Ptr); - - ND_VA_ARG_GET( Out, lib_args, FILE *); - ND_VA_ARG_GET( Recursive_Mode, lib_args, NDT_Recursive_Mode); - ND_VA_ARG_GET( Recursive_Depth, lib_args, NDT_Recursive_Depth); - ND_VA_ARG_GET( Recursive_Offset, lib_args, NDT_Recursive_Offset); - - ND_VA_LIST_CLOSE( lib_args); - - void *Value_Ptr = Node_Ptr->Value; - - - Command_Name = "NDD_CMD_INFO_PRINT"; - - return( ND_DataStruct_Info_Print_I( Out, (NDT_Root *)Value_Ptr, Recursive_Mode, --Recursive_Depth, ++Recursive_Offset)); - } - - default: - { - printf( "OpenStruct_Manager() called with an undefined command %d\n", Command); - return( NDS_ERRAPI); - } - } - - printf( "OpenStruct_Manager() called with command %d (%s)\n", Command, Command_Name); - return( NDS_OK); -} - - - - - - - -/*------------------------------------------------------------------------------*/ -/*------------------------------------------------------------------------------*/ -/* FONCTIONS PUBLIQUES */ -/*------------------------------------------------------------------------------*/ -/*------------------------------------------------------------------------------*/ - - - - - -/*------------------------------------------------------------------------------*/ -/* Library initialisation */ -/*------------------------------------------------------------------------------*/ -/* (I) Debug_Mode: Open library in debug mode */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_Library_Open_I( int Debug_Mode) -{ - NDG_Base.Debug_Mode = Debug_Mode; - NDG_Base.Open_Status = NDD_TRUE; - - if( Debug_Mode == NDD_TRUE) - { - ND_Library_StdErr_Set_I( stderr); - } - -#if !defined(_WIN32) - if( ( NDG_Base.DL_Ptr = dlopen( NULL, ( RTLD_NOW | RTLD_GLOBAL))) == NULL) - { - sprintf( NDG_Base.Err_String, "Error ND_Library_Open_I: can't dlopen [%s]", dlerror()); - ND_Error_Print(); - - return( NDS_KO); - } -#endif - - return( NDS_OK); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Library initialisation */ -/*------------------------------------------------------------------------------*/ -/* (I) Debug_Mode: Open library in debug mode */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_Library_Open_C( int Debug_Mode) -{ - NDT_Status status; - - - if( NDG_Base.Open_Status != NDD_FALSE) - { - sprintf( NDG_Base.Err_String, "Error ND_Library_Open_C: library is not closed"); - ND_Error_Print(); - - return( NDS_KO); - } - else - { - if( Debug_Mode == NDD_TRUE) - { - if( ( status = ND_DataStruct_Open_I( &(NDG_Base.OpenStruct_Ptr), 1, NDG_Base.OpenStruct_Index_Type, "ND_OpenStruct_Manager", ND_OpenStruct_Manager, NULL, NULL, NULL, NULL, 0, NULL)) != NDS_OK) - { - sprintf( NDG_Base.Err_String, "Error ND_Library_Open_C: can't open OpenStruct"); - ND_Error_Print(); - - return( NDS_KO); - } - } - } - - return( ND_Library_Open_I( Debug_Mode)); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Library deinitialisation */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_Library_Close_I( void) -{ - NDT_Symbol *Symbol, *Next_Symbol; - - - /* Désallocation de la table des symboles locale */ - - Symbol = NDG_Base.Symbol_First_Ptr; - - while( Symbol) - { - Next_Symbol = Symbol->Next; - free( Symbol->Name); - free( Symbol); - Symbol = Next_Symbol; - } - - NDG_Base.Symbol_First_Ptr = (NDT_Symbol *)NULL; - -#if !defined(_WIN32) - if( dlclose( NDG_Base.DL_Ptr) != 0) - { - sprintf( NDG_Base.Err_String, "Error ND_Library_Close_I: can't dlclose [%s]", dlerror()); - ND_Error_Print(); - - return( NDS_KO); - } -#endif - - NDG_Base.Open_Status = NDD_FALSE; - - return( NDS_OK); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Library deinitialisation */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_Library_Close_C( void) -{ - NDT_Status status; - - - if( NDG_Base.Open_Status != NDD_TRUE) - { - sprintf( NDG_Base.Err_String, "Error ND_Library_Close_C: library is not opened"); - ND_Error_Print(); - - return( NDS_KO); - } - - if( ( NDG_Base.Debug_Mode == NDD_TRUE) && ( NDG_Base.Err_Stream != NULL)) - { - if( NDG_Base.OpenStruct_Ptr->Index_Tab[NDD_INDEX_PRIMARY].Node_Number > 0) - { - sprintf( NDG_Base.Err_String, "Error ND_Library_Close_C: Unclosed DataStruct:"); - ND_Error_Print(); - - if( ( status = ND_DataStruct_Info_Print_I( NDG_Base.Err_Stream, NDG_Base.OpenStruct_Ptr, NDD_RECURSIVE_MODE_PARENT_CHILD, 0, 0)) != NDS_OK) - { - sprintf( NDG_Base.Err_String, "Error ND_Library_Close_C: can't print OpenStruct info"); - ND_Error_Print(); - - return( NDS_KO); - } - } - - if( ( status = ND_DataStruct_Close_I( NDG_Base.OpenStruct_Ptr)) != NDS_OK) - { - sprintf( NDG_Base.Err_String, "Error ND_Library_Close_C: can't close OpenStruct"); - ND_Error_Print(); - - return( NDS_KO); - } - } - - return( ND_Library_Close_I()); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Library Standard Error output setup */ -/*------------------------------------------------------------------------------*/ -/* (I) Stream: StdErr output stream */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_Library_StdErr_Set_I( FILE *Out) -{ - NDG_Base.Err_Stream = Out; - - return( NDS_OK); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Library Standard Error output setup */ -/*------------------------------------------------------------------------------*/ -/* (I) Stream: StdErr output stream */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_Library_StdErr_Set_C( FILE *Out) -{ - if( NDG_Base.Open_Status != NDD_TRUE) - { - sprintf( NDG_Base.Err_String, "Error ND_Library_StdErr_Set_C: library is not opened"); - ND_Error_Print(); - - return( NDS_KO); - } - - return( ND_Library_StdErr_Set_I( Out)); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Create a new index */ -/*------------------------------------------------------------------------------*/ -/* (I) Root_Ptr: Data structure pointer */ -/* (I) Index_Id: Id of the index */ -/* (I) Index_Type: Index type (List, tree, ...) */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_Index_Open_I( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id, NDT_Index_Type Type) -{ - NDT_Status status; - NDT_Node *node_ptr; - - - if( ( status = ND_Index_Clear( Root_Ptr, Index_Id)) != NDS_OK) - { - sprintf( NDG_Base.Err_String, "Error ND_Index_Open_I: Index cleaning error"); - ND_Error_Print(); - - return( NDS_KO); - } - - Root_Ptr->Index_Tab[Index_Id].Type = Type & NDD_INDEX_STATUS_RMSK | NDD_INDEX_STATUS_OPENED ; - - Root_Ptr->Index_Open_Count++; - - if( Index_Id != NDD_INDEX_PRIMARY) - { - if( ( status = ND_Index_Node_First_Get_I( &node_ptr, Root_Ptr, NDD_INDEX_PRIMARY)) != NDS_OK) - { - sprintf( NDG_Base.Err_String, "Error ND_Index_Open_I: can't get first primary index node"); - ND_Error_Print(); - - return( NDS_KO); - } - - while( node_ptr != NULL) - { - if( ( status = ND_Index_Value_Add_I( Root_Ptr, Index_Id, node_ptr->Value)) != NDS_OK) - { - sprintf( NDG_Base.Err_String, "Error ND_Index_Open_I: can't add value"); - ND_Error_Print(); - - return( NDS_KO); - } - - if( ( status = ND_Index_Node_Next_Get_I( &node_ptr, node_ptr)) != NDS_OK) - { - sprintf( NDG_Base.Err_String, "Error ND_Index_Open_I: can't get next node"); - ND_Error_Print(); - - return( NDS_KO); - } - } - } - - return( NDS_OK); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Create a new index */ -/*------------------------------------------------------------------------------*/ -/* (I) Root_Ptr: Data structure pointer */ -/* (I) Index_Id: Id of the index */ -/* (I) Index_Type: Index type (List, tree, ...) */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_Index_Open_C( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id, NDT_Index_Type Type) -{ - if( !Root_Ptr) - { - sprintf( NDG_Base.Err_String, "Error ND_Index_Open_C: structure root is null"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - if( NDG_Base.Open_Status != NDD_TRUE) - { - sprintf( NDG_Base.Err_String, "Error ND_Index_Open_C: library is not open"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - if( !ND_INDEX_STATUS_CLOSED_IS( Root_Ptr, Index_Id)) - { - sprintf( NDG_Base.Err_String, "Error ND_Index_Open_C: index is not closed"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - if( ( Root_Ptr->Index_Open_Count == 0) && ( Index_Id != NDD_INDEX_PRIMARY)) - { - sprintf( NDG_Base.Err_String, "Error ND_Index_Open_I: fist opened index should be the primary"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - return( ND_Index_Open_I( Root_Ptr, Index_Id, Type)); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Create a new data structure */ -/*------------------------------------------------------------------------------*/ -/* (O) Root_Ptr_Ptr: Pointer adress of the new sata structure */ -/* (I) Index_Nb: Number of index */ -/* (I) Index_Type_Ptr: Array of Index type (List, tree, ...) */ -/* (I) Manager_Name: Manager function name */ -/* (I) Manager_Ptr: Manager function pointer */ -/* (I) Allocator_Name: Value allocator function name */ -/* (I) Allocator_Ptr: Value allocator function pointer */ -/* (I) Deallocator_Name: Value deallocator function name */ -/* (I) Deallocator_Ptr: Value deallocator function pointer */ -/* (I) Own_Value: Flag indicating if the structure is the node owner */ -/* (I) Data_Ptr: User pointer */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_DataStruct_Open_I( NDT_Root **Root_Ptr_Ptr, NDT_Index_Nb Index_Nb, NDT_Index_Type *Type_Ptr, NDT_Manager_Name Manager_Name, NDT_Manager *Manager_Ptr, - NDT_Allocator_Name Allocator_Name, NDT_Allocator *Allocator_Ptr, NDT_Deallocator_Name Deallocator_Name, NDT_Deallocator *Deallocator_Ptr, short Own_Value, void *Data) -{ - NDT_Status status; - NDT_Manager_Name Real_Manager_Name; - NDT_Manager *Real_Manager_Ptr; - NDT_Allocator_Name Real_Allocator_Name; - NDT_Allocator *Real_Allocator_Ptr; - NDT_Deallocator_Name Real_Deallocator_Name; - NDT_Deallocator *Real_Deallocator_Ptr; - - - /* Valeurs par défaut des fonctions d'allocation et de désallocation */ - -#if defined(_WIN32) - if( ( Manager_Name != NULL) && ( Manager_Ptr == NULL)) - { - sprintf( NDG_Base.Err_String, "Error ND_DataStruct_Open_I: no symbol lookup support, Manager_Ptr shouldn't be NULL"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } -#endif - - if( ( Manager_Name != NULL) || ( Manager_Ptr != NULL)) - { - Real_Manager_Name = Manager_Name; - Real_Manager_Ptr = Manager_Ptr; - } - else - { - Real_Manager_Name = "ND_Default_Manager"; - Real_Manager_Ptr = ND_Default_Manager; - } - -#if defined(_WIN32) - if( ( Allocator_Name != NULL) && ( Allocator_Ptr == NULL)) - { - sprintf( NDG_Base.Err_String, "Error ND_DataStruct_Open_I: no symbol lookup support, Allocator_Ptr shouldn't be NULL"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } -#endif - - if( ( Allocator_Name != NULL) || ( Allocator_Ptr != NULL)) - { - Real_Allocator_Name = Allocator_Name; - Real_Allocator_Ptr = Allocator_Ptr; - } - else - { - Real_Allocator_Name = "ND_Default_Allocator"; - Real_Allocator_Ptr = ND_Default_Allocator; - } - -#if defined(_WIN32) - if( ( Deallocator_Name != NULL) && ( Deallocator_Ptr == NULL)) - { - sprintf( NDG_Base.Err_String, "Error ND_DataStruct_Open_I: no symbol lookup support, Deallocator_Ptr shouldn't be NULL"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } -#endif - - if( ( Deallocator_Name != NULL) || ( Deallocator_Ptr != NULL)) - { - Real_Deallocator_Name = Deallocator_Name; - Real_Deallocator_Ptr = Deallocator_Ptr; - } - else - { - Real_Deallocator_Name = "ND_Default_Deallocator"; - Real_Deallocator_Ptr = ND_Default_Deallocator; - } - - status = ND_Node_Root_Alloc( Root_Ptr_Ptr, Index_Nb, Type_Ptr, Real_Manager_Name, Real_Manager_Ptr, Real_Allocator_Name, Real_Allocator_Ptr, Real_Deallocator_Name, Real_Deallocator_Ptr, Own_Value, Data); - - if( ND_ERROR( status)) return( status); - - return( NDS_OK); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Create a new data structure */ -/*------------------------------------------------------------------------------*/ -/* (O) Root_Ptr_Ptr: Pointer adress of the new sata structure */ -/* (I) Index_Nb: Number of index */ -/* (I) Index_Type_Ptr: Array of Index type (List, tree, ...) */ -/* (I) Manager_Name: Manager function name */ -/* (I) Manager_Ptr: Manager function pointer */ -/* (I) Allocator_Name: Value allocator function name */ -/* (I) Allocator_Ptr: Value allocator function pointer */ -/* (I) Deallocator_Name: Value deallocator function name */ -/* (I) Deallocator_Ptr: Value deallocator function pointer */ -/* (I) Own_Value: Flag indicating if the structure is the node owner */ -/* (I) Data_Ptr: User pointer */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_DataStruct_Open_C( NDT_Root **Root_Ptr_Ptr, NDT_Index_Nb Index_Nb, NDT_Index_Type *Type_Ptr, NDT_Manager_Name Manager_Name, NDT_Manager *Manager_Ptr, - NDT_Allocator_Name Allocator_Name, NDT_Allocator *Allocator_Ptr, NDT_Deallocator_Name Deallocator_Name, NDT_Deallocator *Deallocator_Ptr, short Own_Value, void *Data_Ptr) -{ - NDT_Status status; - - - if( NDG_Base.Open_Status != NDD_TRUE) - { - sprintf( NDG_Base.Err_String, "Error ND_DataStruct_Open_C: library is not open"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - if( ( status = ND_DataStruct_Open_I( Root_Ptr_Ptr, Index_Nb, Type_Ptr, Manager_Name, Manager_Ptr, Allocator_Name, Allocator_Ptr, Deallocator_Name, Deallocator_Ptr, Own_Value, Data_Ptr)) != NDS_OK) - { - return( status); - } - - if( ( NDG_Base.Debug_Mode == NDD_TRUE) && ( Manager_Ptr != NULL) && ( NDG_Base.Open_Status == NDD_TRUE)) - { - if( ( status = ND_DataStruct_Value_Add_I( NDG_Base.OpenStruct_Ptr, (void **)*Root_Ptr_Ptr)) != NDS_OK) - { - sprintf( NDG_Base.Err_String, "Error ND_DataStruct_Open_C: can't add value in OpenStruct"); - ND_Error_Print(); - - return( NDS_KO); - } - } - - return( NDS_OK); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Remove an Index */ -/*------------------------------------------------------------------------------*/ -/* (I) Root_Ptr: Data structure pointer */ -/* (I) Index_Id: Id of the index */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_Index_Close_I( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id) -{ - NDT_Status status; - - - if( ( Root_Ptr->Index_Open_Count != 1) && ( Index_Id == NDD_INDEX_PRIMARY)) - { - sprintf( NDG_Base.Err_String, "Error ND_Index_Close_I: the primary should be the last closed"); - ND_Error_Print(); - return(NDS_ERRAPI); - } - - status = ND_Index_Flush_I( Root_Ptr, Index_Id); - if( ND_ERROR( status)) return( status); - - Root_Ptr->Index_Tab[ Index_Id].Type = Root_Ptr->Index_Tab[ Index_Id].Type & NDD_INDEX_STATUS_RMSK | NDD_INDEX_STATUS_CLOSED; - - Root_Ptr->Index_Open_Count--; - - return( NDS_OK); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Remove an Index */ -/*------------------------------------------------------------------------------*/ -/* (I) Root_Ptr: Data structure pointer */ -/* (I) Index_Id: Id of the index */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_Index_Close_C( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id) -{ - if( NDG_Base.Open_Status != NDD_TRUE) - { - sprintf( NDG_Base.Err_String, "Error ND_Index_Close_C: library is not open"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - if( !Root_Ptr) - { - sprintf( NDG_Base.Err_String, "Error ND_Index_Close_C: structure root is null"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - if( !ND_INDEX_STATUS_OPENED_IS( Root_Ptr, Index_Id)) - { - sprintf( NDG_Base.Err_String, "Error ND_Index_Close_C: index is not opened"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - return( ND_Index_Close_I( Root_Ptr, Index_Id)); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Destroy a data structure */ -/*------------------------------------------------------------------------------*/ -/* (I) Root_Ptr: Data structure pointer */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_DataStruct_Close_I( NDT_Root *Root_Ptr) -{ - NDT_Status status; - - - status = ND_DataStruct_Flush_I( Root_Ptr); - if( ND_ERROR( status)) return( status); - - return( ND_Node_Root_Free( Root_Ptr)); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Destroy a data structure */ -/*------------------------------------------------------------------------------*/ -/* (I) Root_Ptr: Data structure pointer */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_DataStruct_Close_C( NDT_Root *Root_Ptr) -{ - NDT_Status status; - - - if( NDG_Base.Open_Status != NDD_TRUE) - { - sprintf( NDG_Base.Err_String, "Error ND_DataStruct_Close_C: library is not open"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - if (!Root_Ptr) - { - sprintf( NDG_Base.Err_String, "Error ND_DataStruct_Close_C: structure root is null"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - if( ( status = ND_DataStruct_Close_I( Root_Ptr)) != NDS_OK) - { - return( status); - } - - if( NDG_Base.Debug_Mode == NDD_TRUE) - { - if( ( status = ND_DataStruct_Value_Remove_I( NDG_Base.OpenStruct_Ptr, (void *)Root_Ptr)) != NDS_OK) - { - sprintf( NDG_Base.Err_String, "Error ND_DataStruct_Close_I: can't remove value from OpenStruct"); - ND_Error_Print(); - - return( NDS_KO); - } - } - - return( NDS_OK); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Remove an Index (Private API ?) */ -/*------------------------------------------------------------------------------*/ -/* (I) Root_Ptr: Data structure pointer */ -/* (I) Index_Id: Id of the index */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_Index_Flush_I( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id) -{ - NDT_Status status; - NDT_Node *Node_Ptr, *Next_Node_Ptr; - - - ND_Index_Node_First_Get_I( &Node_Ptr, Root_Ptr, Index_Id); - - while( Node_Ptr) - { - Next_Node_Ptr = NULL; - ND_Index_Node_Next_Get_I( &Next_Node_Ptr, Node_Ptr); - - if( Index_Id == NDD_INDEX_PRIMARY) - { - status = ND_Manager_Exec_I( Root_Ptr, Index_Id, Node_Ptr, NDD_CMD_VALUE_FREE, Node_Ptr->Value); - if( ND_ERROR( status)) return( status); - } - else - { - status = ND_Manager_Exec_I( Root_Ptr, Index_Id, Node_Ptr, NDD_CMD_VALUE_REMOVE, Node_Ptr->Value); - if( ND_ERROR( status)) return( status); - } - - status = ND_Index_Node_Remove_I( Node_Ptr); - if( ND_ERROR( status)) return( status); - - status = ND_Node_Free( Root_Ptr, Node_Ptr); - if (ND_ERROR( status)) return( status); - - Node_Ptr = Next_Node_Ptr; - } - - return( NDS_OK); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Remove an Index (Private API ?) */ -/*------------------------------------------------------------------------------*/ -/* (I) Root_Ptr: Data structure pointer */ -/* (I) Index_Id: Id of the index */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_Index_Flush_C( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id) -{ - if( NDG_Base.Open_Status != NDD_TRUE) - { - sprintf( NDG_Base.Err_String, "Error ND_Index_Flush_C: library is not open"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - if( !Root_Ptr) - { - sprintf( NDG_Base.Err_String, "Error ND_Index_Flush_C: structure root is null"); - ND_Error_Print(); - - return(NDS_ERRAPI); - } - - return( ND_Index_Flush_I( Root_Ptr, Index_Id)); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Destroy all data of a data structure */ -/*------------------------------------------------------------------------------*/ -/* (I) Root_Ptr: Data structure pointer */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_DataStruct_Flush_I( NDT_Root *Root_Ptr) -{ - NDT_Status status; - NDT_Index_Id index_id; - - - for( index_id = ( Root_Ptr->Index_Nb - 1); index_id >= 0 ; index_id--) - { - status = ND_Index_Flush_I( Root_Ptr, index_id); - if( ND_ERROR( status)) return( status); - } - - return( NDS_OK); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Destroy all data of a data structure */ -/*------------------------------------------------------------------------------*/ -/* (I) Root_Ptr: Data structure pointer */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_DataStruct_Flush_C( NDT_Root *Root_Ptr) -{ - if( NDG_Base.Open_Status != NDD_TRUE) - { - sprintf( NDG_Base.Err_String, "Error ND_DataStruct_Flush_C: library is not open"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - if (!Root_Ptr) - { - sprintf( NDG_Base.Err_String, "Error ND_DataStruct_Flush_C: structure root is null"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - return ND_DataStruct_Flush_I( Root_Ptr); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Check & repare a data structure index: */ -/* - Check & fix node links */ -/* - Update data structure statistics */ -/*------------------------------------------------------------------------------*/ -/* (I) Root_Ptr: Data structure pointer */ -/* (I) Index_Id: Id of the index */ -/* (O) Error_Dectected_Nb_Ptr: Number of error detected pointer */ -/* (O) Error_Corrected_Nb_Ptr: Number of error corected pointer */ -/* (I) Out: Output stream */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_Index_Check_I( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id, int *Detected_Nb_Ptr, int *Corrected_Nb_Ptr, FILE *Out) -{ - *Detected_Nb_Ptr = 0; - *Corrected_Nb_Ptr = 0; - - - if( ND_INDEX_STATUS_OPENED_IS( Root_Ptr, Index_Id)) - { - if( ND_INDEX_TYPE_LIST_IS( Root_Ptr, Index_Id)) - { - ND_List_Check( Root_Ptr, Index_Id, Detected_Nb_Ptr, Corrected_Nb_Ptr, Out); - } - else if( ND_INDEX_TYPE_TREE_IS( Root_Ptr, Index_Id)) - { - ND_Tree_Check( Root_Ptr, Index_Id, Detected_Nb_Ptr, Corrected_Nb_Ptr, Out); - } - else - { - sprintf( NDG_Base.Err_String, "Error ND_DataStruct_Check_I: unknown structure type (%d) in structure (%p:%d)\n", Root_Ptr->Index_Tab[Index_Id].Type, Root_Ptr, Index_Id); - ND_Error_Print(); - - (*Detected_Nb_Ptr)++; - return( NDS_OK); - } - - /* Affichage du résultat de la procédure de vérification */ - - if( *Detected_Nb_Ptr == 0) - { - fprintf( Out, "No error detected in the node structure (%p:%d)\n", Root_Ptr, Index_Id); - } - else - { - fprintf( Out, "%d/%d error(s) corrected in the node structure (%p:%d)\n", *Corrected_Nb_Ptr, *Detected_Nb_Ptr, Root_Ptr, Index_Id); - } - } - - return( NDS_OK); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Check & repare a data structure index: */ -/* - Check & fix node links */ -/* - Update data structure statistics */ -/*------------------------------------------------------------------------------*/ -/* (I) Root_Ptr: Data structure pointer */ -/* (I) Index_Id: Id of the index */ -/* (O) Error_Dectected_Nb_Ptr: Number of error detected pointer */ -/* (O) Error_Corrected_Nb_Ptr: Number of error corected pointer */ -/* (I) Out: Output stream */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_Index_Check_C( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id, int *Nb_Detected_Ptr, int *Nb_Corrected_Ptr, FILE *Out) -{ - if( NDG_Base.Open_Status != NDD_TRUE) - { - sprintf( NDG_Base.Err_String, "Error ND_Index_Check_C: library is not open"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - if( !Root_Ptr) - { - sprintf( NDG_Base.Err_String, "Error ND_Index_Check_C: structure root is null"); - ND_Error_Print(); - - (*Nb_Detected_Ptr)++; - - return(NDS_ERRAPI); - } - - if( !Out) - { - sprintf( NDG_Base.Err_String, "Error ND_Index_Check_C: the stream descriptor is null"); - ND_Error_Print(); - - return(NDS_ERRAPI); - } - - return( ND_Index_Check_I( Root_Ptr, Index_Id, Nb_Detected_Ptr, Nb_Corrected_Ptr, Out)); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Check & repare a datat structure: */ -/* - Check & fix node links */ -/* - Update data structure statistics */ -/*------------------------------------------------------------------------------*/ -/* (I) Root_Ptr: Data structure pointer */ -/* (O) Error_Dectected_Nb_Ptr: Number of error detected pointer */ -/* (O) Error_Corrected_Nb_Ptr: Number of error corected pointer */ -/* (I) Out: Output stream */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_DataStruct_Check_I( NDT_Root *Root_Ptr, int *Error_Detected_Nb_Ptr, int *Error_Corrected_Nb_Ptr, FILE *Out) -{ - NDT_Status status; - NDT_Index_Id index_id; - int index_error_detected_nb, index_error_corrected_nb; - - - for( index_id = 0; index_id < Root_Ptr->Index_Nb; index_id++) - { - status = ND_Index_Check_I( Root_Ptr, index_id, &index_error_detected_nb, &index_error_corrected_nb, Out); - if( ND_ERROR(status)) return(status); - - *Error_Detected_Nb_Ptr = *Error_Detected_Nb_Ptr + index_error_detected_nb; - *Error_Corrected_Nb_Ptr = *Error_Corrected_Nb_Ptr + index_error_corrected_nb; - } - - return( NDS_OK); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Check & repare a datat structure: */ -/* - Check & fix node links */ -/* - Update data structure statistics */ -/*------------------------------------------------------------------------------*/ -/* (I) Root_Ptr: Data structure pointer */ -/* (O) Error_Dectected_Nb_Ptr: Number of error detected pointer */ -/* (O) Error_Corrected_Nb_Ptr: Number of error corected pointer */ -/* (I) Out: Output stream */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_DataStruct_Check_C( NDT_Root *Root_Ptr, int *Nb_Detected_Ptr, int *Nb_Corrected_Ptr, FILE *Out) -{ - if( NDG_Base.Open_Status != NDD_TRUE) - { - sprintf( NDG_Base.Err_String, "Error ND_DataStruct_Check_C: library is not open"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - if( !Root_Ptr) - { - sprintf( NDG_Base.Err_String, "Error ND_DataStruct_Check_C: structure root is null"); - ND_Error_Print(); - (*Nb_Detected_Ptr)++; - - return( NDS_ERRAPI); - } - - if( !Out) - { - sprintf( NDG_Base.Err_String, "Error ND_DataStruct_Check_C: the stream descriptor is null"); - ND_Error_Print(); - return( NDS_ERRAPI); - } - - return( ND_DataStruct_Check_I( Root_Ptr, Nb_Detected_Ptr, Nb_Corrected_Ptr, Out)); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Convert a data structure index to another type */ -/*------------------------------------------------------------------------------*/ -/* (I) Root_Ptr: Data structure pointer */ -/* (I) Index_Id: Id of the index */ -/* (I) Index_Type: Index type (List, tree, ...) */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_Index_Convert_I( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id, NDT_Index_Type Target_Type) -{ - NDT_Status rc; - - - if( ND_INDEX_STATUS_OPENED_IS( Root_Ptr, Index_Id)) - { - switch( Root_Ptr->Index_Tab[Index_Id].Type & NDD_INDEX_TYPE_MSK) - { - case NDD_INDEX_TYPE_LIST: - { - - switch( Target_Type & ( NDD_INDEX_TYPE_MSK | NDD_INDEX_SUBTYPE_MSK)) - { - case( NDD_INDEX_TYPE_LIST | NDD_INDEX_SUBTYPE_SORTED): - { - rc = ND_List_Sort( Root_Ptr, Index_Id); - if( ND_ERROR( rc)) return( rc); - - Root_Ptr->Index_Tab[Index_Id].Type = Target_Type; - - return( rc); - } - - case( NDD_INDEX_TYPE_LIST | NDD_INDEX_SUBTYPE_FIFO): - case( NDD_INDEX_TYPE_LIST | NDD_INDEX_SUBTYPE_LIFO): - { - Root_Ptr->Index_Tab[Index_Id].Type = Target_Type; - - return( NDS_OK); - } - - - case( NDD_INDEX_TYPE_TREE | NDD_INDEX_SUBTYPE_BALANCED): - case( NDD_INDEX_TYPE_TREE | NDD_INDEX_SUBTYPE_UNBALANCED): - { - rc = ND_List_Sort( Root_Ptr, Index_Id); - if( rc != NDS_OK) return( rc); - - rc = ND_Tree_Make( Root_Ptr, Index_Id); - if( ND_ERROR( rc)) return( rc); - - Root_Ptr->Index_Tab[Index_Id].Type = Target_Type; - - return( rc); - } - - default: - { - return( NDS_KO); - } - } - - break; - } - - case NDD_INDEX_TYPE_TREE: - { - switch( Target_Type & ( NDD_INDEX_TYPE_MSK | NDD_INDEX_SUBTYPE_MSK)) - { - case( NDD_INDEX_TYPE_LIST | NDD_INDEX_SUBTYPE_SORTED): - case( NDD_INDEX_TYPE_LIST | NDD_INDEX_SUBTYPE_FIFO): - case( NDD_INDEX_TYPE_LIST | NDD_INDEX_SUBTYPE_LIFO): - { - - rc = ND_List_Make( Root_Ptr, Index_Id); - if( ND_ERROR( rc)) return( rc); - - Root_Ptr->Index_Tab[Index_Id].Type = Target_Type; - - return( rc); - } - - default: - { - return( NDS_KO); - } - } - - break; - } - - default: - { - sprintf( NDG_Base.Err_String, "Error ND_Index_Convert_I: unknown structure type (%d)", Root_Ptr->Index_Tab[Index_Id].Type); - ND_Error_Print (); - return NDS_ERRAPI; - } - } - } - - return( NDS_OK); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Convert a data structure index to another type */ -/*------------------------------------------------------------------------------*/ -/* (I) Root_Ptr: Data structure pointer */ -/* (I) Index_Id: Id of the index */ -/* (I) Index_Type: Index type (List, tree, ...) */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_Index_Convert_C( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id, NDT_Index_Type Target_Type) -{ - if( NDG_Base.Open_Status != NDD_TRUE) - { - sprintf( NDG_Base.Err_String, "Error ND_Index_Convert_C: library is not open"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - if( !Root_Ptr) - { - sprintf( NDG_Base.Err_String, "Error ND_Index_Convert_C: structure root is null"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - return( ND_Index_Convert_I( Root_Ptr, Index_Id, Target_Type)); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Convert a data structure indexe types */ -/*------------------------------------------------------------------------------*/ -/* (I) Root_Ptr: Data structure pointer */ -/* (I) Index_Type_Ptr: Array of index type (List, tree, ...) */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_DataStruct_Convert_I( NDT_Root *Root_Ptr, NDT_Index_Type *Target_Type_Ptr) -{ - NDT_Status rc; - NDT_Index_Nb idx; - - - for( idx = 0; idx < Root_Ptr->Index_Nb; idx++) - { - rc = ND_Index_Convert_I( Root_Ptr, idx, Target_Type_Ptr[idx]); - if( ND_ERROR(rc)) return rc; - } - - return( NDS_OK); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Convert a data structure indexe types */ -/*------------------------------------------------------------------------------*/ -/* (I) Root_Ptr: Data structure pointer */ -/* (I) Index_Type_Ptr: Array of index type (List, tree, ...) */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_DataStruct_Convert_C( NDT_Root *Root_Ptr, NDT_Index_Type *Target_Type_Ptr) -{ - if( NDG_Base.Open_Status != NDD_TRUE) - { - sprintf( NDG_Base.Err_String, "Error ND_DataStruct_Convert_C: library is not open"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - if( !Root_Ptr) - { - sprintf( NDG_Base.Err_String, "Error ND_DataStruct_Convert_C: structure root is null"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - if( !Target_Type_Ptr) - { - sprintf( NDG_Base.Err_String, "Error ND_DataStruct_Convert_C: target type ptr is null"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - return( ND_DataStruct_Convert_I( Root_Ptr, Target_Type_Ptr)); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Reorganise a data structure index: */ -/* - Sort a non-sorted list */ -/* - Rebalance a non auto-balanced tree */ -/*------------------------------------------------------------------------------*/ -/* (I) Root_Ptr: Data structure pointer */ -/* (I) Index_Id: Id of the index */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_Index_Reorg_I( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id) -{ - NDT_Status status; - - - if( ND_INDEX_STATUS_OPENED_IS( Root_Ptr, Index_Id)) - { - if( ( status = ND_INDEX_TYPE_LIST_IS( Root_Ptr, Index_Id))) - { - if ( !ND_INDEX_SUBTYPE_SORTED_IS( Root_Ptr, Index_Id)) - { - if( ( status = ND_List_Sort( Root_Ptr, Index_Id)) != NDS_OK) - { - return( status); - } - } - } - else - { - if( ND_INDEX_TYPE_TREE_IS( Root_Ptr, Index_Id)) - { - if( ( status = ND_Tree_Equalize( Root_Ptr, Index_Id)) != NDS_OK) - { - return( status); - } - } - else - { - sprintf( NDG_Base.Err_String, "Error ND_DataStruct_Reorg_C: unknown structure type (%d) in structure (%p:%d)\n", Root_Ptr->Index_Tab[Index_Id].Type, Root_Ptr, Index_Id); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - } - } - - return( NDS_OK); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Reorganise a data structure index: */ -/* - Sort a non-sorted list */ -/* - Rebalance a non auto-balanced tree */ -/*------------------------------------------------------------------------------*/ -/* (I) Root_Ptr: Data structure pointer */ -/* (I) Index_Id: Id of the index */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_Index_Reorg_C( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id) -{ - if( NDG_Base.Open_Status != NDD_TRUE) - { - sprintf( NDG_Base.Err_String, "Error ND_Index_Reorg_C: library is not open"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - if( !Root_Ptr) - { - sprintf( NDG_Base.Err_String, "Error ND_DataStruct_Reorg_C: structure root is null"); - ND_Error_Print (); - - return( NDS_ERRAPI); - } - - return( ND_Index_Reorg_I( Root_Ptr, Index_Id)); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Reorganise a data structure indexes: */ -/* - Sort a non-sorted list */ -/* - Rebalance a non auto-balanced tree */ -/*------------------------------------------------------------------------------*/ -/* (I) Root_Ptr: Data structure pointer */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_DataStruct_Reorg_I( NDT_Root *Root_Ptr) -{ - NDT_Status status; - NDT_Index_Id index_id; - - - for( index_id = 0; index_id < Root_Ptr->Index_Nb; index_id++) - { - status = ND_Index_Reorg_I( Root_Ptr, index_id); - if( ND_ERROR( status)) return status; - } - - return( NDS_OK); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Reorganise a data structure indexes: */ -/* - Sort a non-sorted list */ -/* - Rebalance a non auto-balanced tree */ -/*------------------------------------------------------------------------------*/ -/* (I) Root_Ptr: Data structure pointer */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_DataStruct_Reorg_C( NDT_Root *Root_Ptr) -{ - if( NDG_Base.Open_Status != NDD_TRUE) - { - sprintf( NDG_Base.Err_String, "Error ND_DataStruct_Reorg_C: library is not open"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - if( !Root_Ptr) - { - sprintf( NDG_Base.Err_String, "Error ND_DataStruct_Reorg_C: structure root is null"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - return( ND_DataStruct_Reorg_I( Root_Ptr)); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Traverse a data structure index & execute a command on each node */ -/*------------------------------------------------------------------------------*/ -/* (I) Root_Ptr: Data structure pointer */ -/* (I) Index_Id: Id of the index */ -/* (I) Command: Manager command */ -/* (I) ...: User args */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_Index_Traverse_VI( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id, NDT_Command Command, va_list *Args_Ptr) -{ - NDT_Status rc; - NDT_Node *Node_Ptr, *Next_Node_Ptr; - - - ND_Index_Node_First_Get_I( &Node_Ptr, Root_Ptr, Index_Id); - - while( Node_Ptr) - { - Next_Node_Ptr = NULL; - ND_Index_Node_Next_Get_I( &Next_Node_Ptr, Node_Ptr); - - switch (Command) - { - case NDD_CMD_VALUE_REMOVE: - case NDD_CMD_VALUE_FREE: - { - - rc = ND_Manager_Exec_I( Root_Ptr, Index_Id, Node_Ptr, Command, Node_Ptr->Value, Args_Ptr); - if (ND_ERROR( rc)) return rc; - - rc = ND_Index_Node_Remove_I( Node_Ptr); - if( ND_ERROR( rc)) return rc; - - rc = ND_Node_Free( Root_Ptr, Node_Ptr); - if (ND_ERROR(rc)) return rc; - - break; - } - - default: - { - rc = ND_Manager_Exec_I( Root_Ptr, Index_Id, Node_Ptr, Command, Next_Node_Ptr, Args_Ptr); - if (ND_ERROR( rc)) return rc; - - break; - } - } - - Node_Ptr = Next_Node_Ptr; - } - - return( NDS_OK); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Traverse a data structure index & execute a command on each node */ -/*------------------------------------------------------------------------------*/ -/* (I) Root_Ptr: Data structure pointer */ -/* (I) Index_Id: Id of the index */ -/* (I) Command: Manager command */ -/* (I) ...: User args */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_Index_Traverse_VC( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id, NDT_Command Command, va_list *Args_Ptr) -{ - if( NDG_Base.Open_Status != NDD_TRUE) - { - sprintf( NDG_Base.Err_String, "Error ND_Index_Traverse_VC: library is not open"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - if( !Root_Ptr) - { - sprintf( NDG_Base.Err_String, "Error ND_DataStruct_Traverse_VC: structure root is null"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - return( ND_Index_Traverse_VI( Root_Ptr, Index_Id, Command, Args_Ptr)); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Traverse a data structure index & execute a command on each node */ -/*------------------------------------------------------------------------------*/ -/* (I) Root_Ptr: Data structure pointer */ -/* (I) Index_Id: Id of the index */ -/* (I) Command: Manager command */ -/* (I) ...: User args */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_Index_Traverse_I( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id, NDT_Command Command, ...) -{ - NDT_Status status; - va_list args; - NDT_Node *Node_Ptr, *Next_Node_Ptr; - - - va_start( args, Command); - - ND_Index_Node_First_Get_I( &Node_Ptr, Root_Ptr, Index_Id); - - status = NDS_OK; - - while( Node_Ptr) - { - Next_Node_Ptr = NULL; - ND_Index_Node_Next_Get_I( &Next_Node_Ptr, Node_Ptr); - - switch (Command) - { - case NDD_CMD_VALUE_REMOVE: - case NDD_CMD_VALUE_FREE: - { - - status = ND_Manager_Exec_I( Root_Ptr, Index_Id, Node_Ptr, Command, Node_Ptr->Value, &args); - if( ND_ERROR( status)) return( status); - - status = ND_Index_Node_Remove_I( Node_Ptr); - if( ND_ERROR( status)) return( status); - - status = ND_Node_Free( Root_Ptr, Node_Ptr); - if (ND_ERROR( status)) return( status); - - break; - } - - default: - { - status = ND_Manager_Exec_I( Root_Ptr, Index_Id, Node_Ptr, Command, Next_Node_Ptr, &args); - if( ND_ERROR( status)) return( status); - - break; - } - } - - Node_Ptr = Next_Node_Ptr; - } - - va_end( args); - - return( status); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Traverse a data structure index & execute a command on each node */ -/*------------------------------------------------------------------------------*/ -/* (I) Root_Ptr: Data structure pointer */ -/* (I) Index_Id: Id of the index */ -/* (I) Command: Manager command */ -/* (I) ...: User args */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_Index_Traverse_C( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id, NDT_Command Command, ...) -{ - NDT_Status status; - va_list args; - - - va_start( args, Command); - - if( NDG_Base.Open_Status != NDD_TRUE) - { - sprintf( NDG_Base.Err_String, "Error ND_DataStruct_Traverse_C: library is not open"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - if( !Root_Ptr) - { - sprintf( NDG_Base.Err_String, "Error ND_DataStruct_Traverse_C: structure root is null"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - status = ND_Index_Traverse_VI( Root_Ptr, Index_Id, Command, &args); - - va_end( args); - - return( status); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Traverse a data structure & execute a command on each node */ -/*------------------------------------------------------------------------------*/ -/* (I) Root_Ptr: Data structure pointer */ -/* (I) Command: Manager command */ -/* (I) ...: User args */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_DataStruct_Traverse_VI( NDT_Root *Root_Ptr, NDT_Command Command, va_list *Args_Ptr) -{ - NDT_Status status; - NDT_Index_Id new_index; - NDT_Command new_cmd; - - - status = ND_Manager_Exec_I( Root_Ptr, NDD_INDEX_PRIMARY, NULL, NDD_CMD_INDEX_GET, &new_index, &new_cmd, Command, NULL); - if( ND_ERROR(status)) return( status); - - return( ND_Index_Traverse_VI( Root_Ptr, new_index, new_cmd, Args_Ptr)); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Traverse a data structure & execute a command on each node */ -/*------------------------------------------------------------------------------*/ -/* (I) Root_Ptr: Data structure pointer */ -/* (I) Command: Manager command */ -/* (I) ...: User args */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_DataStruct_Traverse_VC( NDT_Root *Root_Ptr, NDT_Command Command, va_list *Args_Ptr) -{ - if( NDG_Base.Open_Status != NDD_TRUE) - { - sprintf( NDG_Base.Err_String, "Error ND_DataStruct_Traverse_VC: library is not open"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - if( !Root_Ptr) - { - sprintf( NDG_Base.Err_String, "Error ND_DataStruct_Traverse_VC: structure root is null"); - ND_Error_Print(); - return( NDS_ERRAPI); - } - - return( ND_DataStruct_Traverse_VI( Root_Ptr, Command, Args_Ptr)); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Traverse a data structure & execute a command on each node */ -/*------------------------------------------------------------------------------*/ -/* (I) Root_Ptr: Data structure pointer */ -/* (I) Command: Manager command */ -/* (I) ...: User args */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_DataStruct_Traverse_I( NDT_Root *Root_Ptr, NDT_Command Command, ...) -{ - NDT_Status status; - va_list args; - NDT_Index_Id new_index; - NDT_Command new_cmd; - - - va_start( args, Command); - - status = ND_Manager_Exec_I( Root_Ptr, NDD_INDEX_PRIMARY, NULL, NDD_CMD_INDEX_GET, &new_index, &new_cmd, Command, NULL); - if( ND_ERROR( status)) return( status); - - status = ND_Index_Traverse_VI( Root_Ptr, new_index, new_cmd, &args); - - va_end( args); - - return( status); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Traverse a data structure & execute a command on each node */ -/*------------------------------------------------------------------------------*/ -/* (I) Root_Ptr: Data structure pointer */ -/* (I) Command: Manager command */ -/* (I) ...: User args */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_DataStruct_Traverse_C( NDT_Root *Root_Ptr, NDT_Command Command, ...) -{ - NDT_Status status; - va_list args; - - - va_start( args, Command); - - if( NDG_Base.Open_Status != NDD_TRUE) - { - sprintf( NDG_Base.Err_String, "Error ND_DataStruct_Taverse_C: library is not open"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - if( !Root_Ptr) - { - sprintf( NDG_Base.Err_String, "Error ND_DataStruct_Traverse_C: structure root is null"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - status = ND_DataStruct_Traverse_VI( Root_Ptr, Command, &args); - - va_end( args); - - return( status); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Print data structure index information */ -/*------------------------------------------------------------------------------*/ -/* (I) Stream: Output stream */ -/* (I) Root_Ptr: Data structure pointer */ -/* (I) Index_Id: Id of the index */ -/* (I) Recursive_Mode: Child or Parent */ -/* (I) Recursive_Depth: Curent recursion depth */ -/* (I) Recursive_Offset: Curent print out offset */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_Index_Info_Print_I( FILE *Out, NDT_Root *Root_Ptr, NDT_Index_Id Index_Id, NDT_Recursive_Mode Recursive_Mode, NDT_Recursive_Depth Recursive_Depth, NDT_Recursive_Offset Recursive_Offset) -{ - NDT_Status status; - char offset[255]; - - - if( ND_RECURSIVE_PARENT_IS( Recursive_Mode)) - { - memset( offset, ' ', Recursive_Offset * ND_RECURSIVE_PRINT_OFFSET); - offset[Recursive_Offset * ND_RECURSIVE_PRINT_OFFSET] = '\0'; - - fprintf( Out, "%s Index Id: (%d)\tType: (%#06x) [%s:%s:%s]\tNode Nb: (%ld)\tHead: (%s%p)\tTail: (%s%p)\n%s Min Depth: (%ld)\tMax Depth: (%ld)\tMax Dif: (%ld)\tNb Equ: (%ld)\tSave: (%s%p)\n\n", - offset, Index_Id, Root_Ptr->Index_Tab[Index_Id].Type, ND_INDEX_STATUS_ASCII_GET( Root_Ptr, Index_Id), ND_INDEX_TYPE_ASCII_GET( Root_Ptr, Index_Id), ND_INDEX_SUBTYPE_ASCII_GET( Root_Ptr, Index_Id), - Root_Ptr->Index_Tab[Index_Id].Node_Number, - NDD_PRINTF_PTR_PREFIX, Root_Ptr->Index_Tab[Index_Id].Head, NDD_PRINTF_PTR_PREFIX, Root_Ptr->Index_Tab[Index_Id].Tail, - offset, Root_Ptr->Index_Tab[Index_Id].Min_Depth, Root_Ptr->Index_Tab[Index_Id].Max_Depth, Root_Ptr->Index_Tab[Index_Id].Max_Dif, Root_Ptr->Index_Tab[Index_Id].Nb_Equ, - NDD_PRINTF_PTR_PREFIX, Root_Ptr->Index_Tab[Index_Id].Save); - } - - if( ND_RECURSIVE_CHILD_IS(Recursive_Mode)) - { - status = ND_Index_Traverse_I( Root_Ptr, Index_Id, NDD_CMD_INFO_PRINT, Out, NDD_RECURSIVE_MODE_PARENT_CHILD, Recursive_Depth, Recursive_Offset); - } - else - { - status = NDS_OK; - } - - return( status); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Print data structure index information */ -/*------------------------------------------------------------------------------*/ -/* (I) Stream: Output stream */ -/* (I) Root_Ptr: Data structure pointer */ -/* (I) Index_Id: Id of the index */ -/* (I) Recursive_Mode: Child or Parent */ -/* (I) Recursive_Depth: Curent recursion depth */ -/* (I) Recursive_Offset: Curent print out offset */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_Index_Info_Print_C( FILE *Out, NDT_Root *Root_Ptr, NDT_Index_Id Index_Id, NDT_Recursive_Mode Recursive_Mode, NDT_Recursive_Depth Recursive_Depth, NDT_Recursive_Offset Recursive_Offset) -{ - if( NDG_Base.Open_Status != NDD_TRUE) - { - sprintf( NDG_Base.Err_String, "Error ND_Index_Info_Print_C: library is not open"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - if( !Root_Ptr) - { - sprintf( NDG_Base.Err_String, "Error ND_Index_Info_Print_C: structure root is null"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - if( !Out) - { - sprintf( NDG_Base.Err_String, "Error ND_Index_Info_Print_C: the stream descriptor is null"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - return( ND_Index_Info_Print_I( Out, Root_Ptr, Index_Id, Recursive_Mode, Recursive_Depth, Recursive_Offset)); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Print data structure information */ -/*------------------------------------------------------------------------------*/ -/* (I) Stream: Output stream */ -/* (I) Root_Ptr: Data structure pointer */ -/* (I) Recursive_Mode: Child or Parent */ -/* (I) Recursive_Depth: Curent recursion depth */ -/* (I) Recursive_Offset: Curent print out offset */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_DataStruct_Info_Print_I( FILE *Out, NDT_Root *Root_Ptr, NDT_Recursive_Mode Recursive_Mode, NDT_Recursive_Depth Recursive_Depth, NDT_Recursive_Offset Recursive_Offset) -{ - NDT_Status status; - NDT_Index_Nb idx; - NDT_Version_Name version_name; - char offset[255]; - - - if( ND_RECURSIVE_PARENT_IS( Recursive_Mode)) - { - memset( offset, ' ', Recursive_Offset * ND_RECURSIVE_PRINT_OFFSET); - offset[Recursive_Offset * ND_RECURSIVE_PRINT_OFFSET] = '\0'; - - status = ND_Manager_Exec_I( Root_Ptr, NDD_INDEX_UNKNOWN, NULL, NDD_CMD_MANAGER_VERSION, &version_name); - if( ND_ERROR( status)) return( status); - - fprintf( Out, "%sRoot: (%s%p)\tIndex Nb: (%d)\tIndex Open Count: (%d)\tManager: (%s%p) [%s]\n%sAllocator: (%s%p) [%s]\tDeallocator: (%s%p) [%s]\tUser: (%s%p)\n%sManager Version: [%s]\n\n", - offset, NDD_PRINTF_PTR_PREFIX, Root_Ptr, Root_Ptr->Index_Nb, Root_Ptr->Index_Open_Count, NDD_PRINTF_PTR_PREFIX, Root_Ptr->Manager_Ptr, Root_Ptr->Manager_Name, - offset, NDD_PRINTF_PTR_PREFIX, Root_Ptr->Allocator_Ptr, Root_Ptr->Allocator_Name, NDD_PRINTF_PTR_PREFIX, Root_Ptr->Deallocator_Ptr, Root_Ptr->Deallocator_Name, NDD_PRINTF_PTR_PREFIX, Root_Ptr->User_Ptr, - offset, version_name); - } - - if( ND_RECURSIVE_CHILD_IS( Recursive_Mode)) - { - for( idx = NDD_INDEX_PRIMARY; idx < Root_Ptr->Index_Nb; idx++) - { - status = ND_Index_Info_Print_I( Out, Root_Ptr, idx, NDD_RECURSIVE_MODE_PARENT, 0, Recursive_Offset); - if( ND_ERROR( status)) return( status); - } - - return( ND_Index_Info_Print_I( Out, Root_Ptr, NDD_INDEX_PRIMARY, NDD_RECURSIVE_MODE_CHILD, Recursive_Depth, Recursive_Offset)); - } - else - { - return( NDS_OK); - } -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Print data structure information */ -/*------------------------------------------------------------------------------*/ -/* (I) Stream: Output stream */ -/* (I) Root_Ptr: Data structure pointer */ -/* (I) Recursive_Mode: Child or Parent */ -/* (I) Recursive_Depth: Curent recursion depth */ -/* (I) Recursive_Offset: Curent print out offset */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_DataStruct_Info_Print_C( FILE *Out, NDT_Root *Root_Ptr, NDT_Recursive_Mode Recursive_Mode, NDT_Recursive_Depth Recursive_Depth, NDT_Recursive_Offset Recursive_Offset) -{ - if( NDG_Base.Open_Status != NDD_TRUE) - { - sprintf( NDG_Base.Err_String, "Error ND_DataStruct_Info_Print_C: library is not open"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - if( !Root_Ptr) - { - sprintf (NDG_Base.Err_String, "Error ND_DataStruct_Info_Print_C: structure root is null"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - if( !Out) - { - sprintf( NDG_Base.Err_String, "Error ND_DataStruct_Info_Print_C: the stream descriptor is null"); - ND_Error_Print(); - return( NDS_ERRAPI); - } - - return( ND_DataStruct_Info_Print_I( Out, Root_Ptr, Recursive_Mode, Recursive_Depth, Recursive_Offset)); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Add a new value to a data structure index */ -/*------------------------------------------------------------------------------*/ -/* (I) Root_Ptr: Data structure pointer */ -/* (I) Index_Id: Id of the index */ -/* (I) Value_Ptr: Value pointer */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_Index_Value_Add_I( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id, void *Value_Ptr) -{ - NDT_Status status; - - - if( ND_INDEX_TYPE_LIST_IS( Root_Ptr, Index_Id)) - { - status = ND_List_Value_Add( Root_Ptr, Index_Id, Value_Ptr); - if(ND_ERROR( status)) return( status); - } - else if( ND_INDEX_TYPE_TREE_IS( Root_Ptr, Index_Id)) - { - status = ND_Tree_Value_Add( Root_Ptr, Index_Id, Value_Ptr); - if(ND_ERROR( status)) return( status); - } - else - { - sprintf( NDG_Base.Err_String, "Error ND_Index_Value_Add_I: unknown structure type (%d)", Root_Ptr->Index_Tab[Index_Id].Type); - ND_Error_Print(); - return( NDS_ERRAPI); - } - - return( NDS_OK); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Add a new value to a data structure index */ -/*------------------------------------------------------------------------------*/ -/* (I) Root_Ptr: Data structure pointer */ -/* (I) Index_Id: Id of the index */ -/* (I) Value_Ptr: Value pointer */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_Index_Value_Add_C( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id, void *Value_Ptr) -{ - if( NDG_Base.Open_Status != NDD_TRUE) - { - sprintf( NDG_Base.Err_String, "Error ND_Index_Value_Add_C: library is not open"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - if( !Root_Ptr) - { - sprintf( NDG_Base.Err_String, "Error ND_Index_Value_Add_C: structure root is null"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - if( !Value_Ptr) - { - sprintf( NDG_Base.Err_String, "Error ND_Index_Value_Add_C: the value to add is null"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - return( ND_Index_Value_Add_I( Root_Ptr, Index_Id, Value_Ptr)); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Add a new value to a data structure */ -/*------------------------------------------------------------------------------*/ -/* (I) Root_Ptr: Data structure pointer */ -/* (I) Value_Ptr: Value pointer */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_DataStruct_Value_Add_I( NDT_Root *Root_Ptr, void *Value_Ptr) -{ - NDT_Status status; - NDT_Index_Id index_id; - - - for( index_id = 0; index_id < Root_Ptr->Index_Nb; index_id++) - { - if( ND_INDEX_STATUS_OPENED_IS( Root_Ptr, index_id)) - { - status = ND_Index_Value_Add_I( Root_Ptr, index_id, Value_Ptr); - if( ND_ERROR( status)) return( status); - } - } - - return( NDS_OK); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Add a new value to a data structure */ -/*------------------------------------------------------------------------------*/ -/* (I) Root_Ptr: Data structure pointer */ -/* (I) Value_Ptr: Value pointer */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_DataStruct_Value_Add_C( NDT_Root *Root_Ptr, void *Value_Ptr) -{ - if( NDG_Base.Open_Status != NDD_TRUE) - { - sprintf( NDG_Base.Err_String, "Error ND_DataStruct_Value_Add_C: library is not open"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - if( !Root_Ptr) - { - sprintf( NDG_Base.Err_String, "Error ND_DataStruct_Value_Add_C: structure root is null"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - if( !Value_Ptr) - { - sprintf( NDG_Base.Err_String, "Error ND_DataStruct_Value_Add_C: the value to add is null"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - return( ND_DataStruct_Value_Add_I( Root_Ptr, Value_Ptr)); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Remove the first matching value from a data structure index */ -/*------------------------------------------------------------------------------*/ -/* (I) Root_Ptr: Data structure pointer */ -/* (I) Index_Id: Id of the index */ -/* (I) Ref_Value_Ptr: Reference value pointer to search */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_Index_Value_Remove_I( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id, void *Value_Ptr) -{ - NDT_Status status; - NDT_Node *node_ptr; - - - /* Recherche du premier noeud correspondant à la valeur de référence */ - - status = ND_Index_Node_Find_I( &node_ptr, Root_Ptr, Index_Id, Value_Ptr); - if( ND_ERROR( status)) return( status); - - if( !node_ptr) return( NDS_OK); - - /* manager call */ - - status = ND_Manager_Exec_I( Root_Ptr, Index_Id, node_ptr, NDD_CMD_VALUE_REMOVE, Value_Ptr); - if (ND_ERROR( status)) return( status); - - /* Retrait du noeud de la structure */ - - status = ND_Index_Node_Remove_I( node_ptr); - if( ND_ERROR( status)) return( status); - - /* Désallocation du noeud */ - - status = ND_Node_Free( Root_Ptr, node_ptr); - - return( status); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Remove the first matching value from a data structure index */ -/*------------------------------------------------------------------------------*/ -/* (I) Root_Ptr: Data structure pointer */ -/* (I) Index_Id: Id of the index */ -/* (I) Ref_Value_Ptr: Reference value pointer to search */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_Index_Value_Remove_C( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id, void *Value_Ptr) -{ - if( NDG_Base.Open_Status != NDD_TRUE) - { - sprintf( NDG_Base.Err_String, "Error ND_Index_Value_Remove_C: library is not open"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - if( !Root_Ptr) - { - sprintf( NDG_Base.Err_String, "Error ND_Index_Value_Remove_C: structure root is null"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - if( !Value_Ptr) - { - sprintf (NDG_Base.Err_String, "Error ND_Index_Value_Remove_C: the value is null"); - ND_Error_Print (); - - return( NDS_ERRAPI); - } - - return( ND_Index_Value_Remove_I( Root_Ptr, Index_Id, Value_Ptr)); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Remove the first matching value from a data structure */ -/*------------------------------------------------------------------------------*/ -/* (I) Root_Ptr: Data structure pointer */ -/* (I) Ref_Value_Ptr: Reference value pointer to search */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_DataStruct_Value_Remove_I( NDT_Root *Root_Ptr, void *Value_Ptr) -{ - NDT_Status status; - NDT_Index_Id index_id; - - - for( index_id = 0; index_id < Root_Ptr->Index_Nb; index_id++) - { - if( ND_INDEX_STATUS_OPENED_IS( Root_Ptr, index_id)) - { - status = ND_Index_Value_Remove_I( Root_Ptr, index_id, Value_Ptr); - if( ND_ERROR( status)) return( status); - } - } - - return( NDS_OK); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Remove the first matching value from a data structure */ -/*------------------------------------------------------------------------------*/ -/* (I) Root_Ptr: Data structure pointer */ -/* (I) Ref_Value_Ptr: Reference value pointer to search */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_DataStruct_Value_Remove_C( NDT_Root *Root_Ptr, void *Value_Ptr) -{ - if( NDG_Base.Open_Status != NDD_TRUE) - { - sprintf( NDG_Base.Err_String, "Error ND_DataStruct_Value_Remove_C: library is not open"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - if( !Root_Ptr) - { - sprintf( NDG_Base.Err_String, "Error ND_DataStruct_Value_Remove_C: structure root is null"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - if( !Value_Ptr) - { - sprintf (NDG_Base.Err_String, "Error ND_DataStruct_Value_Remove_C: the value is null"); - ND_Error_Print (); - - return( NDS_ERRAPI); - } - - return( ND_DataStruct_Value_Remove_I( Root_Ptr, Value_Ptr)); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Print all the data structure index values */ -/*------------------------------------------------------------------------------*/ -/* (I) Stream: Output stream */ -/* (I) Root_Ptr: Data structure pointer */ -/* (I) Index_Id: Id of the index */ -/* (I) Recursive_Mode: Child or Parent */ -/* (I) Recursive_Depth: Curent recursion depth */ -/* (I) Recursive_Offset: Curent print out offset */ -/* (I) ...: User args */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_Index_Value_Print_VI( FILE *Out, NDT_Root *Root_Ptr, NDT_Index_Id Index_Id, NDT_Recursive_Mode Recursive_Mode, NDT_Recursive_Depth Recursive_Depth, NDT_Recursive_Offset Recursive_Offset, va_list *Args_Ptr) -{ - NDT_Status status; - - - status = ND_Index_Traverse_I( Root_Ptr, Index_Id, NDD_CMD_VALUE_PRINT, Out, Recursive_Mode, Recursive_Depth, Recursive_Offset, Args_Ptr); - - return( status); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Print all the data structure index values */ -/*------------------------------------------------------------------------------*/ -/* (I) Stream: Output stream */ -/* (I) Root_Ptr: Data structure pointer */ -/* (I) Index_Id: Id of the index */ -/* (I) Recursive_Mode: Child or Parent */ -/* (I) Recursive_Depth: Curent recursion depth */ -/* (I) Recursive_Offset: Curent print out offset */ -/* (I) ...: User args */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_Index_Value_Print_I( FILE *Out, NDT_Root *Root_Ptr, NDT_Index_Id Index_Id, NDT_Recursive_Mode Recursive_Mode, NDT_Recursive_Depth Recursive_Depth, NDT_Recursive_Offset Recursive_Offset, ...) -{ - NDT_Status status; - va_list user_args; - - - va_start( user_args, Recursive_Offset); - - status = ND_Index_Traverse_I( Root_Ptr, Index_Id, NDD_CMD_VALUE_PRINT, Out, Recursive_Mode, Recursive_Depth, Recursive_Offset, &user_args); - - va_end( user_args); - - return( status); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Print all the data structure index values */ -/*------------------------------------------------------------------------------*/ -/* (I) Stream: Output stream */ -/* (I) Root_Ptr: Data structure pointer */ -/* (I) Index_Id: Id of the index */ -/* (I) Recursive_Mode: Child or Parent */ -/* (I) Recursive_Depth: Curent recursion depth */ -/* (I) Recursive_Offset: Curent print out offset */ -/* (I) ...: User args */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_Index_Value_Print_C( FILE *Out, NDT_Root *Root_Ptr, NDT_Index_Id Index_Id, NDT_Recursive_Mode Recursive_Mode, NDT_Recursive_Depth Recursive_Depth, NDT_Recursive_Offset Recursive_Offset, ...) -{ - NDT_Status status; - va_list user_args; - - - va_start( user_args, Recursive_Offset); - - if( NDG_Base.Open_Status != NDD_TRUE) - { - sprintf( NDG_Base.Err_String, "Error ND_Index_Value_Print_C: library is not open"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - if( !Root_Ptr) - { - sprintf( NDG_Base.Err_String, "Error ND_Index_Value_Print_C: structure root is null"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - if( !Out) - { - sprintf( NDG_Base.Err_String, "Error ND_Index_Value_Print_C: the stream descriptor is null"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - status = ND_Index_Value_Print_VI( Out, Root_Ptr, Index_Id, Recursive_Mode, Recursive_Depth, Recursive_Offset, &user_args); - - va_end( user_args); - - return( status); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Print all the data structure values */ -/*------------------------------------------------------------------------------*/ -/* (I) Stream: Output stream */ -/* (I) Root_Ptr: Data structure pointer */ -/* (I) Recursive_Mode: Child or Parent */ -/* (I) Recursive_Depth: Curent recursion depth */ -/* (I) Recursive_Offset: Curent print out offset */ -/* (I) ...: User args */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_DataStruct_Value_Print_VI( FILE *Out, NDT_Root *Root_Ptr, NDT_Recursive_Mode Recursive_Mode, NDT_Recursive_Depth Recursive_Depth, NDT_Recursive_Offset Recursive_Offset, va_list *User_Args_Ptr) -{ - NDT_Status status; - - status = ND_DataStruct_Traverse_I( Root_Ptr, NDD_CMD_VALUE_PRINT, Out, Recursive_Mode, Recursive_Depth, Recursive_Offset, User_Args_Ptr); - - return( status); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Print all the data structure values */ -/*------------------------------------------------------------------------------*/ -/* (I) Stream: Output stream */ -/* (I) Root_Ptr: Data structure pointer */ -/* (I) Recursive_Mode: Child or Parent */ -/* (I) Recursive_Depth: Curent recursion depth */ -/* (I) Recursive_Offset: Curent print out offset */ -/* (I) ...: User args */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_DataStruct_Value_Print_I( FILE *Out, NDT_Root *Root_Ptr, NDT_Recursive_Mode Recursive_Mode, NDT_Recursive_Depth Recursive_Depth, NDT_Recursive_Offset Recursive_Offset, ...) -{ - NDT_Status status; - va_list user_args; - - - va_start( user_args, Recursive_Offset); - - status = ND_DataStruct_Traverse_I( Root_Ptr, NDD_CMD_VALUE_PRINT, Out, Recursive_Mode, Recursive_Depth, Recursive_Offset, &user_args); - - va_end( user_args); - - return( status); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Print all the data structure values */ -/*------------------------------------------------------------------------------*/ -/* (I) Stream: Output stream */ -/* (I) Root_Ptr: Data structure pointer */ -/* (I) Recursive_Mode: Child or Parent */ -/* (I) Recursive_Depth: Curent recursion depth */ -/* (I) Recursive_Offset: Curent print out offset */ -/* (I) ...: User args */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_DataStruct_Value_Print_C( FILE *Out, NDT_Root *Root_Ptr, NDT_Recursive_Mode Recursive_Mode, NDT_Recursive_Depth Recursive_Depth, NDT_Recursive_Offset Recursive_Offset, ...) -{ - NDT_Status status; - va_list user_args; - - - va_start( user_args, Recursive_Offset); - - if( NDG_Base.Open_Status != NDD_TRUE) - { - sprintf( NDG_Base.Err_String, "Error ND_DataStruct_Value_Print_C: library is not open"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - if( !Root_Ptr) - { - sprintf( NDG_Base.Err_String, "Error ND_DataStruct_Value_Print_C: structure root is null"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - if( !Out) - { - sprintf( NDG_Base.Err_String, "Error ND_DataStruct_Value_Print_C: the stream descriptor is null"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - status = ND_DataStruct_Value_Print_VI( Out, Root_Ptr, Recursive_Mode, Recursive_Depth, Recursive_Offset, &user_args); - - va_end( user_args); - - return( status); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Add a new node to a data structure index */ -/*------------------------------------------------------------------------------*/ -/* (I) Root_Ptr: Data structure pointer */ -/* (I) Index_Id: Id of the index */ -/* (I) Node_Ptr: Node pointer */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_Index_Node_Add_I( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id, NDT_Node *Node_Ptr ) -{ - if( ND_INDEX_TYPE_LIST_IS( Root_Ptr, Index_Id)) return ND_List_Node_Add( Root_Ptr, Index_Id, Node_Ptr); - else if( ND_INDEX_TYPE_TREE_IS( Root_Ptr, Index_Id)) return ND_Tree_Node_Add( Root_Ptr, Index_Id, Node_Ptr); - else - { - sprintf (NDG_Base.Err_String, "Error ND_Index_Node_Add_I: unknown structure type (%d)", Root_Ptr->Index_Tab[Index_Id].Type); - ND_Error_Print (); - return( NDS_ERRAPI); - } - - return( NDS_KO); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Add a new node to a data structure index */ -/*------------------------------------------------------------------------------*/ -/* (I) Root_Ptr: Data structure pointer */ -/* (I) Index_Id: Id of the index */ -/* (I) Node_Ptr: Node pointer */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_Index_Node_Add_C( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id, NDT_Node *Node_Ptr) -{ - if( NDG_Base.Open_Status != NDD_TRUE) - { - sprintf( NDG_Base.Err_String, "Error ND_Index_Node_Add_C: library is not open"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - if( !Root_Ptr) - { - sprintf (NDG_Base.Err_String, "Error ND_Index_Node_Add_C: structure root is null"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - if( !Node_Ptr) - { - sprintf (NDG_Base.Err_String, "Error ND_Index_Node_Add_C: the node to add is null"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - return( ND_Index_Node_Add_I( Root_Ptr, Index_Id, Node_Ptr)); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Remove a node from a data structure index */ -/*------------------------------------------------------------------------------*/ -/* (I) Node_Ptr: Node pointer */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_Index_Node_Remove_I( NDT_Node *Node_Ptr) -{ - NDT_Root *root_ptr; - NDT_Index_Id index_id; - - - root_ptr = Node_Ptr->Root; - index_id = Node_Ptr->Index; - - if( ND_INDEX_TYPE_LIST_IS( root_ptr, index_id)) return ND_List_Node_Remove( Node_Ptr); - else if( ND_INDEX_TYPE_TREE_IS( root_ptr, index_id)) - { - NDT_Node **tmp_ptr_ptr; - - /* On récupère l'adresse du lien entre le noeud à supprimer et son père */ - - if( Node_Ptr->Parent) - { - /* Cas général */ - - if( Node_Ptr == Node_Ptr->Parent->Left) tmp_ptr_ptr = &(Node_Ptr->Parent->Left); - else tmp_ptr_ptr = &(Node_Ptr->Parent->Right); - } - else - { - /* Cas du noeud racine */ - - tmp_ptr_ptr = NULL; - } - - if( Node_Ptr->Right) - { - NDT_Node *Right_Node_Ptr = Node_Ptr->Right; - NDT_Node *Left_Node_Ptr = Node_Ptr->Left; - NDT_Node *First_Node_Ptr; - - /* - On sauve le fils gauche du noeud à supprimer dans un pointeur de - sauvegarde pour pouvoir le récupérer au cas où la procédure serait - interrompue (recovery). - */ - - root_ptr->Index_Tab[index_id].Save = Left_Node_Ptr; - - /* On remplace le noeud supprimé par son sous-arbre droit */ - - if( !tmp_ptr_ptr) root_ptr->Index_Tab[index_id].Head = root_ptr->Index_Tab[index_id].Tail = Node_Ptr->Right; - else *tmp_ptr_ptr = Node_Ptr->Right; - - Right_Node_Ptr->Parent = Node_Ptr->Parent; - - /* On attache le sous-arbre gauche au premier noeud du sous-arbre droit */ - - if( root_ptr->Index_Tab[index_id].Save) - { - First_Node_Ptr = ND_Tree_Node_First_Recursive_Get(Right_Node_Ptr); - - First_Node_Ptr->Left = root_ptr->Index_Tab[index_id].Save; - - root_ptr->Index_Tab[index_id].Save->Parent = First_Node_Ptr; - - root_ptr->Index_Tab[index_id].Save = NULL; - } - } - else - { - /* On remplace le noeud supprimé par son sous-arbre gauche */ - - if( !tmp_ptr_ptr) root_ptr->Index_Tab[index_id].Head = root_ptr->Index_Tab[index_id].Tail = Node_Ptr->Left; - else *tmp_ptr_ptr = Node_Ptr->Left; - - if( Node_Ptr->Left) Node_Ptr->Left->Parent = Node_Ptr->Parent; - } - - root_ptr->Index_Tab[index_id].Node_Number--; - - /* Pas de mise à jour des informations de profondeur : trop coûteux */ - - Node_Ptr->Root = NULL; - Node_Ptr->Index = NDD_INDEX_UNKNOWN; - Node_Ptr->Left = NULL; - Node_Ptr->Right = NULL; - Node_Ptr->Parent = NULL; - } - else - { - sprintf (NDG_Base.Err_String, "Error ND_Index_Node_Remove_I: unknown structure type (%d)", root_ptr->Index_Tab[index_id].Type); - ND_Error_Print (); - return(NDS_ERRAPI); - } - - return(NDS_OK); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Remove a node from a data structure index */ -/*------------------------------------------------------------------------------*/ -/* (I) Node_Ptr: Node pointer */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_Index_Node_Remove_C( NDT_Node *Node_Ptr) -{ - if( NDG_Base.Open_Status != NDD_TRUE) - { - sprintf( NDG_Base.Err_String, "Error ND_Index_Node_Remove_C: library is not open"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - if( !Node_Ptr) - { - sprintf( NDG_Base.Err_String, "Error ND_Index_Node_Remove_C: the node to remove is null"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - return( ND_Index_Node_Remove_I( Node_Ptr)); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Get the first node of a data structure index */ -/*------------------------------------------------------------------------------*/ -/* (O) Node_Ptr_Ptr: Node pointer address */ -/* (I) Root_Ptr: Data structure pointer */ -/* (I) Index_Id: Id of the index */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_Index_Node_First_Get_I( NDT_Node **First_Node_Ptr_Ptr, NDT_Root *Root_Ptr, NDT_Index_Id Index_Id) -{ - *First_Node_Ptr_Ptr = NULL; - - if( ND_INDEX_TYPE_LIST_IS(Root_Ptr, Index_Id)) *First_Node_Ptr_Ptr = (Root_Ptr->Index_Tab)[Index_Id].Head; - - else if( ND_INDEX_TYPE_TREE_IS(Root_Ptr, Index_Id)) *First_Node_Ptr_Ptr = ND_Tree_Node_First_Recursive_Get( Root_Ptr->Index_Tab[Index_Id].Head); - - // if(!*First_Node_Ptr_Ptr) return(NDS_KO); - - return( NDS_OK); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Get the first node of a data structure index */ -/*------------------------------------------------------------------------------*/ -/* (O) Node_Ptr_Ptr: Node pointer address */ -/* (I) Root_Ptr: Data structure pointer */ -/* (I) Index_Id: Id of the index */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_Index_Node_First_Get_C( NDT_Node **First_Node_Ptr_Ptr, NDT_Root *Root_Ptr, NDT_Index_Id Index_Id) -{ - if( NDG_Base.Open_Status != NDD_TRUE) - { - sprintf( NDG_Base.Err_String, "Error ND_Index_Node_First_Get_C: library is not open"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - if( !Root_Ptr) - { - sprintf( NDG_Base.Err_String, "Error ND_Index_Node_First_Get_C: structure root is null"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - return( ND_Index_Node_First_Get_I( First_Node_Ptr_Ptr, Root_Ptr, Index_Id)); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Get the last node of a data structure index */ -/*------------------------------------------------------------------------------*/ -/* (O) Node_Ptr_Ptr: Node pointer address */ -/* (I) Root_Ptr: Data structure pointer */ -/* (I) Index_Id: Id of the index */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_Index_Node_Last_Get_I ( NDT_Node **Last_Node_Ptr_Ptr, NDT_Root *Root_Ptr, NDT_Index_Id Index_Id) -{ - *Last_Node_Ptr_Ptr = NULL; - - if( ND_INDEX_TYPE_LIST_IS(Root_Ptr, Index_Id)) *Last_Node_Ptr_Ptr = Root_Ptr->Index_Tab[Index_Id].Tail; - - else if( ND_INDEX_TYPE_TREE_IS(Root_Ptr, Index_Id)) *Last_Node_Ptr_Ptr = ND_Tree_Node_Last_Recursive_Get( Root_Ptr->Index_Tab[Index_Id].Head); - - // if(!*Last_Node_Ptr_Ptr) return(NDS_KO); - - return( NDS_OK); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Récupération du dernier noeud d'une structure */ -/*------------------------------------------------------------------------------*/ -/* (I) Root : pointeur sur la racine dont on cherche le dernier noeud */ -/* (O) Last_Node : adresse du pointeur sur le premier noeud */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_Index_Node_Last_Get_C( NDT_Node **Last_Node_Ptr_Ptr, NDT_Root *Root_Ptr, NDT_Index_Id Index_Id) -{ - if( NDG_Base.Open_Status != NDD_TRUE) - { - sprintf( NDG_Base.Err_String, "Error ND_Index_Node_Last_Get_C: library is not open"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - if( !Root_Ptr) - { - sprintf( NDG_Base.Err_String, "Error ND_Index_Node_Last_Get_C: structure root is null"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - return( ND_Index_Node_Last_Get_I( Last_Node_Ptr_Ptr, Root_Ptr, Index_Id)); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Get the next node of a data structure index */ -/*------------------------------------------------------------------------------*/ -/* (O) Node_Ptr_Ptr: Node pointer address */ -/* (I) Node_Ptr: Node pointer */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_Index_Node_Next_Get_I ( NDT_Node **Next_Node_Ptr_Ptr, NDT_Node *Node_Ptr) -{ - if( ND_INDEX_TYPE_LIST_IS( Node_Ptr->Root, Node_Ptr->Index)) - { - *Next_Node_Ptr_Ptr = Node_Ptr->Right; - } - else if( ND_INDEX_TYPE_TREE_IS( Node_Ptr->Root, Node_Ptr->Index)) - { - if( !Node_Ptr->Right) - { - *Next_Node_Ptr_Ptr = ND_Tree_Parent_Next_Recursive_Get(Node_Ptr); - } - else - { - *Next_Node_Ptr_Ptr = ND_Tree_Node_First_Recursive_Get(Node_Ptr->Right); - } - } - - // if(!*Next_Node_Ptr_Ptr) return(NDS_KO); - - return( NDS_OK); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Get the next node of a data structure index */ -/*------------------------------------------------------------------------------*/ -/* (O) Node_Ptr_Ptr: Node pointer address */ -/* (I) Node_Ptr: Node pointer */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_Index_Node_Next_Get_C( NDT_Node **Next_Node_Ptr_Ptr, NDT_Node *Node_Ptr) -{ - if( NDG_Base.Open_Status != NDD_TRUE) - { - sprintf( NDG_Base.Err_String, "Error ND_Index_Node_Next_Get_C: library is not open"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - if( !Node_Ptr) - { - sprintf( NDG_Base.Err_String, "Error ND_Index_Node_Next_Get_C: node is null"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - return( ND_Index_Node_Next_Get_I( Next_Node_Ptr_Ptr, Node_Ptr)); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Get the previous node of a data structure index */ -/*------------------------------------------------------------------------------*/ -/* (O) Node_Ptr_Ptr: Node pointer address */ -/* (I) Node_Ptr: Node pointer */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_Index_Node_Previous_Get_I( NDT_Node **Prev_Node_Ptr_Ptr, NDT_Node *Node_Ptr) -{ - if( ND_INDEX_TYPE_LIST_IS( Node_Ptr->Root, Node_Ptr->Index)) *Prev_Node_Ptr_Ptr = Node_Ptr->Left; - - if( ND_INDEX_TYPE_TREE_IS( Node_Ptr->Root, Node_Ptr->Index)) - { - if( !Node_Ptr->Left) - { - *Prev_Node_Ptr_Ptr = ND_Tree_Parent_Previous_Recursive_Get( Node_Ptr); - } - else - { - *Prev_Node_Ptr_Ptr = ND_Tree_Node_Last_Recursive_Get( Node_Ptr->Left); - } - } - - // if( !*Prev_Node_Ptr_Ptr) return( NDS_KO); - - return( NDS_OK); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Get the previous node of a data structure index */ -/*------------------------------------------------------------------------------*/ -/* (O) Node_Ptr_Ptr: Node pointer address */ -/* (I) Node_Ptr: Node pointer */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_Index_Node_Previous_Get_C( NDT_Node **Prev_Node_Ptr_Ptr, NDT_Node *Node_Ptr) -{ - if( NDG_Base.Open_Status != NDD_TRUE) - { - sprintf( NDG_Base.Err_String, "Error ND_Index_Node_Previous_Get_C: library is not open"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - if( !Node_Ptr) - { - sprintf( NDG_Base.Err_String, "Error ND_Index_Node_Previous_Get_C: node is null"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - return( ND_Index_Node_Previous_Get_I( Prev_Node_Ptr_Ptr, Node_Ptr)); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Find a node from a value in a data structure index */ -/*------------------------------------------------------------------------------*/ -/* (O) Node_Ptr_Ptr: Node pointer address */ -/* (I) Root_Ptr: Data structure pointer */ -/* (I) Index_Id: Id of the index */ -/* (I) Ref_Value_Ptr: Reference value pointer to search */ -/* (I) ...: User args */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_Index_Node_Find_VI( NDT_Node **Node_Ptr_Ptr, NDT_Root *Root_Ptr, NDT_Index_Id Index_Id, void *Value_Ptr, va_list *Args_Ptr) -{ - if( ND_INDEX_TYPE_LIST_IS( Root_Ptr, Index_Id)) - { - *Node_Ptr_Ptr = ND_List_Node_Find( Root_Ptr, Index_Id, Value_Ptr, Args_Ptr); - } - else if ( ND_INDEX_TYPE_TREE_IS( Root_Ptr, Index_Id)) - { - *Node_Ptr_Ptr = ND_Tree_Node_Find( Root_Ptr, Index_Id, Value_Ptr, Args_Ptr); - } - else - { - sprintf (NDG_Base.Err_String, "Error ND_Index_Node_Find_VI: unknown structure type (%d)", Root_Ptr->Index_Tab[Index_Id].Type); - ND_Error_Print (); - - return( NDS_KO); - } - - return( NDS_OK); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Find a node from a value in a data structure index */ -/*------------------------------------------------------------------------------*/ -/* (O) Node_Ptr_Ptr: Node pointer address */ -/* (I) Root_Ptr: Data structure pointer */ -/* (I) Index_Id: Id of the index */ -/* (I) Ref_Value_Ptr: Reference value pointer to search */ -/* (I) ...: User args */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_Index_Node_Find_VC( NDT_Node **Node_Ptr_Ptr, NDT_Root *Root_Ptr, NDT_Index_Id Index_Id, void *Value_Ptr, va_list *Args_Ptr) -{ - NDT_Status status; - - - if( NDG_Base.Open_Status != NDD_TRUE) - { - sprintf( NDG_Base.Err_String, "Error ND_Index_Node_Find_VC: library is not open"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - if( !Root_Ptr) - { - sprintf( NDG_Base.Err_String, "Error ND_Index_Node_Find_VC: structure root is null"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - if( !Value_Ptr) - { - sprintf( NDG_Base.Err_String, "Error ND_Index_Node_Find_VC: the value to find is null"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - status = ND_Index_Node_Find_VI( Node_Ptr_Ptr, Root_Ptr, Index_Id, Value_Ptr, Args_Ptr); - - - return( status); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Find a node from a value in a data structure index */ -/*------------------------------------------------------------------------------*/ -/* (O) Node_Ptr_Ptr: Node pointer address */ -/* (I) Root_Ptr: Data structure pointer */ -/* (I) Index_Id: Id of the index */ -/* (I) Ref_Value_Ptr: Reference value pointer to search */ -/* (I) ...: User args */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_Index_Node_Find_I( NDT_Node **Node_Ptr_Ptr, NDT_Root *Root_Ptr, NDT_Index_Id Index_Id, void *Value_Ptr, ...) -{ - va_list user_args; - - - va_start( user_args, Value_Ptr); - - if( ND_INDEX_TYPE_LIST_IS( Root_Ptr, Index_Id)) - { - *Node_Ptr_Ptr = ND_List_Node_Find( Root_Ptr, Index_Id, Value_Ptr, &user_args); - } - else if ( ND_INDEX_TYPE_TREE_IS( Root_Ptr, Index_Id)) - { - *Node_Ptr_Ptr = ND_Tree_Node_Find( Root_Ptr, Index_Id, Value_Ptr, &user_args); - } - else - { - sprintf (NDG_Base.Err_String, "Error ND_Index_Node_Find_I: unknown structure type (%d)", Root_Ptr->Index_Tab[Index_Id].Type); - ND_Error_Print (); - } - - va_end( user_args); - - return( NDS_OK); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Find a node from a value in a data structure index */ -/*------------------------------------------------------------------------------*/ -/* (O) Node_Ptr_Ptr: Node pointer address */ -/* (I) Root_Ptr: Data structure pointer */ -/* (I) Index_Id: Id of the index */ -/* (I) Ref_Value_Ptr: Reference value pointer to search */ -/* (I) ...: User args */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_Index_Node_Find_C( NDT_Node **Node_Ptr_Ptr, NDT_Root *Root_Ptr, NDT_Index_Id Index_Id, void *Value_Ptr, ...) -{ - NDT_Status status; - va_list user_args; - - - va_start( user_args, Value_Ptr); - - if( NDG_Base.Open_Status != NDD_TRUE) - { - sprintf( NDG_Base.Err_String, "Error ND_Index_Node_Find_C: library is not open"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - if( !Root_Ptr) - { - sprintf( NDG_Base.Err_String, "Error ND_Index_Node_Find_C: structure root is null"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - if( !Value_Ptr) - { - sprintf( NDG_Base.Err_String, "Error ND_Index_Node_Find_C: the value to find is null"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - status = ND_Index_Node_Find_VI( Node_Ptr_Ptr, Root_Ptr, Index_Id, Value_Ptr, &user_args); - - va_end( user_args); - - return( status); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Find a value in a data structure */ -/*------------------------------------------------------------------------------*/ -/* (O) Value_Ptr_Ptr: Value pointer address found */ -/* (I) Root_Ptr: Data structure pointer */ -/* (I) Ref_Value_Ptr: Reference value pointer to search */ -/* (I) ...: User args */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_DataStruct_Value_Find_VI( void **Value_Ptr_Ptr, NDT_Root *Root_Ptr, void *Ref_Value_Ptr, va_list *Args_Ptr) -{ - NDT_Status status; - NDT_Index_Id new_index; - NDT_Command new_cmd; - NDT_Node *node_ptr; - - - status = ND_Manager_Exec_I( Root_Ptr, NDD_INDEX_PRIMARY, NULL, NDD_CMD_INDEX_GET, &new_index, &new_cmd, NDD_CMD_VALUE_FIND, Ref_Value_Ptr); - if( ND_ERROR(status)) return( status); - - status = ND_Index_Node_Find_VI( &node_ptr, Root_Ptr, new_index, Ref_Value_Ptr, Args_Ptr); - if( ND_ERROR(status)) return( status); - - if( node_ptr != NULL) - { - *Value_Ptr_Ptr = node_ptr->Value; - } - else - { - *Value_Ptr_Ptr = NULL; - } - - return( NDS_OK); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Find a value in a data structure */ -/*------------------------------------------------------------------------------*/ -/* (O) Value_Ptr_Ptr: Value pointer address found */ -/* (I) Root_Ptr: Data structure pointer */ -/* (I) Ref_Value_Ptr: Reference value pointer to search */ -/* (I) ...: User args */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_DataStruct_Value_Find_VC( void **Value_Ptr_Ptr, NDT_Root *Root_Ptr, void *Ref_Value_Ptr, va_list *Args_Ptr) -{ - NDT_Status status; - - - if( NDG_Base.Open_Status != NDD_TRUE) - { - sprintf( NDG_Base.Err_String, "Error ND_DataStruct_Value_Find_VC: library is not open"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - if( !Root_Ptr) - { - sprintf( NDG_Base.Err_String, "Error ND_DataStruct_Value_Find_VC: structure root is null"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - if( !Ref_Value_Ptr) - { - sprintf( NDG_Base.Err_String, "Error ND_DataStruct_Value_Find_VC: the ref value to find is null"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - status = ND_DataStruct_Value_Find_VI( Value_Ptr_Ptr, Root_Ptr, Ref_Value_Ptr, Args_Ptr); - - return( status); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Find a value in a data structure */ -/*------------------------------------------------------------------------------*/ -/* (O) Value_Ptr_Ptr: Value pointer address found */ -/* (I) Root_Ptr: Data structure pointer */ -/* (I) Ref_Value_Ptr: Reference value pointer to search */ -/* (I) ...: User args */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_DataStruct_Value_Find_I( void **Value_Ptr_Ptr, NDT_Root *Root_Ptr, void *Ref_Value_Ptr, ...) -{ - NDT_Status status; - va_list user_args; - NDT_Index_Id new_index; - NDT_Command new_cmd; - NDT_Node *node_ptr; - - - va_start( user_args, Ref_Value_Ptr); - - status = ND_Manager_Exec_I( Root_Ptr, NDD_INDEX_PRIMARY, NULL, NDD_CMD_INDEX_GET, &new_index, &new_cmd, NDD_CMD_VALUE_FIND, Ref_Value_Ptr); - if( ND_ERROR(status)) return( status); - - status = ND_Index_Node_Find_VI( &node_ptr, Root_Ptr, new_index, Ref_Value_Ptr, &user_args); - if( ND_ERROR(status)) return( status); - - if( node_ptr != NULL) - { - *Value_Ptr_Ptr = node_ptr->Value; - } - else - { - *Value_Ptr_Ptr = NULL; - } - - va_end( user_args); - - return( NDS_OK); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Find a value in a data structure */ -/*------------------------------------------------------------------------------*/ -/* (O) Value_Ptr_Ptr: Value pointer address found */ -/* (I) Root_Ptr: Data structure pointer */ -/* (I) Ref_Value_Ptr: Reference value pointer to search */ -/* (I) ...: User args */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_DataStruct_Value_Find_C( void **Value_Ptr_Ptr, NDT_Root *Root_Ptr, void *Ref_Value_Ptr, ...) -{ - NDT_Status status; - va_list user_args; - - - va_start( user_args, Ref_Value_Ptr); - - if( NDG_Base.Open_Status != NDD_TRUE) - { - sprintf( NDG_Base.Err_String, "Error ND_DataStruct_Value_Find_C: library is not open"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - if( !Root_Ptr) - { - sprintf( NDG_Base.Err_String, "Error ND_DataStruct_Value_Find_C: structure root is null"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - if( !Ref_Value_Ptr) - { - sprintf( NDG_Base.Err_String, "Error ND_DataStruct_Value_Find_C: the ref value to find is null"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - status = ND_DataStruct_Value_Find_VI( Value_Ptr_Ptr, Root_Ptr, Ref_Value_Ptr, &user_args); - - va_end( user_args); - - return(status); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Get the root node of a data structure */ -/*------------------------------------------------------------------------------*/ -/* (O) Root_Ptr_Ptr: Data structure pointer address */ -/* (I) Node_Ptr: Node pointer */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_Node_Root_Get_I( NDT_Root **Root_Ptr_Ptr, NDT_Node *Node_Ptr) -{ - *Root_Ptr_Ptr = Node_Ptr->Root; - - return NDS_OK; -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Get the root node of a data structure */ -/*------------------------------------------------------------------------------*/ -/* (O) Root_Ptr_Ptr: Data structure pointer address */ -/* (I) Node_Ptr: Node pointer */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_Node_Root_Get_C( NDT_Root **Root_Ptr_Ptr, NDT_Node *Node_Ptr ) -{ - if( NDG_Base.Open_Status != NDD_TRUE) - { - sprintf( NDG_Base.Err_String, "Error ND_Node_Root_Get_C: library is not open"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - if( !Node_Ptr) - { - sprintf( NDG_Base.Err_String, "Error ND_Node_Root_Get_C: node is null"); - ND_Error_Print(); - - return(NDS_ERRAPI); - } - - return( ND_Node_Root_Get_I( Root_Ptr_Ptr, Node_Ptr)); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Allocate a new value */ -/*------------------------------------------------------------------------------*/ -/* (O) Value_Ptr_Ptr: Value pointer address */ -/* (I) Root_Ptr: Data structure pointer */ -/* (I) ...: User args */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_Value_Alloc_I( void **Value_Ptr_Ptr, NDT_Root *Root_Ptr, ...) -{ - NDT_Status rc; - va_list user_args; - - - /* Récupération des arguments pour l'allocation de la valeur */ - - va_start( user_args, Root_Ptr); - - /* Appel du manager */ - - rc = ND_Manager_Exec_I( Root_Ptr, NDD_INDEX_UNKNOWN, NULL, NDD_CMD_VALUE_ALLOC, Value_Ptr_Ptr, &user_args); - - va_end( user_args); - - return( rc); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Allocate a new value */ -/*------------------------------------------------------------------------------*/ -/* (O) Value_Ptr_Ptr: Value pointer address */ -/* (I) Root_Ptr: Data structure pointer */ -/* (I) ...: User args */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_Value_Alloc_C( void **Value_Ptr_Ptr, NDT_Root *Root_Ptr, ...) -{ - NDT_Status rc; - va_list user_args; - - - if( NDG_Base.Open_Status != NDD_TRUE) - { - sprintf( NDG_Base.Err_String, "Error ND_Value_Alloc_C: library is not open"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - if( !Root_Ptr) - { - sprintf( NDG_Base.Err_String, "Error ND_Value_Alloc_C: structure root is null"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - /* Récupération des arguments pour l'allocation de la valeur */ - - va_start( user_args, Root_Ptr); - - /* Appel du manager */ - - rc = ND_Manager_Exec_I( Root_Ptr, NDD_INDEX_UNKNOWN, NULL, NDD_CMD_VALUE_ALLOC, Value_Ptr_Ptr, &user_args); - - va_end( user_args); - - return( rc); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Deallocate a value */ -/*------------------------------------------------------------------------------*/ -/* (I) Root_Ptr: Data structure pointer */ -/* (I) Value_Ptr: Value pointer */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_Value_Free_I( NDT_Root *Root_Ptr, void *Value_Ptr) -{ - return( ND_Manager_Exec_I( Root_Ptr, NDD_INDEX_UNKNOWN, NULL, NDD_CMD_VALUE_FREE, Value_Ptr)); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Deallocate a value */ -/*------------------------------------------------------------------------------*/ -/* (I) Root_Ptr: Data structure pointer */ -/* (I) Value_Ptr: Value pointer */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_Value_Free_C( NDT_Root *Root_Ptr, void *Value_Ptr) -{ - if( NDG_Base.Open_Status != NDD_TRUE) - { - sprintf( NDG_Base.Err_String, "Error ND_Value_Free_C: library is not open"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - if( !Root_Ptr) - { - sprintf( NDG_Base.Err_String, "Error ND_Value_Free_C: structure root is null"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - if( !Value_Ptr) - { - sprintf( NDG_Base.Err_String, "Error ND_Value_Free_C: the value to free is null"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - /* Appel du manager */ - - return( ND_Value_Free_I( Root_Ptr, Value_Ptr)); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Execute a manager command */ -/*------------------------------------------------------------------------------*/ -/* (I) Root_Ptr: Data structure pointer */ -/* (I) Index_Id: Id of the index */ -/* (I) Node_Ptr: Node pointer */ -/* (I) Command: Manager command */ -/* (I) ...: User args */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_Manager_Exec_VI( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id, NDT_Node *Node_Ptr, NDT_Command Command, va_list *Args_Ptr) -{ - NDT_Status status; - NDT_Manager *manager_ptr; - - - if( Root_Ptr->Manager_Ptr != NULL) - { - manager_ptr = Root_Ptr->Manager_Ptr; - } - else - { - if( ND_Symbol_Find( (void **)&manager_ptr, Root_Ptr->Manager_Name) != NDS_OK) - { - sprintf( NDG_Base.Err_String, "ND_Manager_Exec_VI: cant't find manger function"); - ND_Error_Print(); - - return( NDS_KO); - } - } - - status = manager_ptr( Root_Ptr, Index_Id, Node_Ptr, Command, Args_Ptr); - - return( status); -} - - - - -/*------------------------------------------------------------------------------*/ -/* Execute a manager command */ -/*------------------------------------------------------------------------------*/ -/* (I) Root_Ptr: Data structure pointer */ -/* (I) Index_Id: Id of the index */ -/* (I) Node_Ptr: Node pointer */ -/* (I) Command: Manager command */ -/* (I) ...: User args */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_Manager_Exec_VC( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id, NDT_Node *Node_Ptr, NDT_Command Command, va_list *Args_Ptr) -{ - NDT_Status status; - - - if( NDG_Base.Open_Status != NDD_TRUE) - { - sprintf( NDG_Base.Err_String, "Error ND_Manager_Exec_VC: library is not open"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - if( !Root_Ptr) - { - sprintf( NDG_Base.Err_String, "Error ND_Manager_Exec_VC: structure root is null"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - if( !Root_Ptr->Manager_Ptr || !*(Root_Ptr->Manager_Ptr)) - { - sprintf( NDG_Base.Err_String, "Error ND_Manager_Exec_VC: undefined function name"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - status = ND_Manager_Exec_VI( Root_Ptr, Index_Id, Node_Ptr, Command, Args_Ptr); - - return( status); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Execute a manager command */ -/*------------------------------------------------------------------------------*/ -/* (I) Root_Ptr: Data structure pointer */ -/* (I) Index_Id: Id of the index */ -/* (I) Node_Ptr: Node pointer */ -/* (I) Command: Manager command */ -/* (I) ...: User args */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_Manager_Exec_I( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id, NDT_Node *Node_Ptr, NDT_Command Command, ...) -{ - NDT_Status status; - va_list args; - NDT_Manager *manager_ptr; - - - va_start( args, Command); - - if( Root_Ptr->Manager_Ptr != NULL) - { - manager_ptr = Root_Ptr->Manager_Ptr; - } - else - { - if( ND_Symbol_Find( (void **)&manager_ptr, Root_Ptr->Manager_Name) != NDS_OK) - { - sprintf( NDG_Base.Err_String, "ND_Manager_Exec_I: cant't find manger function"); - ND_Error_Print(); - - return( NDS_KO); - } - } - - status = manager_ptr( Root_Ptr, Index_Id, Node_Ptr, Command, &args); - - va_end( args); - - return( status); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Execute a manager command */ -/*------------------------------------------------------------------------------*/ -/* (I) Root_Ptr: Data structure pointer */ -/* (I) Index_Id: Id of the index */ -/* (I) Node_Ptr: Node pointer */ -/* (I) Command: Manager command */ -/* (I) ...: User args */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_Manager_Exec_C( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id, NDT_Node *Node_Ptr, NDT_Command Command, ...) -{ - NDT_Status status; - va_list args; - - - va_start( args, Command); - - if( NDG_Base.Open_Status != NDD_TRUE) - { - sprintf( NDG_Base.Err_String, "Error ND_Manager_Exec_C: library is not open"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - if( !Root_Ptr) - { - sprintf( NDG_Base.Err_String, "Error ND_Manager_Exec_C: structure root is null"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - if( !Root_Ptr->Manager_Ptr || !*(Root_Ptr->Manager_Ptr)) - { - sprintf( NDG_Base.Err_String, "Error ND_Manager_Exec_C: undefined function name"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - status = ND_Manager_Exec_VI( Root_Ptr, Index_Id, Node_Ptr, Command, &args); - - va_end( args); - - return( status); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Execute an allocator function */ -/*------------------------------------------------------------------------------*/ -/* (O) Value_Ptr_Ptr: Value pointer address */ -/* (I) Allocator_Name: Value allocator function name */ -/* (I) Allocator_Ptr: Value allocator function pointer */ -/* (I) Data_Ptr: User pointer */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_Allocator_Exec_I( void **Ptr_Ptr, size_t Size, NDT_Allocator_Name Allocator_Name, NDT_Allocator *Allocator_Ptr, void *Data_Ptr) -{ - NDT_Allocator *allocator_ptr; - - - if( Allocator_Ptr != NULL) - { - allocator_ptr = Allocator_Ptr; - } - else - { - if( ND_Symbol_Find( (void **)&allocator_ptr, Allocator_Name) != NDS_OK) - { - sprintf( NDG_Base.Err_String, "Error ND_Manager_Exec_I: cant't find allocator function"); - ND_Error_Print(); - - return( NDS_KO); - } - } - - return allocator_ptr( Ptr_Ptr, Size, Data_Ptr); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Execute an allocator function */ -/*------------------------------------------------------------------------------*/ -/* (O) Value_Ptr_Ptr: Value pointer address */ -/* (I) Allocator_Name: Value allocator function name */ -/* (I) Allocator_Ptr: Value allocator function pointer */ -/* (I) Data_Ptr: User pointer */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_Allocator_Exec_C( void **Ptr_Ptr, size_t Size, NDT_Allocator_Name Allocator_Name, NDT_Allocator *Allocator_Ptr, void *Data_Ptr) -{ - if( NDG_Base.Open_Status != NDD_TRUE) - { - sprintf( NDG_Base.Err_String, "Error ND_Allocator_Exec_C: library is not open"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - if( ( Allocator_Name == NULL) && ( Allocator_Ptr == NULL)) - { - sprintf( NDG_Base.Err_String, "Error ND_Allocator_Exec_C: undefined function name"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - return( ND_Allocator_Exec_I( Ptr_Ptr, Size, Allocator_Name, Allocator_Ptr, Data_Ptr)); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Execute a deallocator function */ -/*------------------------------------------------------------------------------*/ -/* (I) Value_Ptr: Value pointer */ -/* (I) Allocator_Name: Value deallocator function name */ -/* (I) Allocator_Ptr: Value deallocator function pointer */ -/* (I) Data_Ptr: User pointer */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_Deallocator_Exec_I( void *Ptr, NDT_Deallocator_Name Deallocator_Name, NDT_Deallocator *Deallocator_Ptr, void *Data_Ptr) -{ - NDT_Deallocator *deallocator_ptr; - - - if( Deallocator_Ptr != NULL) - { - deallocator_ptr = Deallocator_Ptr; - } - else - { - if( ND_Symbol_Find( (void **)&deallocator_ptr, Deallocator_Name) != NDS_OK) - { - sprintf( NDG_Base.Err_String, "Error ND_Manager_Exec_I: cant't find deallocator function"); - ND_Error_Print(); - - return( NDS_KO); - } - } - - return( deallocator_ptr( Ptr, Data_Ptr)); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Execute a deallocator function */ -/*------------------------------------------------------------------------------*/ -/* (I) Value_Ptr: Value pointer */ -/* (I) Allocator_Name: Value deallocator function name */ -/* (I) Allocator_Ptr: Value deallocator function pointer */ -/* (I) Data_Ptr: User pointer */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_Deallocator_Exec_C( void *Ptr, NDT_Deallocator_Name Deallocator_Name, NDT_Deallocator *Deallocator_Ptr, void *Data_Ptr) -{ - if( NDG_Base.Open_Status != NDD_TRUE) - { - sprintf( NDG_Base.Err_String, "Error ND_Deallocator_Exec_C: library is not open"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - if( ( Deallocator_Name == NULL) && ( Deallocator_Ptr == NULL)) - { - sprintf( NDG_Base.Err_String, "Error ND_Deallocator_Exec_C: undefined function name"); - ND_Error_Print(); - - return( NDS_ERRAPI); - } - - return( ND_Deallocator_Exec_I( Ptr, Deallocator_Name, Deallocator_Ptr, Data_Ptr)); -} - - - - - - - -/*------------------------------------------------------------------------------*/ -/*------------------------------------------------------------------------------*/ -/* PRIVATE FUNCTIONS */ -/*------------------------------------------------------------------------------*/ -/*------------------------------------------------------------------------------*/ - -/*------------------------------------------------------------------------------*/ -/* Symbol Lookup */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_Symbol_Find( void **Ptr_Ptr, const char *Symbol_Name) -{ -#if !defined(_WIN32) - NDT_Symbol *Symbol_Ptr; - - - /* Recherche du symbole dans la table des symboles locale */ - - Symbol_Ptr = NDG_Base.Symbol_First_Ptr; - - while( Symbol_Ptr) - { - if( !strcmp( Symbol_Ptr->Name, Symbol_Name)) - { - *Ptr_Ptr = Symbol_Ptr->Ptr; - return( NDS_OK); - } - else - { - Symbol_Ptr = Symbol_Ptr->Next; - } - } - - - /* Si le symbole n'a pas été trouvée dans la table des symboles locale, on l'y ajoute */ - - if( ( *Ptr_Ptr = dlsym( NDG_Base.DL_Ptr, (const char *)Symbol_Name)) == NULL) - { - sprintf( NDG_Base.Err_String, "Error ND_Symbol_Find: unable to find \"%s\"' in symbol table (%s)", Symbol_Name, dlerror()); - ND_Error_Print(); - - return( NDS_KO); - } - - Symbol_Ptr = (NDT_Symbol *)malloc( sizeof( NDT_Symbol)); - if( Symbol_Ptr == NULL) - { - sprintf( NDG_Base.Err_String, "Error ND_Symbol_Find: no more memory"); - ND_Error_Print(); - - return( NDS_KO); - } - else - { - Symbol_Ptr->Name = strdup (Symbol_Name); - Symbol_Ptr->Ptr = *Ptr_Ptr; - Symbol_Ptr->Next = NDG_Base.Symbol_First_Ptr; - - NDG_Base.Symbol_First_Ptr = Symbol_Ptr; - } -#endif - - return( NDS_OK); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Allocation d'un noeud */ -/*------------------------------------------------------------------------------*/ -/* (I) Root : pointeur sur la racine de la structure */ -/* (O) Node : adresse du pointeur sur le nouveau noeud */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_Node_Alloc( NDT_Root *Root_Ptr, NDT_Node **Node_Ptr_Ptr ) -{ - NDT_Status rc; - - - rc = ND_Allocator_Exec_I( (void **)Node_Ptr_Ptr, sizeof(NDT_Node), Root_Ptr->Allocator_Name, Root_Ptr->Allocator_Ptr, Root_Ptr->User_Ptr); - if( ND_ERROR( rc)) return( rc); - - (*Node_Ptr_Ptr)->Root = NULL; - (*Node_Ptr_Ptr)->Index = NDD_INDEX_UNKNOWN; - (*Node_Ptr_Ptr)->Parent = NULL; - (*Node_Ptr_Ptr)->Left = NULL; - (*Node_Ptr_Ptr)->Right = NULL; - (*Node_Ptr_Ptr)->Value = NULL; - - return( NDS_OK); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Désallocation d'un noeud */ -/*------------------------------------------------------------------------------*/ -/* (I) Root: pointeur sur la racine de la structure */ -/* (I) Node : pointeur sur le noeud à détruire */ -/*------------------------------------------------------------------------------*/ -NDT_Status ND_Node_Free( NDT_Root *Root_Ptr, NDT_Node *Node_Ptr) -{ - return( ND_Deallocator_Exec_I( Node_Ptr, Root_Ptr->Deallocator_Name, Root_Ptr->Deallocator_Ptr, Root_Ptr->User_Ptr)); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Création d'une nouvelle structure de données */ -/*------------------------------------------------------------------------------*/ -/* (O) Root: adresse d'un pointeur sur la racine de la nouvelle structure */ -/* (I) Type: type de la structure.de données (liste ou arbre binaire) */ -/* (I) Allocator: pointeur vers la fonction d'allocation */ -/* (I) Deallocator: pointeur vers la fonction de désallocation */ -/* (I) Data : pointeur de données utiles à l'allocateur */ -/* (I) Own_Value : indique si la structure est propriétaire de ses valeurs */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_Index_Clear( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id) -{ - Root_Ptr->Index_Tab[Index_Id].Type = NDD_INDEX_STATUS_UNKNOWN; - - Root_Ptr->Index_Tab[Index_Id].Head = NULL; - Root_Ptr->Index_Tab[Index_Id].Tail = NULL; - Root_Ptr->Index_Tab[Index_Id].Save = NULL; - - Root_Ptr->Index_Tab[Index_Id].Max_Dif = DEF_MAX_DIF; - - Root_Ptr->Index_Tab[Index_Id].Node_Number = 0; - Root_Ptr->Index_Tab[Index_Id].Max_Depth = 0; - Root_Ptr->Index_Tab[Index_Id].Min_Depth = NDD_HUGE_LONG; - Root_Ptr->Index_Tab[Index_Id].Nb_Equ = 0; - - return( NDS_OK); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Allocation d'une racine de structure de données */ -/*------------------------------------------------------------------------------*/ -/* (O) New_Root: adresse du pointeur sur la nouvelle racine */ -/* (I) Type: type de la structure de données */ -/* (I) Allocator: pointeur vers la fonction d'allocation */ -/* (I) Deallocator: pointeur vers la fonction de désallocation */ -/* (I) Data : pointeur de données utiles à l'allocateur */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_Node_Root_Alloc( NDT_Root **Root_Ptr_Ptr, NDT_Index_Nb Index_Nb, NDT_Index_Type *Type_Ptr, char *Manager_Name, NDT_Manager *Manager_Ptr, char *Allocator_Name, NDT_Allocator *Allocator_Ptr, char *Deallocator_Name, NDT_Deallocator *Deallocator_Ptr, short Own_Value, void *Data_Ptr) -{ - NDT_Status status; - NDT_Index_Id index_id; - - - status = ND_Allocator_Exec_I( (void **)Root_Ptr_Ptr, ( sizeof( NDT_Root) + sizeof(NDT_Index) * (Index_Nb - 1)), Allocator_Name, Allocator_Ptr, Data_Ptr); - if( ND_ERROR(status)) return( status); - - if( strlen(Manager_Name) > NDD_MANAGER_NAME_LEN_MAX) return( NDS_ERRAPI); - strcpy( (*Root_Ptr_Ptr)->Manager_Name, Manager_Name); - (*Root_Ptr_Ptr)->Manager_Ptr = Manager_Ptr; - - if( strlen(Allocator_Name) > NDD_ALLOCATOR_NAME_LEN_MAX) return( NDS_ERRAPI); - strcpy( (*Root_Ptr_Ptr)->Allocator_Name, Allocator_Name); - (*Root_Ptr_Ptr)->Allocator_Ptr = Allocator_Ptr; - - if( strlen(Deallocator_Name) > NDD_DEALLOCATOR_NAME_LEN_MAX) return( NDS_ERRAPI); - strcpy( (*Root_Ptr_Ptr)->Deallocator_Name, Deallocator_Name); - (*Root_Ptr_Ptr)->Deallocator_Ptr = Deallocator_Ptr; - - (*Root_Ptr_Ptr)->Own_Value = Own_Value; - (*Root_Ptr_Ptr)->User_Ptr = Data_Ptr; - - (*Root_Ptr_Ptr)->Index_Nb = Index_Nb; - (*Root_Ptr_Ptr)->Index_Open_Count = 0; - - for( index_id = 0; index_id < Index_Nb; index_id++) - { - if( ( Type_Ptr[index_id] & NDD_INDEX_STATUS_MSK) == NDD_INDEX_STATUS_OPENED) - { - status = ND_Index_Open_I( *Root_Ptr_Ptr, index_id, Type_Ptr[index_id]); - if( ND_ERROR( status)) return( status); - } - else - { - if( ( status = ND_Index_Clear( *Root_Ptr_Ptr, index_id)) != NDS_OK) - { - sprintf( NDG_Base.Err_String, "Error ND_Index_Open_I: Index cleaning error"); - ND_Error_Print(); - return( NDS_KO); - } - - ( *Root_Ptr_Ptr)->Index_Tab[index_id].Type = NDD_INDEX_STATUS_CLOSED; - } - } - - return( NDS_OK); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Désallocation de la racine d'une structure de donnée */ -/*------------------------------------------------------------------------------*/ -/* (I) Root : pointeur sur la racine à détruire */ -/*------------------------------------------------------------------------------*/ -NDT_Status ND_Node_Root_Free( NDT_Root *Root_Ptr) -{ - return( ND_Deallocator_Exec_I( Root_Ptr, Root_Ptr->Deallocator_Name, Root_Ptr->Deallocator_Ptr, Root_Ptr->User_Ptr)); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Ajout d'un noeud à une liste chaînée */ -/*------------------------------------------------------------------------------*/ -/* (I) Root : pointeur sur la racine de la liste */ -/* (I) New_Node : pointeur sur le noeud à ajouter */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_List_Node_Add( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id, NDT_Node *New_Node_Ptr) -{ - /* Ajout dans une liste triée */ - - if( ND_INDEX_SUBTYPE_SORTED_IS( Root_Ptr, Index_Id)) - { - NDT_Node *node_ptr; - NDT_Status rc; - - - New_Node_Ptr->Root = Root_Ptr; - New_Node_Ptr->Index = Index_Id; - New_Node_Ptr->Parent = New_Node_Ptr->Left = New_Node_Ptr->Right = NULL; - - /* - Une liste triée peut être orientée de 2 manières : - - - FIFO : un noeud sera inséré APRES un noeud de même valeur (par défaut) - - FILO : un noeud sera inséré AVANT un noeud de même valeur - */ - - if( ND_INDEX_SUBTYPE_LIFO_IS( Root_Ptr, Index_Id)) - { - /* Pour une liste triée orientée FILO, on parcourt la liste en sens normal */ - - node_ptr = Root_Ptr->Index_Tab[Index_Id].Head; - - while( node_ptr) - { - rc = ND_Manager_Exec_I( Root_Ptr, Index_Id, node_ptr, NDD_CMD_VALUE_COMP, New_Node_Ptr->Value, node_ptr->Value, NULL); - - if(rc == NDS_GREATER) - node_ptr = node_ptr->Right; - else - { - /* On insère avant le noeud courant si le nouveau noeud est de valeur inférieure ou égale */ - - New_Node_Ptr->Left = node_ptr->Left; - New_Node_Ptr->Right = node_ptr; - - if(!node_ptr->Left) Root_Ptr->Index_Tab[Index_Id].Head = New_Node_Ptr; - else node_ptr->Left->Right = New_Node_Ptr; - - node_ptr->Left = New_Node_Ptr; - node_ptr = NULL; - } - } - - /* Insertion en queue de liste si le noeud n'a pas été inséré */ - - if(!New_Node_Ptr->Left && !New_Node_Ptr->Right) - { - if( !Root_Ptr->Index_Tab[Index_Id].Tail) Root_Ptr->Index_Tab[Index_Id].Head = Root_Ptr->Index_Tab[Index_Id].Tail = New_Node_Ptr; - else - { - Root_Ptr->Index_Tab[Index_Id].Tail->Right = New_Node_Ptr; - New_Node_Ptr->Left = Root_Ptr->Index_Tab[Index_Id].Tail; - Root_Ptr->Index_Tab[Index_Id].Tail = New_Node_Ptr; - } - } - } - else - { - /* Pour une liste triée orientée FIFO, on parcourt la liste dans le sens inverse */ - - node_ptr = Root_Ptr->Index_Tab[Index_Id].Tail; - while( node_ptr) - { - rc = ND_Manager_Exec_I( Root_Ptr, Index_Id, node_ptr, NDD_CMD_VALUE_COMP, New_Node_Ptr->Value, node_ptr->Value, NULL); - - /* On insère après le noeud courant si le nouveau noeud est de valeur strictement supérieure ou égale */ - - if( rc == NDS_LOWER) node_ptr = node_ptr->Left; - else - { - New_Node_Ptr->Left = node_ptr; - New_Node_Ptr->Right = node_ptr->Right; - - if( !node_ptr->Right) Root_Ptr->Index_Tab[Index_Id].Tail = New_Node_Ptr; - else node_ptr->Right->Left = New_Node_Ptr; - - node_ptr->Right = New_Node_Ptr; - node_ptr = NULL; - } - } - - /* Insertion en tête de liste si le noeud n'a pas été inséré */ - - if( !New_Node_Ptr->Left && !New_Node_Ptr->Right) - { - if( !Root_Ptr->Index_Tab[Index_Id].Head) Root_Ptr->Index_Tab[Index_Id].Head = Root_Ptr->Index_Tab[Index_Id].Tail = New_Node_Ptr; - else - { - Root_Ptr->Index_Tab[Index_Id].Head->Left = New_Node_Ptr; - New_Node_Ptr->Right = Root_Ptr->Index_Tab[Index_Id].Head; - Root_Ptr->Index_Tab[Index_Id].Head = New_Node_Ptr; - } - } - } - - Root_Ptr->Index_Tab[Index_Id].Node_Number++; - - return( NDS_OK); - } - else - { - /* FIFO = ajout en queue de liste */ - - if( ND_INDEX_SUBTYPE_FIFO_IS( Root_Ptr, Index_Id)) - { - New_Node_Ptr->Root = Root_Ptr; - New_Node_Ptr->Index = Index_Id; - New_Node_Ptr->Parent = NULL; - New_Node_Ptr->Left = Root_Ptr->Index_Tab[Index_Id].Tail; - New_Node_Ptr->Right = NULL; - - if( !Root_Ptr->Index_Tab[Index_Id].Head) Root_Ptr->Index_Tab[Index_Id].Head = New_Node_Ptr; - else Root_Ptr->Index_Tab[Index_Id].Tail->Right = New_Node_Ptr; - - Root_Ptr->Index_Tab[Index_Id].Tail = New_Node_Ptr; - Root_Ptr->Index_Tab[Index_Id].Node_Number++; - - return( NDS_OK); - } - - /* FILO = ajout en tête de liste */ - - if( ND_INDEX_SUBTYPE_LIFO_IS( Root_Ptr, Index_Id)) - { - - New_Node_Ptr->Root = Root_Ptr; - New_Node_Ptr->Index = Index_Id; - New_Node_Ptr->Parent = NULL; - New_Node_Ptr->Left = NULL; - New_Node_Ptr->Right = Root_Ptr->Index_Tab[Index_Id].Head; - - if( !Root_Ptr->Index_Tab[Index_Id].Tail) Root_Ptr->Index_Tab[Index_Id].Tail = New_Node_Ptr; - else Root_Ptr->Index_Tab[Index_Id].Head->Left = New_Node_Ptr; - - Root_Ptr->Index_Tab[Index_Id].Head = New_Node_Ptr; - Root_Ptr->Index_Tab[Index_Id].Node_Number++; - - return( NDS_OK); - } - } - - printf( "ND_List_Node_Add: unknown list type (%d)\n", Root_Ptr->Index_Tab[Index_Id].Type); - return( NDS_ERRAPI); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Ajout d'une nouvelle valeur à une liste */ -/*------------------------------------------------------------------------------*/ -/* (I) Root : pointeur sur la racine de la liste */ -/* (I) Value : pointeur sur la valeur à ajouter */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_List_Value_Add( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id, void *Value_Ptr) -{ - NDT_Status rc; - NDT_Node *node_ptr; - - - rc = ND_Node_Alloc( Root_Ptr, &node_ptr); - if( ND_ERROR(rc)) return(rc); - - node_ptr->Value = Value_Ptr; - -// return ND_List_Node_Add( Root, Node); - - rc = ND_List_Node_Add( Root_Ptr, Index_Id, node_ptr); - if( ND_ERROR(rc)) - { - return( rc); - } - else - { - return( ND_Manager_Exec_I( Root_Ptr, Index_Id, node_ptr, NDD_CMD_VALUE_ADD, Value_Ptr, NULL)); - } -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Ajout d'un noeud à un arbre binaire */ -/*------------------------------------------------------------------------------*/ -/* (I) Root : pointeur sur la racine de l'arbre */ -/* (I) Value : pointeur sur la valeur à ajouter */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_Tree_Value_Add( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id, void *Value_Ptr) -{ - NDT_Status rc; - NDT_Node *node_ptr; - - - rc = ND_Node_Alloc( Root_Ptr, &node_ptr); - if( ND_ERROR(rc)) return(rc); - - node_ptr->Value = Value_Ptr; - -// return ND_Tree_Node_Add( Root, Node); - - rc = ND_Tree_Node_Add( Root_Ptr, Index_Id, node_ptr); - if( ND_ERROR(rc)) - { - return( rc); - } - else - { - return ND_Manager_Exec_I( Root_Ptr, Index_Id, node_ptr, NDD_CMD_VALUE_ADD, Value_Ptr, NULL); - } -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Recherche une valeur dans une liste et retourne le noeud correspondant */ -/*------------------------------------------------------------------------------*/ -/* (I) Root : pointeur sur la racine de la liste */ -/* (I) Value : pointeur sur la valeur à rechercher */ -/* (I) Data : pointeur de données */ -/*------------------------------------------------------------------------------*/ - -NDT_Node *ND_List_Node_Find( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id, void *Value_Ptr, va_list *User_Args_Ptr) -{ - NDT_Node *node_ptr; - NDT_Status rc; - - - node_ptr = Root_Ptr->Index_Tab[Index_Id].Head; - - if( ND_INDEX_SUBTYPE_SORTED_IS( Root_Ptr, Index_Id)) - { - /* Pour les listes triées, la recherche peut être optimisée */ - - while( node_ptr) - { - rc = ND_Manager_Exec_I( Root_Ptr, Index_Id, node_ptr, NDD_CMD_VALUE_COMP, Value_Ptr, node_ptr->Value, User_Args_Ptr); - - switch( rc) - { - case NDS_EQUAL: - { - return(node_ptr); - } - - case NDS_LOWER: - { - /* Ce n'est pas a peine de continuer car on a déjà dépassé la valeur recherchée */ - - return(NULL); - } - - case NDS_GREATER: - { - node_ptr = node_ptr->Right; - break; - } - } - } - } - else - { - /* Pour les listes non triées, il faut parcourir toute la liste */ - - while( node_ptr && ( ND_Manager_Exec_I( Root_Ptr, Index_Id, node_ptr, NDD_CMD_VALUE_COMP, Value_Ptr, node_ptr->Value, User_Args_Ptr) != NDS_EQUAL)) - { - node_ptr = node_ptr->Right; - } - } - - return( node_ptr); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Recherche un noeud dans un arbre et retourne le pointeur sur le noeud */ -/*------------------------------------------------------------------------------*/ -/* (I) Root : pointeur sur la racine de l'abre */ -/* (I) Value : pointeur sur la valeur à rechercher */ -/* (I) Data : pointeur de données */ -/*------------------------------------------------------------------------------*/ - -/*------------------------------ Recursive Kernel ------------------------------*/ - -NDT_Node *ND_Tree_Node_Recursive_Find( NDT_Node *Node_Ptr, void *Value_Ptr, va_list *User_Args_Ptr) -{ - NDT_Status answer; - - - if( !Node_Ptr) return(NULL); - - answer = ND_Manager_Exec_I( Node_Ptr->Root, Node_Ptr->Index, Node_Ptr, NDD_CMD_VALUE_COMP, Value_Ptr, Node_Ptr->Value, User_Args_Ptr); - - /* Noeud trouvé */ - - if( answer == NDS_EQUAL) return(Node_Ptr); - - /* Continuation de la recherche par appel récursif */ - - if( answer == NDS_LOWER) return( ND_Tree_Node_Recursive_Find( Node_Ptr->Left, Value_Ptr, User_Args_Ptr)); - - if( answer == NDS_GREATER) return( ND_Tree_Node_Recursive_Find( Node_Ptr->Right, Value_Ptr, User_Args_Ptr)); - - return( NULL); -} - - - -/*-------------------------------- main body ---------------------------------*/ - -NDT_Node *ND_Tree_Node_Find( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id, void *Value_Ptr, va_list *User_Args_Ptr) -{ - return( ND_Tree_Node_Recursive_Find( Root_Ptr->Index_Tab[Index_Id].Head, Value_Ptr, User_Args_Ptr)); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Recherche du premier noeud parent situé après */ -/*------------------------------------------------------------------------------*/ -/* (I) Node : pointeur sur le noeud */ -/*------------------------------------------------------------------------------*/ - -NDT_Node *ND_Tree_Parent_Next_Recursive_Get( NDT_Node *Node_Ptr) -{ - if( !Node_Ptr->Parent) return( NULL); - - if( Node_Ptr == Node_Ptr->Parent->Right) return( ND_Tree_Parent_Next_Recursive_Get( Node_Ptr->Parent)); - - return( Node_Ptr->Parent); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Recherche du premier noeud parent situé avant */ -/*------------------------------------------------------------------------------*/ -/* (I) Node : pointeur sur le noeud */ -/*------------------------------------------------------------------------------*/ - -NDT_Node *ND_Tree_Parent_Previous_Recursive_Get( NDT_Node *Node_Ptr) -{ - if( !Node_Ptr->Parent) return( NULL); - - if( Node_Ptr == Node_Ptr->Parent->Left) return( ND_Tree_Parent_Previous_Recursive_Get( Node_Ptr->Parent)); - - return( Node_Ptr->Parent); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Supprime le noeud d'une liste */ -/*------------------------------------------------------------------------------*/ -/* (I) Node : pointeur sur le noeud à supprimer */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_List_Node_Remove( NDT_Node *Node_Ptr) -{ - if( !Node_Ptr->Left) Node_Ptr->Root->Index_Tab[Node_Ptr->Index].Head = Node_Ptr->Right; - else Node_Ptr->Left->Right = Node_Ptr->Right; - - if( !Node_Ptr->Right) Node_Ptr->Root->Index_Tab[Node_Ptr->Index].Tail = Node_Ptr->Left; - else Node_Ptr->Right->Left = Node_Ptr->Left; - - Node_Ptr->Root->Index_Tab[Node_Ptr->Index].Node_Number--; - - Node_Ptr->Root = NULL; - Node_Ptr->Index = NDD_INDEX_UNKNOWN; - Node_Ptr->Left = NULL; - Node_Ptr->Right = NULL; - - return( NDS_OK); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Conversion d'un arbre en liste chaînée */ -/*------------------------------------------------------------------------------*/ -/* (I) Root : pointeur sur la racine du la structure à convertir */ -/*------------------------------------------------------------------------------*/ - -/*------------------------------- Recursive Kernel -----------------------------*/ - -NDT_Status ND_List_Recursive_Make( NDT_Node *Node_Ptr, NDT_Root *Root_Ptr, NDT_Index_Id Index_Id) -{ - NDT_Node *right_node_ptr; - - - if( !Node_Ptr) return NDS_OK; - - if( ND_List_Recursive_Make( Node_Ptr->Left, Root_Ptr, Index_Id) != NDS_OK) return NDS_KO; - - right_node_ptr = Node_Ptr->Right; - - if( ND_List_Node_Add( Root_Ptr, Index_Id, Node_Ptr) != NDS_OK) return NDS_KO; - - return( ND_List_Recursive_Make( right_node_ptr, Root_Ptr, Index_Id)); -} - - - -/*--------------------------------- main body --------------------------------*/ - -NDT_Status ND_List_Make( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id) -{ - NDT_Node *node_ptr; - - - node_ptr = Root_Ptr->Index_Tab[Index_Id].Head; - - Root_Ptr->Index_Tab[Index_Id].Head = NULL; - Root_Ptr->Index_Tab[Index_Id].Tail = NULL; - Root_Ptr->Index_Tab[Index_Id].Max_Dif = DEF_MAX_DIF; - Root_Ptr->Index_Tab[Index_Id].Node_Number = 0; - Root_Ptr->Index_Tab[Index_Id].Max_Depth = 0; - Root_Ptr->Index_Tab[Index_Id].Min_Depth = NDD_HUGE_LONG; - Root_Ptr->Index_Tab[Index_Id].Nb_Equ = 0; - Root_Ptr->Index_Tab[Index_Id].Type = NDD_INDEX_STATUS_OPENED | NDD_INDEX_TYPE_LIST | NDD_INDEX_SUBTYPE_FIFO; - - return( ND_List_Recursive_Make( node_ptr, Root_Ptr, Index_Id)); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Conversion d'une structure en arbre binaire */ -/*------------------------------------------------------------------------------*/ -/* (I) Root : pointeur sur la racine du la structure à convertir */ -/* (I) Type : type du futur arbre */ -/*------------------------------------------------------------------------------*/ - -/*------------------------------- Recursive Kernel -----------------------------*/ - -NDT_Node *ND_Tree_Recursive_Make( long Depth, long Node_Number, NDT_Node *Node_Ptr ) -{ - long middle_pos, left_len, right_len, i; - NDT_Node *left_node_ptr, *middle_node_ptr, *right_node_ptr; - - - if( !Node_Ptr) return( NULL); - - /* On calcule le milieu de la liste */ - - middle_pos = Node_Number / 2 + 1; - middle_node_ptr = Node_Ptr; - - for( i = 1; i < middle_pos; i++) middle_node_ptr = middle_node_ptr->Right; - - /* On coupe la liste en deux */ - - if( middle_node_ptr->Left) - { - middle_node_ptr->Left->Right = NULL; - left_node_ptr = Node_Ptr; - left_len = middle_pos - 1; - } - else - { - left_node_ptr = NULL; - left_len = 0; - } - - if( middle_node_ptr->Right) - { - middle_node_ptr->Right->Left = NULL; - right_node_ptr = middle_node_ptr->Right; - right_len = Node_Number - middle_pos; - } - else - { - right_node_ptr = NULL; - right_len = 0; - } - - /* Construction des sous-arbres */ - - middle_node_ptr->Left = ND_Tree_Recursive_Make( Depth + 1, left_len, left_node_ptr); - - middle_node_ptr->Right = ND_Tree_Recursive_Make( Depth + 1, right_len, right_node_ptr); - - if( middle_node_ptr->Left) middle_node_ptr->Left->Parent = middle_node_ptr; - - if( middle_node_ptr->Right) middle_node_ptr->Right->Parent = middle_node_ptr; - - /* Mise à jour des informations statistiques de la structure */ - - middle_node_ptr->Root->Index_Tab[middle_node_ptr->Index].Node_Number++; - - if( !middle_node_ptr->Left && !middle_node_ptr->Right) - { - /* - Si le noeud courant est une feuille, on met éventuellement à jour - les longueurs minimale et maximale des branches de l'arbre - */ - - if( Depth > middle_node_ptr->Root->Index_Tab[middle_node_ptr->Index].Max_Depth) - { - middle_node_ptr->Root->Index_Tab[middle_node_ptr->Index].Max_Depth = Depth; - } - - if( Depth < middle_node_ptr->Root->Index_Tab[middle_node_ptr->Index].Min_Depth) - { - middle_node_ptr->Root->Index_Tab[middle_node_ptr->Index].Min_Depth = Depth; - } - } - - return( middle_node_ptr); -} - - - -/*--------------------------------- main body --------------------------------*/ - -NDT_Status ND_Tree_Make( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id ) -{ - NDT_Status rc; - NDT_Node *node_ptr; - long node_number; - - - if( ND_INDEX_SUBTYPE_SORTED_IS( Root_Ptr, Index_Id)) - { - rc = ND_List_Sort( Root_Ptr, Index_Id); - if( ND_ERROR(rc)) return( rc); - } - - node_ptr = Root_Ptr->Index_Tab[Index_Id].Head; - node_number = Root_Ptr->Index_Tab[Index_Id].Node_Number; - - Root_Ptr->Index_Tab[Index_Id].Head = NULL; - Root_Ptr->Index_Tab[Index_Id].Tail = NULL; - Root_Ptr->Index_Tab[Index_Id].Max_Dif = DEF_MAX_DIF; - Root_Ptr->Index_Tab[Index_Id].Node_Number = 0; - Root_Ptr->Index_Tab[Index_Id].Max_Depth = 0; - Root_Ptr->Index_Tab[Index_Id].Min_Depth = NDD_HUGE_LONG; - Root_Ptr->Index_Tab[Index_Id].Nb_Equ = 0; - Root_Ptr->Index_Tab[Index_Id].Type = NDD_INDEX_STATUS_OPENED | NDD_INDEX_TYPE_TREE | NDD_INDEX_SUBTYPE_BALANCED; - - Root_Ptr->Index_Tab[Index_Id].Head = Root_Ptr->Index_Tab[Index_Id].Tail = ND_Tree_Recursive_Make( 1, node_number, node_ptr); - - return( NDS_OK); -} - - - - - -/*----------------------------------------------------------------------------*/ -/* Equilibrage d'un arbre binaire */ -/*----------------------------------------------------------------------------*/ -/* (I) Root : pointeur sur la racine de l'arbre */ -/*----------------------------------------------------------------------------*/ - -NDT_Status ND_Tree_Equalize( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id) -{ - NDT_Status rc; - NDT_Index_Type type; - long max_dif, nb_equ; - - - type = Root_Ptr->Index_Tab[Index_Id].Type; - max_dif = Root_Ptr->Index_Tab[Index_Id].Max_Dif; - nb_equ = Root_Ptr->Index_Tab[Index_Id].Nb_Equ; - - rc = ND_List_Make( Root_Ptr, Index_Id); - if( ND_ERROR(rc)) return(rc); - - Root_Ptr->Index_Tab[Index_Id].Type = NDD_INDEX_STATUS_OPENED | NDD_INDEX_TYPE_LIST | NDD_INDEX_SUBTYPE_SORTED; - - rc = ND_Tree_Make( Root_Ptr, Index_Id); - if( ND_ERROR(rc)) return(rc); - - Root_Ptr->Index_Tab[Index_Id].Type = type; - Root_Ptr->Index_Tab[Index_Id].Max_Dif = max_dif; - Root_Ptr->Index_Tab[Index_Id].Nb_Equ = nb_equ + 1; - - return( NDS_OK); -} - - - - - -/*----------------------------------------------------------------------------*/ -/* Retourne la profondeur de la plus grande branche à partir d'un noeud */ -/*----------------------------------------------------------------------------*/ -/* (I) Node : pointeur sur le noeud */ -/*----------------------------------------------------------------------------*/ - -long ND_Tree_MaxDepth_Get( NDT_Node *Node_Ptr) -{ - long Max_Left, Max_Right; - - - if( !Node_Ptr) return( 0); - - Max_Left = ND_Tree_MaxDepth_Get( Node_Ptr->Left); - - Max_Right = ND_Tree_MaxDepth_Get( Node_Ptr->Right); - - return( NDD_MAX( Max_Left, Max_Right) + 1 ); -} - -/*----------------------------------------------------------------------------*/ -/* Retourne la profondeur de la plus petite branche à partir d'un noeud */ -/*----------------------------------------------------------------------------*/ -/* (I) Node : pointeur sur le noeud */ -/*----------------------------------------------------------------------------*/ - -long ND_Tree_MinDepth_Get( NDT_Node *Node_Ptr) -{ - long Min_Left, Min_Right; - - - if( !Node_Ptr) return( 0); - - Min_Left = ND_Tree_MinDepth_Get( Node_Ptr->Left); - - Min_Right = ND_Tree_MinDepth_Get( Node_Ptr->Right); - - return( NDD_MIN( Min_Left, Min_Right) + 1 ); -} - - - - - -/*----------------------------------------------------------------------------*/ -/* Ajoute un noeud à un arbre */ -/*----------------------------------------------------------------------------*/ -/* (I) Root : pointeur sur la racine de l'arbre */ -/* (I) Node : pointeur sur le noeud à ajouter */ -/*----------------------------------------------------------------------------*/ - -/*------------------------------ Recursive Kernel ----------------------------*/ - -void ND_Tree_Node_Recursive_Add( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id, NDT_Node *Parent_Node, NDT_Node **Node_Ptr_Ptr, long Depth, NDT_Node *New_Node_Ptr ) -{ - if( *Node_Ptr_Ptr) - { - /* Appel récursif */ - - if( ND_Manager_Exec_I( Root_Ptr, Index_Id, (*Node_Ptr_Ptr), NDD_CMD_VALUE_COMP, New_Node_Ptr->Value, (*Node_Ptr_Ptr)->Value, NULL) == NDS_LOWER) - ND_Tree_Node_Recursive_Add( Root_Ptr, Index_Id, (*Node_Ptr_Ptr), &((*Node_Ptr_Ptr)->Left), Depth + 1, New_Node_Ptr); - else - ND_Tree_Node_Recursive_Add( Root_Ptr, Index_Id, (*Node_Ptr_Ptr), &((*Node_Ptr_Ptr)->Right), Depth + 1, New_Node_Ptr); - } - else - { - long Max_Depth, Min_Depth; - - /* Rattachement du nouveau noeud à l'arbre */ - - New_Node_Ptr->Root = Root_Ptr; - New_Node_Ptr->Index = Index_Id; - New_Node_Ptr->Parent = Parent_Node; - - *Node_Ptr_Ptr = New_Node_Ptr; - - /* Mise à jour des informations statistiques de la structure */ - - Root_Ptr->Index_Tab[Index_Id].Node_Number++; - - Max_Depth = ND_Tree_MaxDepth_Get( New_Node_Ptr); - - Min_Depth = ND_Tree_MinDepth_Get( New_Node_Ptr); - - if( Max_Depth + Depth - 1 > Root_Ptr->Index_Tab[Index_Id].Max_Depth) Root_Ptr->Index_Tab[Index_Id].Max_Depth = Max_Depth + Depth - 1; - - if( Min_Depth + Depth - 1 < Root_Ptr->Index_Tab[Index_Id].Min_Depth) Root_Ptr->Index_Tab[Index_Id].Min_Depth = Min_Depth + Depth - 1 ; - } -} - - - -/*-------------------------------- main body ---------------------------------*/ - -NDT_Status ND_Tree_Node_Add( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id, NDT_Node *Node_Ptr) -{ - ND_Tree_Node_Recursive_Add( Root_Ptr, Index_Id, NULL, &(Root_Ptr->Index_Tab[Index_Id].Head), 1, Node_Ptr); - - if( ND_INDEX_SUBTYPE_BALANCED_IS( Root_Ptr, Index_Id) && Root_Ptr->Index_Tab[Index_Id].Max_Depth - Root_Ptr->Index_Tab[Index_Id].Min_Depth > Root_Ptr->Index_Tab[Index_Id].Max_Dif) - return( ND_Tree_Equalize( Root_Ptr, Index_Id)); - - return( NDS_OK); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Ajoute tous les noeud d'une liste à un arbre */ -/*------------------------------------------------------------------------------*/ -/* (I) Tree_Root : pointeur sur la racine de l'arbre */ -/* (I) List_Root : pointeur sur la racine de la liste */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_Tree_List_Add( NDT_Root *Tree_Root_Ptr, NDT_Index_Id Tree_Index_Id, NDT_Root *List_Root_Ptr, NDT_Index_Id List_Index_Id) -{ - NDT_Status rc; - NDT_Node *node_ptr; - - - node_ptr = List_Root_Ptr->Index_Tab[List_Index_Id].Head; - - while( node_ptr) - { - rc = ND_Tree_Node_Add( Tree_Root_Ptr, Tree_Index_Id, node_ptr); - if( ND_ERROR( rc)) return( rc); - node_ptr = node_ptr->Right; - } - - return( NDS_OK); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Affiche toutes les informations d'une structure de données */ -/*------------------------------------------------------------------------------*/ -/* (I) Root : pointeur sur la racine de la structure */ -/*------------------------------------------------------------------------------*/ - -/*------------------------------- Recursive Kernel -----------------------------*/ - -void ND_Tree_Recursive_Print( NDT_Node *Node_Ptr, long Depth, FILE *Out) -{ - const int BRANCH_LEN = 4; - - - if( !Node_Ptr) return; - - if( Node_Ptr->Right) - { - ND_Tree_Recursive_Print( Node_Ptr->Right, Depth + 1, Out); - fprintf( Out, "%*s/\n", (int)(Depth * BRANCH_LEN - 1), ""); - } - - fprintf( Out, "%*s (%p) ", (int)((Depth - 1) * BRANCH_LEN), "", Node_Ptr); - -/* Affichage des toutes les informations (noeud et valeur) : - -if( Node->Root) fprintf( Out, "Root=%p ", Node->Root); -if( Node->Parent) fprintf( Out, "Parent=%p ", Node->Parent); -if( Node->Left) fprintf( Out, "Left=%p ", Node->Left); -if( Node->Right) fprintf( Out, "Right=%p ", Node->Right); - -fprintf( Out, "Value=["); -ND_Manager_Exec( Node->Root->Manager, NDD_CMD_PRINT_VALUE, Node->Value, Out); -fprintf( Out, "]\n"); -*/ - -/* Affichage de la valeur seule : */ - - ND_Manager_Exec_I( Node_Ptr->Root, Node_Ptr->Index, Node_Ptr, NDD_CMD_VALUE_PRINT, Node_Ptr->Value, Out, NULL); - fprintf( Out, "\n"); - - if( Node_Ptr->Left) - { - fprintf( Out, "%*s\\\n", (int)( Depth * BRANCH_LEN - 1), ""); - ND_Tree_Recursive_Print( Node_Ptr->Left, Depth + 1, Out); - } -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Function de comparaison de noeuds (pour le quick sort) */ -/*------------------------------------------------------------------------------*/ - -int ND_Node_Compare( void **Node1_Ptr_Ptr, void **Node2_Ptr_Ptr) -{ - NDT_Status rc; - - - rc = ND_Manager_Exec_I( ( ( NDT_Node *)( *Node1_Ptr_Ptr))->Root, ( ( NDT_Node *)(*Node1_Ptr_Ptr))->Index, *Node1_Ptr_Ptr, NDD_CMD_VALUE_COMP, ( (NDT_Node *) (*Node1_Ptr_Ptr))->Value, ( ( NDT_Node *)( *Node2_Ptr_Ptr))->Value, NULL); - - switch( (int)rc) - { - case NDS_EQUAL: return( 0); - case NDS_LOWER: return( -1); - case NDS_GREATER: return( 1); - - default: - { - sprintf( NDG_Base.Err_String, "Error ND_Node_Compare : incorrect return code from the manager: %d", rc); - ND_Error_Print(); - - return( 0); - } - } -} - - - - - -/*----------------------------------------------------------------------------*/ -/* Ordonne une liste chaînée : */ -/*----------------------------------------------------------------------------*/ -/* (I) Root : pointeur sur la racine de la liste à trier */ -/*----------------------------------------------------------------------------*/ - -NDT_Status ND_List_Sort( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id) -{ - int i; - NDT_Node *node_ptr; - void **tab; - - - if( Root_Ptr->Index_Tab[Index_Id].Node_Number < 2) return NDS_OK; - - /* Allocation d'un tableau de pointeur de noeuds */ - - tab = (void **)malloc( Root_Ptr->Index_Tab[Index_Id].Node_Number * sizeof( NDT_Node *)); - - /* On remplit le tableau avec les noeuds de la structure à trier */ - - i = 0; - node_ptr = Root_Ptr->Index_Tab[Index_Id].Head; - - while( node_ptr) - { - tab[i] = node_ptr; - node_ptr = node_ptr->Right; - i++; - } - - /* Tri du tableau de pointeurs de noeuds */ - - qsort( (void *)tab, (size_t)( Root_Ptr->Index_Tab[Index_Id].Node_Number), sizeof( NDT_Node *), ( int (*)( const void *, const void *))&ND_Node_Compare); - - /* On met à jour les liens entre les noeuds */ - - for( i = 0; i < Root_Ptr->Index_Tab[Index_Id].Node_Number; i++) - { - node_ptr = (NDT_Node *)tab[i]; - - node_ptr->Left = (i ? (NDT_Node *)( tab[i - 1]) : NULL); - node_ptr->Right = (i != Root_Ptr->Index_Tab[Index_Id].Node_Number - 1 ? (NDT_Node *)( tab[i + 1]) : NULL); - } - - Root_Ptr->Index_Tab[Index_Id].Head = (NDT_Node *)( tab[0]); - Root_Ptr->Index_Tab[Index_Id].Tail = (NDT_Node *)( tab[Root_Ptr->Index_Tab[Index_Id].Node_Number - 1]); - - /* Désallocation du tableau */ - - free(tab); - - return( NDS_OK); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Récupère le premier noeud dans un sous-arbre */ -/*------------------------------------------------------------------------------*/ -/* (I) Node : pointeur sur le noeud racine du sous-arbre */ -/*------------------------------------------------------------------------------*/ - -NDT_Node *ND_Tree_Node_First_Recursive_Get( NDT_Node *Node_Ptr) -{ - if( !Node_Ptr) return NULL; - - if( !Node_Ptr->Left) return( Node_Ptr); - - return( ND_Tree_Node_First_Recursive_Get( Node_Ptr->Left)); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Récupère le dernier noeud dans un sous-arbre */ -/*------------------------------------------------------------------------------*/ -/* (I) Node : pointeur sur le noeud racine du sous-arbre */ -/*------------------------------------------------------------------------------*/ - -NDT_Node *ND_Tree_Node_Last_Recursive_Get( NDT_Node *Node_Ptr) -{ - if( !Node_Ptr) return NULL; - - if( !Node_Ptr->Right) return( Node_Ptr); - - return ND_Tree_Node_Last_Recursive_Get( Node_Ptr->Right); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Redéfinition de la fonction malloc() avec retour de type NDT_Status */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_Default_Allocator( void **Ptr_Ptr, size_t Size, void *Data_Ptr) -{ - *Ptr_Ptr = malloc( Size); - - - if( !*Ptr_Ptr) return( NDS_ERRMEM); - - return( NDS_OK); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Redéfinition de la fonction free() avec retour de type NDT_Status */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_Default_Deallocator( void *Ptr, void *Data_Ptr) -{ - if( !Ptr) return( NDS_ERRAPI); - - free( Ptr); - - return( NDS_OK); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Function de vérification d'une liste : */ -/*------------------------------------------------------------------------------*/ - -void ND_List_Check( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id, int *Nb_Detected_Ptr, int *Nb_Corrected_Ptr, FILE *Out) -{ - /* On vérifie les liens entre les noeuds */ - - ND_List_Link_Check( Root_Ptr, Index_Id, Nb_Detected_Ptr, Nb_Corrected_Ptr, Out); - - /* On vérifie les valeurs des noeuds */ - - ND_Value_Check( Root_Ptr, Index_Id, Nb_Detected_Ptr, Nb_Corrected_Ptr, Out); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Function de vérification et correction des liens entre noeuds d'une liste */ -/*------------------------------------------------------------------------------*/ - -void ND_List_Link_Check( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id, int *Nb_Detected_Ptr, int *Nb_Corrected_Ptr, FILE *Out) -{ - NDT_Node *node_ptr; - int left2right_node_number = 0; - int right2left_node_number = 0; - - - /* - On commence à vérifier si l'on trouve le même nombre de noeuds - en parcourant la liste de droite à gauche, puis de gauche à droite - */ - - node_ptr = Root_Ptr->Index_Tab[Index_Id].Head; - - while( node_ptr) - { - left2right_node_number++; - node_ptr = node_ptr->Right; - } - - node_ptr = Root_Ptr->Index_Tab[Index_Id].Tail; - - while( node_ptr) - { - right2left_node_number++; - node_ptr = node_ptr->Left; - } - - /* Cas où tout est OK */ - - if( left2right_node_number == Root_Ptr->Index_Tab[Index_Id].Node_Number && left2right_node_number == right2left_node_number) return; - - /* Cas où le nombre de noeuds n'a simplement pas été mis à jour au niveau de la racine */ - - if( left2right_node_number == right2left_node_number) - { - Root_Ptr->Index_Tab[Index_Id].Node_Number = left2right_node_number; - fprintf( Out, "\t- number of node has been corrected on structure %p:%d\n", Root_Ptr, Index_Id); - (*Nb_Detected_Ptr)++; - (*Nb_Corrected_Ptr)++; - return; - } - - /* Cas où le parcours de gauche à droite est plus complet : il manque un lien 'Left' */ - - if( left2right_node_number > right2left_node_number) - { - node_ptr = Root_Ptr->Index_Tab[Index_Id].Head; - - while( node_ptr) - { - if( node_ptr->Right && ( node_ptr->Right->Left != node_ptr)) - { - fprintf( Out, "\t- link 'Left' has been corrected on node %p of structure %p:%d\n", node_ptr->Right, Root_Ptr, Index_Id); - node_ptr->Right->Left = node_ptr; - (*Nb_Detected_Ptr)++; - (*Nb_Corrected_Ptr)++; - } - - if( !node_ptr->Right && ( node_ptr != Root_Ptr->Index_Tab[Index_Id].Tail)) - { - fprintf( Out, "\t- link 'Tail' has been corrected on structure %p:%d\n", Root_Ptr, Index_Id); - Root_Ptr->Index_Tab[Index_Id].Tail = node_ptr; - (*Nb_Detected_Ptr)++; - (*Nb_Corrected_Ptr)++; - } - - node_ptr = node_ptr->Right; - } - - if( Root_Ptr->Index_Tab[Index_Id].Node_Number != left2right_node_number) - { - fprintf( Out, "\t- number of node has been corrected on structure %p:%d\n", Root_Ptr, Index_Id); - Root_Ptr->Index_Tab[Index_Id].Node_Number = left2right_node_number; - (*Nb_Detected_Ptr)++; - (*Nb_Corrected_Ptr)++; - } - - return; - } - - /* Cas où le parcours de droite à gauche est plus complet : il manque un lien 'Right' */ - - if( right2left_node_number > left2right_node_number) - { - node_ptr = Root_Ptr->Index_Tab[Index_Id].Tail; - - while( node_ptr) - { - if( node_ptr->Left && ( node_ptr->Left->Right != node_ptr)) - { - fprintf( Out, "\t- link 'Right' has been corrected on node %p of list %p:%d\n", node_ptr->Left, Root_Ptr, Index_Id); - node_ptr->Left->Right = node_ptr; - (*Nb_Detected_Ptr)++; - (*Nb_Corrected_Ptr)++; - } - - if( !node_ptr->Left && ( node_ptr != Root_Ptr->Index_Tab[Index_Id].Head)) - { - fprintf( Out, "\t- link 'Head' has been corrected on the structure root %p:%d\n", Root_Ptr, Index_Id); - Root_Ptr->Index_Tab[Index_Id].Head = node_ptr; - (*Nb_Detected_Ptr)++; - (*Nb_Corrected_Ptr)++; - } - - node_ptr = node_ptr->Left; - } - - if( Root_Ptr->Index_Tab[Index_Id].Node_Number != right2left_node_number) - { - fprintf( Out, "\t- number of node has been corrected on structure %p:%d\n", Root_Ptr, Index_Id); - Root_Ptr->Index_Tab[Index_Id].Node_Number = right2left_node_number; - (*Nb_Detected_Ptr)++; - (*Nb_Corrected_Ptr)++; - } - } -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Function de vérification des valeurs des noeuds d'une liste */ -/*------------------------------------------------------------------------------*/ - -void ND_Value_Check( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id, int *Nb_Detected, int *Nb_Corrected, FILE *Out) -{ - NDT_Node *node_ptr, *next_node_ptr; - - - /* Chaque noeud sans valeur est purement et simplement supprimé de la liste */ - - ND_Index_Node_First_Get_I( &node_ptr, Root_Ptr, Index_Id); - - while( node_ptr) - { - ND_Index_Node_Next_Get_I( &next_node_ptr, node_ptr); - - if( !node_ptr->Value) - { - fprintf( Out, "\t- node %p has been removed from structure %p:%d because no value is attached to it\n", node_ptr, Root_Ptr, Index_Id); - - ND_Index_Node_Remove_I( node_ptr); - - node_ptr = next_node_ptr; - - (*Nb_Detected)++; - (*Nb_Corrected)++; - } - else if( ND_Address_Check( node_ptr->Value) != NDS_OK) - { - fprintf (Out, "\t- node %p has been removed from structure %p:%d because its value cannot be accessed\n", node_ptr, Root_Ptr, Index_Id); - - ND_Index_Node_Remove_I( node_ptr); - - node_ptr = next_node_ptr; - - (*Nb_Detected)++; - (*Nb_Corrected)++; - } - else ND_Index_Node_Next_Get( &node_ptr, node_ptr); - } -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Function de vérification d'un arbre : */ -/*------------------------------------------------------------------------------*/ - -void ND_Tree_Check( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id, int *Nb_Detected_Ptr, int *Nb_Corrected_Ptr, FILE *Out) -{ - /* On vérifie les liens entre les noeuds */ - - ND_Tree_Link_Check( Root_Ptr, Index_Id, Nb_Detected_Ptr, Nb_Corrected_Ptr, Out); - - /* On vérifie les valeurs attachées aux noeuds */ - - ND_Value_Check( Root_Ptr, Index_Id, Nb_Detected_Ptr, Nb_Corrected_Ptr, Out); - - /* On met à jour les informations statistiques de la racine */ - - Root_Ptr->Index_Tab[Index_Id].Max_Depth = ND_Tree_MaxDepth_Get( Root_Ptr->Index_Tab[Index_Id].Head); - Root_Ptr->Index_Tab[Index_Id].Min_Depth = ND_Tree_MaxDepth_Get( Root_Ptr->Index_Tab[Index_Id].Head); -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Function de vérification et correction des liens entre noeuds d'un arbre */ -/*------------------------------------------------------------------------------*/ - -void ND_Tree_Link_Check( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id, int *Nb_Detected_Ptr, int *Nb_Corrected_Ptr, FILE *Out) -{ - /* On vérifie les liens 'Parent' et les liens 'Root' de chaque noeud */ - - if( Root_Ptr->Index_Tab[Index_Id].Head) - { - if( Root_Ptr->Index_Tab[Index_Id].Head->Root != Root_Ptr) - { - Root_Ptr->Index_Tab[Index_Id].Head->Root = Root_Ptr; - fprintf( Out, "\t- link 'Root' has been corrected on node %p of structure %p:%d\n", Root_Ptr->Index_Tab[Index_Id].Head, Root_Ptr, Index_Id); - (*Nb_Detected_Ptr)++; - (*Nb_Corrected_Ptr)++; - } - - ND_Tree_Link_Recursive_Check( Root_Ptr->Index_Tab[Index_Id].Head, Nb_Detected_Ptr, Nb_Corrected_Ptr, Out); - } - - /* - On vérifie si le lien 'Save' contient un noeud (cela signifie - que la procédure ND_Node_Remove n'a pas été jusqu'à son terme). - */ - - if( Root_Ptr->Index_Tab[Index_Id].Save) - { - NDT_Node *node_ptr; - - - /* On attache le noeud contenu dans 'Save' à l'arbre s'il n'existe pas déjà */ - - if( ND_Index_Node_Find_I( &node_ptr, Root_Ptr, Index_Id, Root_Ptr->Index_Tab[Index_Id].Save->Value, NULL) != NDS_OK) - { - ND_Index_Node_Add_I( Root_Ptr, Index_Id, Root_Ptr->Index_Tab[Index_Id].Save); - fprintf( Out, "\t- saved node %p has been restored to structure %p:%d\n", Root_Ptr->Index_Tab[Index_Id].Save, Root_Ptr, Index_Id); - (*Nb_Detected_Ptr)++; - (*Nb_Corrected_Ptr)++; - } - - Root_Ptr->Index_Tab[Index_Id].Save = NULL; - } -} - - - -/*------------------------------ Recursive Kernel ------------------------------*/ - -void ND_Tree_Link_Recursive_Check( NDT_Node *Node_Ptr, int *Nb_Detected_Ptr, int *Nb_Corrected_Ptr, FILE *Out) -{ - if( Node_Ptr->Left) - { - if( Node_Ptr->Left->Root != Node_Ptr->Root) - { - Node_Ptr->Left->Root = Node_Ptr->Root; - fprintf( Out, "\t- link 'Root' has been corrected on node %p of structure %p:%d\n", Node_Ptr->Left, Node_Ptr->Root, Node_Ptr->Index); - (*Nb_Detected_Ptr)++; - (*Nb_Corrected_Ptr)++; - } - - if( Node_Ptr->Left->Parent != Node_Ptr) - { - Node_Ptr->Left->Parent = Node_Ptr; - fprintf( Out, "\t- link 'Parent' has been corrected on node %p of structure %p:%d\n", Node_Ptr->Left, Node_Ptr->Root, Node_Ptr->Index); - (*Nb_Detected_Ptr)++; - (*Nb_Corrected_Ptr)++; - } - - /* Appel récursif */ - - ND_Tree_Link_Recursive_Check( Node_Ptr->Left, Nb_Detected_Ptr, Nb_Corrected_Ptr, Out); - } - - if( Node_Ptr->Right) - { - if( Node_Ptr->Right->Root != Node_Ptr->Root) - { - Node_Ptr->Right->Root = Node_Ptr->Root; - fprintf( Out, "\t- link 'Root' has been corrected on node %p of structure %p:%d\n", Node_Ptr->Right, Node_Ptr->Root, Node_Ptr->Index); - (*Nb_Detected_Ptr)++; - (*Nb_Corrected_Ptr)++; - } - - if( Node_Ptr->Right->Parent != Node_Ptr) - { - Node_Ptr->Right->Parent = Node_Ptr; - fprintf( Out, "\t- link 'Parent' has been corrected on node %p of structure %p:%d\n", Node_Ptr->Right, Node_Ptr->Root, Node_Ptr->Index); - (*Nb_Detected_Ptr)++; - (*Nb_Corrected_Ptr)++; - } - - /* Appel récursif */ - - ND_Tree_Link_Recursive_Check( Node_Ptr->Right, Nb_Detected_Ptr, Nb_Corrected_Ptr, Out); - } -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Target address access try */ -/*------------------------------------------------------------------------------*/ - -NDT_Status ND_Address_Check( void *Address) -{ -#if !defined(_WIN32) - NDT_Status status; - int rc; - int test; - struct sigaction act = {0}, oact_bus, oact_segv; - - act.sa_handler = ND_Signal_Trap; - - NDG_Base.Sig_Trapped = 0; - - - - /* Trap SIGBUS and SIGSEGV */ - - if( ( rc = sigaction( SIGBUS, &act, &oact_bus)) != 0) - { - sprintf( NDG_Base.Err_String, "Error ND_Address_Check: sigaction (Add SIGBUS Hdl) rc: %d errno: %d", rc, errno); - ND_Error_Print(); - - return( NDS_KO); - } - - if( ( rc = sigaction( SIGSEGV, &act, &oact_segv)) != 0) - { - sprintf( NDG_Base.Err_String, "Error ND_Address_Check: sigaction (Add SIGSEGV Hdl) rc: %d errno: %d", rc, errno); - ND_Error_Print(); - - return( NDS_KO); - } - - - - /* Target address access try */ - - if( sigsetjmp( NDG_Base.SigLongJmp_Env, 1) == 0 ) - { - test = *( (int *)Address); - - status = NDS_OK; - } - else - { - status = NDS_KO; - } - - - - /* Untrap SIGBUS and SIGSEGV */ - - if( ( rc = sigaction( SIGBUS, &oact_bus, &act)) != 0) - { - sprintf( NDG_Base.Err_String, "Error ND_Address_Check: sigaction (Remove SIGBUS Hdl) rc: %d errno: %d", rc, errno); - ND_Error_Print(); - - return( NDS_KO); - } - - if( ( rc = sigaction( SIGSEGV, &oact_segv, &act)) != 0) - { - sprintf( NDG_Base.Err_String, "Error ND_Address_Check: sigaction (Remove SIGSEGV Hdl) rc: %d errno: %d", rc, errno); - ND_Error_Print(); - - return( NDS_KO); - } - - return( status); -#else - NDT_Status status; - int test; - void (__cdecl *old_sigsegv_sighandler)(int); - - - NDG_Base.Sig_Trapped = 0; - - - - /* Trap SIGSEGV */ - - if( ( old_sigsegv_sighandler = signal( SIGSEGV, ND_Signal_Trap)) == SIG_ERR) - { - sprintf( NDG_Base.Err_String, "Error ND_Address_Check: signal (Add SIGSEGV Hdl) errno: %d", errno); - ND_Error_Print(); - - return( NDS_KO); - } - - - - /* Target address access try */ - - if( setjmp( NDG_Base.SigLongJmp_Env) == 0 ) - { - test = *( (int *)Address); - - status = NDS_OK; - } - else - { - status = NDS_KO; - } - - - - /* Untrap SIGSEGV */ - - if( ( old_sigsegv_sighandler = signal( SIGSEGV, old_sigsegv_sighandler)) == SIG_ERR) - { - sprintf( NDG_Base.Err_String, "Error ND_Address_Check: signal (Remove SIGSEGV Hdl) errno: %d", errno); - ND_Error_Print(); - - return( NDS_KO); - } - - return( status); -#endif -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Trap d'un signal */ -/*------------------------------------------------------------------------------*/ - -void ND_Signal_Trap( int Sig_Num) -{ - NDG_Base.Sig_Trapped = Sig_Num; - -#if !defined(_WIN32) - siglongjmp( NDG_Base.SigLongJmp_Env, 1); -#else - longjmp( NDG_Base.SigLongJmp_Env, 1); -#endif -} - - - - - -/*------------------------------------------------------------------------------*/ -/* Routine d'affichage d'un message d'erreur */ -/*------------------------------------------------------------------------------*/ - -void ND_Error_Print( void) -{ - if( NDG_Base.Err_Stream) fprintf( ( NDG_Base.Err_Stream == (FILE *)-1 ) ? stderr : NDG_Base.Err_Stream, "%s\n", NDG_Base.Err_String); -} diff --git a/libnode.h b/libnode.h deleted file mode 100644 index e6343b8..0000000 --- a/libnode.h +++ /dev/null @@ -1,347 +0,0 @@ -/*---------------------------------------------------------------------------------*/ -/* $RCSfile: libnode.h,v $ */ -/*---------------------------------------------------------------------------------*/ -/* $Revision: 2.10 $ */ -/* $Name: libnode-2_2_0-1 $ */ -/* $Date: 2010/06/06 21:26:31 $ */ -/* $Author: agibert $ */ -/*---------------------------------------------------------------------------------*/ - -/*---------------------------------------------------------------------------------*/ -/* This file is part of LibNode */ -/* */ -/* LibNode is free software; you can redistribute it and/or modify */ -/* it under the terms of the GNU Lesser General Public Licence as published by */ -/* the Free Software Foundation; either version 2.1 of the License, or */ -/* (at your option) any later version. */ -/* */ -/* LibNode 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 Lesser General Public License for more details. */ -/* */ -/* You should have received a copy of the GNU Lesser General Public License */ -/* along with LibNode; if not, write to the Free Software */ -/* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/*---------------------------------------------------------------------------------*/ - - - - - -#include -#include -#include -#include -#include -#include -#include - - - -/* Utilisation des API de la LIBNODE sans vérification des arguments */ - -#define ND_MODE 1 - -#include - - - - - - - -#ifdef __linux -# define NDD_PRINTF_PTR_PREFIX "" -#else -# define NDD_PRINTF_PTR_PREFIX "0x" -#endif - - - - - -#define NDD_HUGE_LONG ( long) 0xFFFFFFL - - - -/* Table des symboles locale */ - -struct NDT_Symbol; - -typedef struct NDT_Symbol -{ - void *Ptr; - char *Name; - struct NDT_Symbol *Next; -} NDT_Symbol; - - - -/* LibNode Global Base Structure */ - -typedef struct NDT_Base -{ - int Open_Status; - int Debug_Mode; - char Err_String[512]; - FILE *Err_Stream; - int Sig_Trapped; -#if !defined(_WIN32) - sigjmp_buf SigLongJmp_Env; -#else - jmp_buf SigLongJmp_Env; -#endif - NDT_Symbol *Symbol_First_Ptr; - void *DL_Ptr; - NDT_Index_Type OpenStruct_Index_Type[1]; - NDT_Root *OpenStruct_Ptr; -} NDT_Base; - -NDT_Base NDG_Base = -{ - NDD_FALSE, - NDD_TRUE, - "", - (FILE *) -1, - 0, - {0}, - (NDT_Symbol *) NULL, - NULL, - { NDD_INDEX_STATUS_OPENED | NDD_INDEX_TYPE_LIST | NDD_INDEX_SUBTYPE_FIFO}, - (NDT_Root *) NULL -}; - - - - - -/*------------------------------------------------------------------------------*/ -/*------------------------------------------------------------------------------*/ -/* Fonctions et procédures privées de la librairie (moyen niveau) */ -/*------------------------------------------------------------------------------*/ -/*------------------------------------------------------------------------------*/ - -/*------------------------------------------------------------------------------*/ -/* Manager par défaut */ -/*------------------------------------------------------------------------------*/ -/* (I) va_list Arguments : Liste d'arguments contextuels */ -/*------------------------------------------------------------------------------*/ -NDT_Status ND_Default_Manager( NDT_Root *, NDT_Index_Id, NDT_Node *, NDT_Command, va_list *); - -/*------------------------------------------------------------------------------*/ -/* OpenStruct Manager */ -/*------------------------------------------------------------------------------*/ -/* (I) va_list Arguments : Liste d'arguments contextuels */ -/*------------------------------------------------------------------------------*/ -NDT_Status ND_OpenStruct_Manager( NDT_Root *, NDT_Index_Id, NDT_Node *, NDT_Command, va_list *); - -/*------------------------------------------------------------------------------*/ -/* Redéfinition de la fonction malloc() avec retour de type NDT_Status */ -/*------------------------------------------------------------------------------*/ -NDT_Status ND_Default_Allocator( void **, size_t, void *); - -/*------------------------------------------------------------------------------*/ -/* Redéfinition de la fonction free() avec retour de type NDT_Status */ -/*------------------------------------------------------------------------------*/ -NDT_Status ND_Default_Deallocator( void *, void *); - -/*------------------------------------------------------------------------------*/ -/* Création d'un noeud */ -/*------------------------------------------------------------------------------*/ -/* (I) Root : adresse de la racine pour laquelle on crée un noeud */ -/* (O) New_Node : adresse du pointeur sur le nouveau noeud */ -/*------------------------------------------------------------------------------*/ -NDT_Status ND_Node_Alloc( NDT_Root * Root, NDT_Node ** New_Node); - -/*------------------------------------------------------------------------------*/ -/* Destruction d'un noeud */ -/*------------------------------------------------------------------------------*/ -/* (I) Root : adresse de la racine dans laquelle on détruit un noeud */ -/* (I) Node : pointeur sur le noeud à détruire */ -/*------------------------------------------------------------------------------*/ -NDT_Status ND_Node_Free( NDT_Root *, NDT_Node *); - -/*------------------------------------------------------------------------------*/ -/* Création d'une nouvelle structure de données */ -/*------------------------------------------------------------------------------*/ -/* (O) Root: adresse d'un pointeur sur la racine de la nouvelle structure */ -/* (I) Type: type de la structure.de données (liste ou arbre binaire) */ -/* (I) Allocator: pointeur vers la fonction d'allocation */ -/* (I) Deallocator: pointeur vers la fonction de désallocation */ -/* (I) Data : pointeur de données utiles à l'allocateur */ -/* (I) Own_Value : indique si la structure est propriétaire de ses valeurs */ -/*------------------------------------------------------------------------------*/ -NDT_Status ND_Index_Clear( NDT_Root *, NDT_Index_Id); - -/*------------------------------------------------------------------------------*/ -/* Création de la racine d'une structure de données quelconque */ -/*------------------------------------------------------------------------------*/ -/* (O) New_Root : adresse du pointeur sur la nouvelle racine */ -/* (I) Type : type de la structure de données */ -/* (I) Allocater : pointeur vers la fonction d'allocation */ -/* (I) Deallocater : pointeur vers la fonction de désallocation */ -/* (I) Data : pointeur de données utiles à l'allocateur */ -/*------------------------------------------------------------------------------*/ -NDT_Status ND_Node_Root_Alloc( NDT_Root **, NDT_Index_Nb, NDT_Index_Type[], char *, NDT_Manager *, char *, NDT_Allocator *, char *, NDT_Deallocator *, short, void *); - -/*------------------------------------------------------------------------------*/ -/* Destruction d'une racine */ -/*------------------------------------------------------------------------------*/ -/* (I) Root : pointeur sur la racine à détruire */ -/*------------------------------------------------------------------------------*/ -NDT_Status ND_Node_Root_Free( NDT_Root *); - -/*------------------------------------------------------------------------------*/ -/* Ajout d'un noeud à une liste chaînée */ -/*------------------------------------------------------------------------------*/ -/* (I) Root : pointeur sur la racine de la liste */ -/* (I) New_Node : pointeur sur le noeud à ajouter */ -/*------------------------------------------------------------------------------*/ -NDT_Status ND_List_Node_Add( NDT_Root *, NDT_Index_Id, NDT_Node *); - -/*------------------------------------------------------------------------------*/ -/* Ajout d'une nouvelle valeur à une liste */ -/*------------------------------------------------------------------------------*/ -/* (I) Root : pointeur sur la racine de la liste */ -/* (I) Value : pointeur sur la valeur à ajouter */ -/*------------------------------------------------------------------------------*/ -NDT_Status ND_List_Value_Add( NDT_Root *, NDT_Index_Id, void *); - -/*------------------------------------------------------------------------------*/ -/* Ajout d'un noeud à un arbre binaire */ -/*------------------------------------------------------------------------------*/ -/* (I) Root : pointeur sur la racine de l'arbre */ -/* (I) Value : pointeur sur la valeur à ajouter */ -/*------------------------------------------------------------------------------*/ -NDT_Status ND_Tree_Value_Add( NDT_Root *, NDT_Index_Id, void *); - -/*------------------------------------------------------------------------------*/ -/* Supprime le noeud d'une liste */ -/*------------------------------------------------------------------------------*/ -/* (I) Node : pointeur sur le noeud à supprimer */ -/*------------------------------------------------------------------------------*/ -NDT_Status ND_List_Node_Remove( NDT_Node *); - -/*------------------------------------------------------------------------------*/ -/* Conversion d'une structure en liste chaînée */ -/*------------------------------------------------------------------------------*/ -/* (I) Root : pointeur sur la racine du la structure à convertir */ -/*------------------------------------------------------------------------------*/ -NDT_Status ND_List_Make( NDT_Root *, NDT_Index_Id); - -/*------------------------------------------------------------------------------*/ -/* Recherche une valeur dans une liste et retourne le noeud correspondant */ -/*------------------------------------------------------------------------------*/ -NDT_Node *ND_List_Node_Find( NDT_Root *, NDT_Index_Id, void *, va_list *); - -/*------------------------------------------------------------------------------*/ -/* Recherche un noeud dans un arbre et retourne le pointeur sur le noeud */ -/*------------------------------------------------------------------------------*/ -NDT_Node *ND_Tree_Node_Find( NDT_Root *, NDT_Index_Id, void *, va_list *); - -/*------------------------------------------------------------------------------*/ -/* Conversion d'une structure en arbre binaire */ -/*------------------------------------------------------------------------------*/ -/* (I) Root : pointeur sur la racine du la structure à convertir */ -/* (I) Type : type du futur arbre */ -/*------------------------------------------------------------------------------*/ -NDT_Status ND_Tree_Make( NDT_Root *, NDT_Index_Id); - -/*------------------------------------------------------------------------------*/ -/* Equilibrage d'un arbre */ -/*------------------------------------------------------------------------------*/ -/* (I) Root : pointeur sur la racine de l'arbre */ -/*------------------------------------------------------------------------------*/ -NDT_Status ND_Tree_Equalize( NDT_Root *, NDT_Index_Id); - -/*------------------------------------------------------------------------------*/ -/* Retourne la profondeur de la plus grande branche à partir d'un noeud */ -/*------------------------------------------------------------------------------*/ -/* (I) Node : pointeur sur le noeud */ -/*------------------------------------------------------------------------------*/ -long ND_Tree_MaxDepth_Get( NDT_Node *); - -/*------------------------------------------------------------------------------*/ -/* Retourne la profondeur de la plus petite branche à partir d'un noeud */ -/*------------------------------------------------------------------------------*/ -/* (I) Node : pointeur sur le noeud */ -/*------------------------------------------------------------------------------*/ -long ND_Tree_MinDepth_Get( NDT_Node *); - -/*------------------------------------------------------------------------------*/ -/* Ajout d'un noeud à un arbre binaire */ -/*------------------------------------------------------------------------------*/ -/* (I) Root : pointeur sur la racine de l'arbre */ -/* (I) Node : pointeur sur le noeud à ajouter */ -/*------------------------------------------------------------------------------*/ -NDT_Status ND_Tree_Node_Add( NDT_Root *, NDT_Index_Id, NDT_Node *); - -/*------------------------------------------------------------------------------*/ -/* Ajoute tous les noeud d'une liste à un arbre */ -/*------------------------------------------------------------------------------*/ -/* (I) Tree_Root : pointeur sur la racine de l'arbre */ -/* (I) List_Root : pointeur sur la racine de la liste */ -/*------------------------------------------------------------------------------*/ -NDT_Status ND_Tree_List_Add( NDT_Root *, NDT_Index_Id, NDT_Root *, NDT_Index_Id); - -/*------------------------------------------------------------------------------*/ -/* Fonction de comparaison de noeuds (pour le quick sort) */ -/*------------------------------------------------------------------------------*/ -int ND_Node_Compare( void **, void **); - -/*------------------------------------------------------------------------------*/ -/* Ordonne une liste chaînée selon l'algorithme du tri à bulle */ -/*------------------------------------------------------------------------------*/ -/* (I) Root : pointeur sur la racine de la liste à trier */ -/*------------------------------------------------------------------------------*/ -NDT_Status ND_List_Sort( NDT_Root *, NDT_Index_Id); - - - - - - -/*------------------------------------------------------------------------------*/ -/*------------------------------------------------------------------------------*/ -/* PRIVATE FUNCTIONS */ -/*------------------------------------------------------------------------------*/ -/*------------------------------------------------------------------------------*/ - -void ND_List_Check( NDT_Root *, NDT_Index_Id, int *, int *, FILE *); - -void ND_List_Link_Check( NDT_Root *, NDT_Index_Id, int *, int *, FILE *); - -void ND_Value_Check( NDT_Root *, NDT_Index_Id, int *, int *, FILE *); - -void ND_Tree_Check( NDT_Root *, NDT_Index_Id, int *, int *, FILE *); - -void ND_Tree_Link_Check( NDT_Root *, NDT_Index_Id, int *, int *, FILE *); - -NDT_Status ND_List_Recursive_Make( NDT_Node *, NDT_Root *, NDT_Index_Id); - -NDT_Node *ND_Tree_Recursive_Make( long, long, NDT_Node *); - -void ND_Tree_Node_Recursive_Add( NDT_Root *, NDT_Index_Id, NDT_Node *, NDT_Node **, long , NDT_Node *); - -NDT_Node *ND_Tree_Node_First_Recursive_Get( NDT_Node *); - -NDT_Node *ND_Tree_Node_Last_Recursive_Get( NDT_Node *); - -NDT_Node *ND_Tree_Node_Recursive_Find( NDT_Node *, void *, va_list *); - -NDT_Node *ND_Tree_Parent_Next_Recursive_Get( NDT_Node *); - -NDT_Node *ND_Tree_Parent_Previous_Recursive_Get( NDT_Node *); - -void ND_Tree_Recursive_Print( NDT_Node *, long, FILE *); - -void ND_Tree_Link_Recursive_Check( NDT_Node *, int *, int *, FILE *); - -NDT_Status ND_Symbol_Find( void **, const char *); - -void ND_Error_Print( void); - -void ND_Signal_Trap( int); - -NDT_Status ND_Address_Check( void *); diff --git a/lv2_plugin.c b/lv2_plugin.c index 9687989..2442f7e 100644 --- a/lv2_plugin.c +++ b/lv2_plugin.c @@ -19,6 +19,8 @@ /* along with Drummer. If not, see . */ /*----------------------------------------------------------------------------*/ + + /*----------------------------------------------------------------------------*/ /* Includes */ /*----------------------------------------------------------------------------*/ @@ -38,106 +40,6 @@ static int current_kit_changed = 0; -/*----------------------------------------------------------------------------*/ -/* DR_LV2_Log_Write */ -/*----------------------------------------------------------------------------*/ - -DRT_Status DR_LV2_Log_Write( DRT_Log_Type_Id Log_Type_Id, char *Out_Fmt, va_list Args) -{ - LV2_URID type; - - - switch( Log_Type_Id) - { - case DRD_LOG_TYPE_ID_TRACE: - { - type = DRG_LV2_Base.Logger.Trace; - break; - } - - case DRD_LOG_TYPE_ID_INFO: - { - type = DRG_LV2_Base.Logger.Note; - break; - } - - case DRD_LOG_TYPE_ID_WARNING: - { - type = DRG_LV2_Base.Logger.Warning; - break; - } - - case DRD_LOG_TYPE_ID_ERROR: - case DRD_LOG_TYPE_ID_UNKNOWN: - default: - { - type = DRG_LV2_Base.Logger.Error; - break; - } - - - } - - if( lv2_log_vprintf( &(DRG_LV2_Base.Logger), type, Out_Fmt, Args) == 0) - { - fprintf( stderr, "LV2 logger error...\n"); - } - - return( DRS_OK); -} - - - - - -/*----------------------------------------------------------------------------*/ -/* */ -/*----------------------------------------------------------------------------*/ -/* -static inline void DR_LV2_Map_URIS( LV2_URID_Map *Map_Ptr, DRT_Drummer_URIS *URIS) -{ - URIS->Atom_Object = Map_Ptr->map( Map_Ptr->handle, LV2_ATOM__Object); - - URIS->String_URId = Map_Ptr->map( Map_Ptr->handle, LV2_ATOM__String); - URIS->Bool_URId = Map_Ptr->map( Map_Ptr->handle, LV2_ATOM__Bool); - URIS->Int_URId = Map_Ptr->map( Map_Ptr->handle, LV2_ATOM__Int); - URIS->Long_URId = Map_Ptr->map( Map_Ptr->handle, LV2_ATOM__Long); - URIS->Tuple_URId = Map_Ptr->map( Map_Ptr->handle, LV2_ATOM__Tuple); - - URIS->Midi_Event = Map_Ptr->map( Map_Ptr->handle, "http://lv2plug.in/ns/ext/midi#MidiEvent"); - - URIS->Atom_EventTransfer = Map_Ptr->map( Map_Ptr->handle, LV2_ATOM__eventTransfer); - - URIS->UI_Msg = Map_Ptr->map( Map_Ptr->handle, DRD_DRUMMER_URI "#uimsg"); - - URIS->UI_Enable = Map_Ptr->map( Map_Ptr->handle, DRD_DRUMMER_URI "#uienable"); - URIS->UI_Disable = Map_Ptr->map( Map_Ptr->handle, DRD_DRUMMER_URI "#uidisable"); - - URIS->Kit_Update_Request = Map_Ptr->map( Map_Ptr->handle, DRD_DRUMMER_URI "#kitupdaterequest"); - URIS->Kit_Update_Reply = Map_Ptr->map( Map_Ptr->handle, DRD_DRUMMER_URI "#kitupdatereply"); - - URIS->Velocity_Ignore_Flag_Toggle = Map_Ptr->map( Map_Ptr->handle, DRD_DRUMMER_URI "#velocitytoggle"); - URIS->Note_Off_Ignore_Flag_Toggle = Map_Ptr->map( Map_Ptr->handle, DRD_DRUMMER_URI "#noteofftoggle"); - -/* - URIS->kit_path = Map_Ptr->map( Map_Ptr->handle, DRD_DRUMMER_URI "#kitpath"); - URIS->get_state = Map_Ptr->map( Map_Ptr->handle, DRD_DRUMMER_URI "#getstate"); - URIS->midi_info = Map_Ptr->map( Map_Ptr->handle, DRD_DRUMMER_URI "#midiinfo"); - URIS->sample_trigger = Map_Ptr->map( Map_Ptr->handle, DRD_DRUMMER_URI "#sampletrigger"); - URIS->velocity_toggle = Map_Ptr->map( Map_Ptr->handle, DRD_DRUMMER_URI "#velocitytoggle"); - URIS->note_off_toggle = Map_Ptr->map( Map_Ptr->handle, DRD_DRUMMER_URI "#noteofftoggle"); - URIS->channel_id = Map_Ptr->map( Map_Ptr->handle, DRD_DRUMMER_URI "#channelid"); - URIS->zero_position = Map_Ptr->map( Map_Ptr->handle, DRD_DRUMMER_URI "#zeroposition"); - URIS->sample_add = Map_Ptr->map( Map_Ptr->handle, DRD_DRUMMER_URI "#sampleadd"); - URIS->sample_remove = Map_Ptr->map( Map_Ptr->handle, DRD_DRUMMER_URI "#sampleremove"); -*/ -/* -} - -*/ - - - /*----------------------------------------------------------------------------*/ /* */ /*----------------------------------------------------------------------------*/ @@ -189,7 +91,7 @@ DRT_Status DR_LV2_Kit_Sample_Load( DRT_Kit *Kit_Ptr) pthread_mutex_unlock( &( DRG_LV2_Base.Load_Mutex)); DRG_LV2_Base.Sample_Number = Kit_Ptr->Instrument_DS_Ptr->Index_Tab[NDD_INDEX_PRIMARY].Node_Number; - DR_LOG_INFO_1( "Loaded: (%d) instruments!", DRG_LV2_Base.Sample_Number); + LG_LOG_INFO_1( "Loaded: (%d) instruments!", DRG_LV2_Base.Sample_Number); // DR_Kit_Dump( Kit_Ptr, 0); } @@ -222,7 +124,7 @@ DRT_Status DR_LV2_CurKit_Sample_Load() if( kit_id == DRG_LV2_Base.Kit_Id) { - DR_LOG_INFO_5( "Same kit id: (%d) Bank/Program: (%d/%d/%d) Name: [%s]!", + LG_LOG_INFO_5( "Same kit id: (%d) Bank/Program: (%d/%d/%d) Name: [%s]!", kit_id, DRG_LV2_Base.Bank_Id_LSB_New, DRG_LV2_Base.Bank_Id_MSB_New, DRG_LV2_Base.Program_Id_New, DRG_LV2_Base.Kit_Ptr->Name); status = DRS_OK; } @@ -230,23 +132,23 @@ DRT_Status DR_LV2_CurKit_Sample_Load() { if( ( status = DR_Kit_Logical_Id_Find( &kit_ptr, kit_id)) != DRS_OK) { - DR_LOG_WARNING_4( "Can't find kit id: (%d) Bank/Program: (%d/%d/%d)!", + LG_LOG_WARNING_4( "Can't find kit id: (%d) Bank/Program: (%d/%d/%d)!", kit_id, DRG_LV2_Base.Bank_Id_LSB_New, DRG_LV2_Base.Bank_Id_MSB_New, DRG_LV2_Base.Program_Id_New); if( DRG_LV2_Base.Kit_Id == DRD_ID_UNKNOWN) { - DR_LOG_ERROR_0( "No Kit available!"); + LG_LOG_ERROR_0( "No Kit available!"); status = DRS_KO; } else { - DR_LOG_INFO_5( "Keep kit id: (%d) Bank/Program: (%d/%d/%d) Name: [%s]!", + LG_LOG_INFO_5( "Keep kit id: (%d) Bank/Program: (%d/%d/%d) Name: [%s]!", DRG_LV2_Base.Kit_Id, DRG_LV2_Base.Bank_Id_LSB, DRG_LV2_Base.Bank_Id_MSB, DRG_LV2_Base.Program_Id, DRG_LV2_Base.Kit_Ptr->Name); } } else { - DR_LOG_INFO_5( "New kit id: (%d) Bank/Program: (%d/%d/%d) Name: [%s]!", + LG_LOG_INFO_5( "New kit id: (%d) Bank/Program: (%d/%d/%d) Name: [%s]!", kit_id, DRG_LV2_Base.Bank_Id_LSB_New, DRG_LV2_Base.Bank_Id_MSB_New, DRG_LV2_Base.Program_Id_New, kit_ptr->Name); DRG_LV2_Base.Bank_Id_LSB = DRG_LV2_Base.Bank_Id_LSB_New; @@ -261,7 +163,7 @@ DRT_Status DR_LV2_CurKit_Sample_Load() DRG_LV2_Base.Kit_Updated_Flag = true; - DR_LOG_INFO_0( "Sample loaded!"); + LG_LOG_INFO_0( "Sample loaded!"); } } @@ -280,19 +182,19 @@ static void *DR_LV2_Load_Thread() DRT_Status status; - DR_LOG_INFO_0( "Start Load Thread!"); + LG_LOG_INFO_0( "Start Load Thread!"); for(;;) { pthread_mutex_lock( &( DRG_LV2_Base.Load_Mutex)); pthread_cond_wait( &( DRG_LV2_Base.Load_Cond), &( DRG_LV2_Base.Load_Mutex)); - DR_LOG_INFO_0( "Load_Thread: New load!"); + LG_LOG_INFO_0( "Load_Thread: New load!"); pthread_mutex_unlock( &(DRG_LV2_Base.Load_Mutex)); if( ( status = DR_LV2_CurKit_Sample_Load()) != DRS_OK) { - fprintf( stderr, "Can't load kit sample (%d)!", status); + LG_LOG_ERROR_1( "Can't load kit sample: (%d)", status); } pthread_mutex_lock( &(DRG_LV2_Base.Load_Mutex)); @@ -423,7 +325,7 @@ DRT_Status DR_UI_Port_Notify( LV2_URID URId, float Value) lv2_atom_forge_pop( &( DRG_LV2_Base.Forge), &set_frame); - DR_LOG_INFO_2( "Notify: URId: (%d) Value: (%d)!", URId, (int)Value); + LG_LOG_INFO_2( "Notify: URId: (%d) Value: (%d)!", URId, (int)Value); return( DRS_OK); } @@ -517,7 +419,7 @@ static inline void DR_Layer_To_Sample( DRT_Sample *Sample_Ptr, float Gain) Sample_Ptr->Limit = cur_layer_ptr->Sample_Size; Sample_Ptr->SF_Info_Ptr = cur_layer_ptr->SF_Info_Ptr; - DR_LOG_INFO_3( "Layer: (%d) MGain: (%f) Gain: (%f)", i, mapped_gain, Gain); + LG_LOG_INFO_3( "Layer: (%d) MGain: (%f) Gain: (%f)", i, mapped_gain, Gain); } @@ -534,7 +436,7 @@ static inline void DR_Sample_Trigger( int Sample_Id, uint8_t *const Data, uin // changed after the check that the midi-note is valid pthread_mutex_lock( &( DRG_LV2_Base.Load_Mutex)); - DR_LOG_INFO_2( "Trigger Sample: Id: (%d) Offset: (%d)", Sample_Id, Offset); + LG_LOG_INFO_2( "Trigger Sample: Id: (%d) Offset: (%d)", Sample_Id, Offset); if( ( Sample_Id >= 0) && ( Sample_Id < DRG_LV2_Base.Sample_Number)) @@ -562,7 +464,7 @@ static inline void DR_Sample_Trigger( int Sample_Id, uint8_t *const Data, uin DR_Layer_To_Sample( &(DRG_LV2_Base.Samples[Sample_Id]), DRG_LV2_Base.Samples[Sample_Id].Velocity); if( DRG_LV2_Base.Samples[Sample_Id].Limit == 0) - fprintf(stderr,"Failed to find layer at: %i for %f\n", Sample_Id, *( DRG_LV2_Base.Gains[ gain_idx])); + LG_LOG_ERROR_2( "Failed to find layer at: (%i) for: (%f)", Sample_Id, *( DRG_LV2_Base.Gains[ gain_idx])); } } @@ -583,13 +485,13 @@ static inline void DR_Sample_Untrigger( int Sample_Id, uint32_t Offset) if( DRG_LV2_Base.Sustain == true) { - DR_LOG_INFO_2( "Sustains Sample: Id: (%d) Offset: (%d)", Sample_Id, Offset); + LG_LOG_INFO_2( "Sustains Sample: Id: (%d) Offset: (%d)", Sample_Id, Offset); DRG_LV2_Base.Samples[Sample_Id].Sustained = true; } else { - DR_LOG_INFO_2( "UnTrigger Sample: Id: (%d) Offset: (%d)", Sample_Id, Offset); + LG_LOG_INFO_2( "UnTrigger Sample: Id: (%d) Offset: (%d)", Sample_Id, Offset); /* if (nn >= 0 && nn < drmr->num_samples) { @@ -645,20 +547,20 @@ static LV2_Handle DR_LV2_Instantiate( const LV2_Descriptor *LV2_Descripto const char *Bundle_Path, const LV2_Feature * const *LV2_Features_Ptr) { + LGT_Status lg_status; DRT_Status status; int i; -// DRT_LV2_Base *lv2_base_ptr; - fprintf( stderr, "LV2 Instantiate\n"); -/* - if( ( lv2_base_ptr = malloc( sizeof( DRT_LV2_Base))) == NULL) + if( ( lg_status = LG_Library_Open( LGD_LOG_WRITER_DEFAULT, true)) != LGS_OK) { - fprintf( stderr, "Can't allocate LV2 Base!\n"); - return( (LV2_Handle)NULL); + fprintf( stderr, "Can't open LibLog library: (%d)\n", status); + return( (LV2_Handle)NULL); } -*/ + LG_LOG_INFO_0( "LV2 instantiate start"); + + DRG_LV2_Base.Map_Ptr = NULL; DRG_LV2_Base.Logger.log = NULL; @@ -684,8 +586,8 @@ static LV2_Handle DR_LV2_Instantiate( const LV2_Descriptor *LV2_Descripto while( *LV2_Features_Ptr != NULL) { - fprintf( stderr, "Feature URI: [%s]\n", (*LV2_Features_Ptr)->URI); - + LG_LOG_INFO_1( "Feature URI: [%s]", (*LV2_Features_Ptr)->URI); + if( !strcmp( ( *LV2_Features_Ptr)->URI, LV2_URID_URI "#map")) { DRG_LV2_Base.Map_Ptr = (LV2_URID_Map *)( ( *LV2_Features_Ptr)->data); @@ -705,12 +607,12 @@ static LV2_Handle DR_LV2_Instantiate( const LV2_Descriptor *LV2_Descripto { if( DRG_LV2_Base.Map_Ptr == NULL) { - fprintf( stderr, "LV2 host does not support urid#map!\n"); + LG_LOG_WARNING_0( "LV2 host does not support urid#map!"); } if( DRG_LV2_Base.Logger.log == NULL) { - fprintf( stderr, "LV2 host does not support log#log!\n"); + LG_LOG_WARNING_0( "LV2 host does not support log#log!"); } } else @@ -719,22 +621,22 @@ static LV2_Handle DR_LV2_Instantiate( const LV2_Descriptor *LV2_Descripto lv2_log_logger_set_map( &(DRG_LV2_Base.Logger), DRG_LV2_Base.Map_Ptr); // if( ( status = DR_DataStruct_Init( DR_LV2_Log_Write, (DRT_SampleRate)SampleRate, DRD_THREAD_NUMBER_DEFAULT)) != DRS_OK) - if( ( status = DR_DataStruct_Init( DRD_LOG_WRITER_DEFAULT, (DRT_SampleRate)SampleRate, DRD_THREAD_NUMBER_DEFAULT)) != DRS_OK) + if( ( status = DR_DataStruct_Init( (DRT_SampleRate)SampleRate, DRD_THREAD_NUMBER_DEFAULT)) != DRS_OK) { - fprintf( stderr, "Can't init data structures (%d)!\n", status); + LG_LOG_ERROR_1( "Can't init data structures: (%d)!", status); } else { - lv2_log_error( &(DRG_LV2_Base.Logger), "Test error log <%s>!\n", "Krash!"); - DR_LOG_ERROR_1( "Test error log <%s>!", "Krash!"); + lv2_log_error( &(DRG_LV2_Base.Logger), "LV2Log: Test error log: [%s]!\n", "Krash!"); + LG_LOG_ERROR_1( "LibLog: Test error log: [%s]!", "Krash!"); if( pthread_mutex_init( &( DRG_LV2_Base.Load_Mutex), 0)) { - fprintf( stderr, "Could not initialize load_mutex!\n"); + LG_LOG_ERROR_0( "Could not initialize load_mutex!"); } else if( pthread_cond_init( &( DRG_LV2_Base.Load_Cond), 0)) { - fprintf( stderr, "Could not initialize load_cond!\n"); + LG_LOG_ERROR_0( "Could not initialize load_cond!"); } else { @@ -744,13 +646,13 @@ static LV2_Handle DR_LV2_Instantiate( const LV2_Descriptor *LV2_Descripto if( pthread_create( &DRG_LV2_Base.Load_Thread, 0, (void * (*)(void *))DR_LV2_Load_Thread, NULL)) { - fprintf( stderr, "Could not initialize loading thread!\n"); + LG_LOG_ERROR_0( "Could not initialize loading thread!"); } else { if( ( DRG_LV2_Base.Request_Buf = malloc( DRD_REQ_BUF_SIZE * sizeof(char *))) == NULL) { - fprintf( stderr, "Cant'allocate Request buffer!\n"); + LG_LOG_ERROR_0( "Can't allocate request buffer!"); } else { @@ -758,28 +660,25 @@ static LV2_Handle DR_LV2_Instantiate( const LV2_Descriptor *LV2_Descripto if( ( DRG_LV2_Base.Left = malloc( DRD_PORT_NUMBER_MAX * sizeof(float *))) == NULL) { - fprintf( stderr, "Cant'allocate Left buffer!\n"); -// free( lv2_base_ptr); - - return( NULL); + LG_LOG_ERROR_0( "Can't allocate left buffer!"); } else { if( ( DRG_LV2_Base.Right = malloc( DRD_PORT_NUMBER_MAX * sizeof(float *))) == NULL) { - fprintf( stderr, "Cant'allocate Right buffer!\n"); + LG_LOG_ERROR_0( "Can't allocate right buffer!"); } else { if( ( DRG_LV2_Base.Gains = malloc( DRD_PORT_NUMBER_MAX * sizeof(float *))) == NULL) { - fprintf( stderr, "Cant'allocate Gains buffer!\n"); + LG_LOG_ERROR_0( "Can't allocate gains buffer!"); } else { - if( ( DRG_LV2_Base.Pans = malloc( DRD_PORT_NUMBER_MAX * sizeof(float *))) == NULL) + if( ( DRG_LV2_Base.Pans = malloc( DRD_PORT_NUMBER_MAX * sizeof(float *))) == NULL) { - fprintf( stderr, "Cant'allocate Pans buffer!\n"); + LG_LOG_ERROR_0( "Can't allocate pans buffer!"); } else { @@ -791,17 +690,17 @@ static LV2_Handle DR_LV2_Instantiate( const LV2_Descriptor *LV2_Descripto if( ( status = DR_Kits_Load()) != DRS_OK) { - fprintf( stderr, "Can't load kits (%d)!\n", status); + LG_LOG_ERROR_1( "Can't load kits: (%d)!", status); } else { if( ( status = DR_LV2_CurKit_Sample_Load()) != DRS_OK) { - fprintf( stderr, "Can't load kit sample (%d)!\n", status); + LG_LOG_ERROR_1( "Can't load kit sample: (%d)!", status); } else { - DR_LOG_INFO_1( "DRG_Base_Ptr: (%lx)!", (char *)( &DRG_Base)); + LG_LOG_INFO_1( "DRG_Base_Ptr: (%lx)!", (char *)( &DRG_Base)); return( (LV2_Handle)&DRG_LV2_Base); } @@ -812,7 +711,6 @@ static LV2_Handle DR_LV2_Instantiate( const LV2_Descriptor *LV2_Descripto } free( DRG_LV2_Base.Right); - } free( DRG_LV2_Base.Left); @@ -827,6 +725,8 @@ static LV2_Handle DR_LV2_Instantiate( const LV2_Descriptor *LV2_Descripto } } + LG_LOG_INFO_0( "LV2 instantiate end"); + return( (LV2_Handle)NULL); } @@ -844,7 +744,7 @@ static void DR_LV2_Connect_Port( LV2_Handle Instance_Ptr, uint32_t Port_Id, v DRT_Port_Index port_index = (DRT_Port_Index)Port_Id; -// DR_LOG_INFO_1( "LV2 Connect Port (%d)!", Port_Id); +// LG_LOG_INFO_1( "LV2 Connect Port (%d)!", Port_Id); switch( port_index) { @@ -931,7 +831,7 @@ static void DR_LV2_Connect_Port( LV2_Handle Instance_Ptr, uint32_t Port_Id, v } else { - fprintf( stderr, "LV2 Connect Port: unknown port: (%d)!\n", Port_Id); + LG_LOG_ERROR_1( "LV2 Connect Port: unknown port: (%d)!", Port_Id); } break; @@ -949,7 +849,7 @@ static void DR_LV2_Connect_Port( LV2_Handle Instance_Ptr, uint32_t Port_Id, v static void DR_LV2_Activate( LV2_Handle instance) { - DR_LOG_INFO_0( "LV2 Activate!"); + LG_LOG_INFO_0( "LV2 Activate!"); } @@ -967,7 +867,7 @@ static void DR_LV2_Run( LV2_Handle Instance_Ptr, uint32_t N_Samples) DRT_LV2_Base *lv2_base_ptr = (DRT_LV2_Base *)Instance_Ptr; -// fprintf( stderr, "LV2 Run!\n"); +// LG_LOG_INFO_0( "LV2 Run!"); base_note = (int)floorf( *( DRG_Base.Base_Note_Ptr)); @@ -980,7 +880,7 @@ static void DR_LV2_Run( LV2_Handle Instance_Ptr, uint32_t N_Samples) LV2_ATOM_SEQUENCE_FOREACH( lv2_base_ptr->Control_Port, ev_ptr) { - DR_LOG_INFO_0( "LV2 Event!"); + LG_LOG_INFO_0( "LV2 Event!"); if( ev_ptr->body.type == lv2_base_ptr->URIS.Midi_Event) { @@ -1018,7 +918,7 @@ static void DR_LV2_Run( LV2_Handle Instance_Ptr, uint32_t N_Samples) if( nn == *( DRG_Base.Velocity_Ignore_Note_Ptr)) { *( DRG_Base.Velocity_Ignore_Flag_Ptr) = (float)( (int)*( DRG_Base.Velocity_Ignore_Flag_Ptr) ^ true); - DR_LOG_INFO_2( "Velocity Ignore: [%f] - [%f]", *( DRG_Base.Velocity_Ignore_Flag_Ptr), *( DRG_Base.Velocity_Ignore_Note_Ptr)); + LG_LOG_INFO_2( "Velocity Ignore: [%f] - [%f]", *( DRG_Base.Velocity_Ignore_Flag_Ptr), *( DRG_Base.Velocity_Ignore_Note_Ptr)); DR_UI_Port_Notify( DRG_LV2_Base.URIS.Velocity_Ignore_Flag_Toggle, *( DRG_Base.Velocity_Ignore_Flag_Ptr)); } @@ -1027,7 +927,7 @@ static void DR_LV2_Run( LV2_Handle Instance_Ptr, uint32_t N_Samples) if( nn == *( DRG_Base.Note_Off_Ignore_Note_Ptr)) { *( DRG_Base.Note_Off_Ignore_Flag_Ptr) = (float)( (int)*( DRG_Base.Note_Off_Ignore_Flag_Ptr) ^ true); - DR_LOG_INFO_2( "Note Off Ignore: [%f] - [%f]", *( DRG_Base.Note_Off_Ignore_Flag_Ptr), *( DRG_Base.Note_Off_Ignore_Note_Ptr)); + LG_LOG_INFO_2( "Note Off Ignore: [%f] - [%f]", *( DRG_Base.Note_Off_Ignore_Flag_Ptr), *( DRG_Base.Note_Off_Ignore_Note_Ptr)); DR_UI_Port_Notify( DRG_LV2_Base.URIS.Note_Off_Ignore_Flag_Toggle, *( DRG_Base.Note_Off_Ignore_Flag_Ptr)); } @@ -1038,7 +938,7 @@ static void DR_LV2_Run( LV2_Handle Instance_Ptr, uint32_t N_Samples) LV2_Atom_Forge_Frame set_frame; - DR_LOG_INFO_1( "Kit Update Reply: Kit_Id: (%d)", lv2_base_ptr->Kit_Id); + LG_LOG_INFO_1( "Kit Update Reply: Kit_Id: (%d)", lv2_base_ptr->Kit_Id); lv2_atom_forge_frame_time( &( DRG_LV2_Base.Forge), 0); @@ -1051,7 +951,7 @@ static void DR_LV2_Run( LV2_Handle Instance_Ptr, uint32_t N_Samples) } else { -// DR_LOG_INFO_1( "ZZZ Update Kit Name Tab: [%d]", nn); +// LG_LOG_INFO_1( "ZZZ Update Kit Name Tab: [%d]", nn); nn -= base_note; @@ -1072,7 +972,7 @@ static void DR_LV2_Run( LV2_Handle Instance_Ptr, uint32_t N_Samples) { case 0: // Bank MSB Select { - DR_LOG_INFO_1( "Bank MSB select: (%d)!", value); + LG_LOG_INFO_1( "Bank MSB select: (%d)!", value); lv2_base_ptr->Bank_Id_MSB_New = value; break; @@ -1080,7 +980,7 @@ static void DR_LV2_Run( LV2_Handle Instance_Ptr, uint32_t N_Samples) case 32: // Bank LSB Select { - DR_LOG_INFO_1( "Bank LSB select: (%d)!", value); + LG_LOG_INFO_1( "Bank LSB select: (%d)!", value); lv2_base_ptr->Bank_Id_LSB_New = value; break; @@ -1088,7 +988,7 @@ static void DR_LV2_Run( LV2_Handle Instance_Ptr, uint32_t N_Samples) case 64: // Sustain { - DR_LOG_INFO_1( "Sustain: (%d)!", value); + LG_LOG_INFO_1( "Sustain: (%d)!", value); if( value == 127) { @@ -1109,7 +1009,7 @@ static void DR_LV2_Run( LV2_Handle Instance_Ptr, uint32_t N_Samples) default: { - DR_LOG_WARNING_2( "Unhandled controler: (%d) value: (%d)!", controler, value); + LG_LOG_WARNING_2( "Unhandled controler: (%d) value: (%d)!", controler, value); break; } } @@ -1121,7 +1021,7 @@ static void DR_LV2_Run( LV2_Handle Instance_Ptr, uint32_t N_Samples) { value = data[1]; - DR_LOG_INFO_1( "Program change: (%d)!", value); + LG_LOG_INFO_1( "Program change: (%d)!", value); lv2_base_ptr->Program_Id_New = value; @@ -1140,7 +1040,7 @@ static void DR_LV2_Run( LV2_Handle Instance_Ptr, uint32_t N_Samples) } else if( ev_ptr->body.type == lv2_base_ptr->URIS.Atom_Object) { - DR_LOG_INFO_0( "LV2 AO..."); + LG_LOG_INFO_0( "LV2 AO..."); const LV2_Atom_Object *obj_ptr = (LV2_Atom_Object *)&( ev_ptr->body); @@ -1165,7 +1065,7 @@ static void DR_LV2_Run( LV2_Handle Instance_Ptr, uint32_t N_Samples) LV2_Atom_Forge_Frame obj_frame; - DR_LOG_INFO_0( "UI Enable!"); + LG_LOG_INFO_0( "UI Enable!"); lv2_atom_forge_frame_time( &( DRG_LV2_Base.Forge), 0); lv2_atom_forge_object( &( DRG_LV2_Base.Forge), &obj_frame, 1, DRG_LV2_Base.URIS.UI_Msg); @@ -1173,7 +1073,7 @@ static void DR_LV2_Run( LV2_Handle Instance_Ptr, uint32_t N_Samples) lv2_atom_forge_long( &( DRG_LV2_Base.Forge), DRG_LV2_Base.Kit_Id); // Cur kit Id lv2_atom_forge_pop( &( DRG_LV2_Base.Forge), &obj_frame); - DR_LOG_INFO_2( "Kit Update Reply: Kit_Id: (%ld) Kit_Name: [%s]", DRG_LV2_Base.Kit_Id, DRG_LV2_Base.Kit_Ptr->Name); + LG_LOG_INFO_2( "Kit Update Reply: Kit_Id: (%ld) Kit_Name: [%s]", DRG_LV2_Base.Kit_Id, DRG_LV2_Base.Kit_Ptr->Name); @@ -1184,14 +1084,14 @@ static void DR_LV2_Run( LV2_Handle Instance_Ptr, uint32_t N_Samples) if( ( status = DR_Kits_Name_Get( &kit_name_tab, &kit_number)) != DRS_OK) { - DR_LOG_ERROR_1( "Can't get kit names: (%d)", status); + LG_LOG_ERROR_1( "Can't get kit names: (%d)", status); } else { LV2_Atom_Forge_Frame obj_frame, tup_frame; LV2_Atom_Forge_Ref ref; - DR_LOG_INFO_3( "Update Kit Name: Nb: (%d) First: [%s] Size: (%ld)", kit_number, kit_name_tab[0].Name, sizeof( DRT_Kit_Name) * kit_number); + LG_LOG_INFO_3( "Update Kit Name: Nb: (%d) First: [%s] Size: (%ld)", kit_number, kit_name_tab[0].Name, sizeof( DRT_Kit_Name) * kit_number); /* lv2_atom_forge_frame_time( &( DRG_LV2_Base.Forge), 0); @@ -1203,12 +1103,12 @@ static void DR_LV2_Run( LV2_Handle Instance_Ptr, uint32_t N_Samples) lv2_atom_forge_long( &( DRG_LV2_Base.Forge), DRG_LV2_Base.Kit_Ptr->Id); // Cur kit Id // ref = lv2_atom_forge_write( &( DRG_LV2_Base.Forge), &( kit_name_tab[i]), sizeof( DRT_Kit_Name) * kit_number); -// DR_LOG_INFO_1( "Forge: KNT Ref: (%lx)", ref); +// LG_LOG_INFO_1( "Forge: KNT Ref: (%lx)", ref); lv2_atom_forge_pop( &( DRG_LV2_Base.Forge), &tup_frame); lv2_atom_forge_pop( &( DRG_LV2_Base.Forge), &obj_frame); - DR_LOG_INFO_3( "Kit Name Update: Kit_Number: (%ld) Kit_Id: (%ld) Kit_Name: [%s]", kit_number, DRG_LV2_Base.Kit_Ptr->Id, DRG_LV2_Base.Kit_Ptr->Name); + LG_LOG_INFO_3( "Kit Name Update: Kit_Number: (%ld) Kit_Id: (%ld) Kit_Name: [%s]", kit_number, DRG_LV2_Base.Kit_Ptr->Id, DRG_LV2_Base.Kit_Ptr->Name); } */ @@ -1217,7 +1117,7 @@ static void DR_LV2_Run( LV2_Handle Instance_Ptr, uint32_t N_Samples) if( ui_disable_ptr) { - DR_LOG_INFO_0( "UI Disable!"); + LG_LOG_INFO_0( "UI Disable!"); } @@ -1225,7 +1125,7 @@ static void DR_LV2_Run( LV2_Handle Instance_Ptr, uint32_t N_Samples) { lv2_base_ptr->Kit_Id_New = ( (const LV2_Atom_Long *)kit_update_request_ptr)->body; - DR_LOG_INFO_1( "Kit Update Request: Kit_Id: (%ld)!", lv2_base_ptr->Kit_Id_New); + LG_LOG_INFO_1( "Kit Update Request: Kit_Id: (%ld)!", lv2_base_ptr->Kit_Id_New); pthread_cond_signal( &( lv2_base_ptr->Load_Cond)); } @@ -1233,7 +1133,7 @@ static void DR_LV2_Run( LV2_Handle Instance_Ptr, uint32_t N_Samples) if( kit_update_reply_ptr) { - DR_LOG_ERROR_0( "Kit Update Reply: This shouldn't be received by me!"); + LG_LOG_ERROR_0( "Kit Update Reply: This shouldn't be received by me!"); } /* @@ -1336,7 +1236,7 @@ static void DR_LV2_Run( LV2_Handle Instance_Ptr, uint32_t N_Samples) } else { - DR_LOG_WARNING_2( "Unrecognized event (%d) != (%d)", ev_ptr->body.type, lv2_base_ptr->URIS.Atom_Object); + LG_LOG_WARNING_2( "Unrecognized event (%d) != (%d)", ev_ptr->body.type, lv2_base_ptr->URIS.Atom_Object); } } /* @@ -1360,7 +1260,7 @@ static void DR_LV2_Run( LV2_Handle Instance_Ptr, uint32_t N_Samples) lv2_atom_forge_long( &( DRG_LV2_Base.Forge), DRG_LV2_Base.Kit_Id); // Cur kit Id lv2_atom_forge_pop( &( DRG_LV2_Base.Forge), &obj_frame); - DR_LOG_INFO_2( "Kit Update Reply: Kit_Id: (%ld) Kit_Name: [%s]", DRG_LV2_Base.Kit_Id, DRG_LV2_Base.Kit_Ptr->Name); + LG_LOG_INFO_2( "Kit Update Reply: Kit_Id: (%ld) Kit_Name: [%s]", DRG_LV2_Base.Kit_Id, DRG_LV2_Base.Kit_Ptr->Name); } /* @@ -1481,7 +1381,7 @@ static void DR_LV2_Run( LV2_Handle Instance_Ptr, uint32_t N_Samples) static void DR_LV2_DeActivate( LV2_Handle instance) { - DR_LOG_INFO_0( "LV2 DeActivate!"); + LG_LOG_INFO_0( "LV2 DeActivate!"); } @@ -1495,10 +1395,11 @@ static void DR_LV2_DeActivate( LV2_Handle instance) static void DR_LV2_Cleanup( LV2_Handle Instance_Ptr) { DRT_Status status; + LGT_Status lg_status; DRT_LV2_Base *lv2_base_ptr = (DRT_LV2_Base *)Instance_Ptr; - DR_LOG_INFO_0( "LV2 Cleanup!"); + LG_LOG_INFO_0( "LV2 Cleanup!"); DR_Tasks_Dump(); @@ -1506,13 +1407,18 @@ static void DR_LV2_Cleanup( LV2_Handle Instance_Ptr) if( ( status = DR_DataStruct_DeInit()) != DRS_OK) { - printf( "Can't deinit data structures (%d)!\n", status); + LG_LOG_ERROR_1( "Can't deinit data structures: (%d)!", status); } free( lv2_base_ptr->Gains); free( lv2_base_ptr->Right); free( lv2_base_ptr->Left); free( lv2_base_ptr->Request_Buf); + + if( ( lg_status = LG_Library_Close( true)) != LGS_OK) + { + fprintf( stderr, "Can't close LibLog library: (%d)\n", lg_status); + } } @@ -1532,7 +1438,7 @@ static LV2_State_Status DR_LV2_Save_State( LV2_Handle instance LV2_State_Status lv2_status = LV2_STATE_SUCCESS; - DR_LOG_INFO_0( "LV2 Save State!"); + LG_LOG_INFO_0( "LV2 Save State!"); return( lv2_status); } @@ -1553,7 +1459,7 @@ static LV2_State_Status DR_LV2_Restore_State( LV2_Handle ins LV2_State_Status lv2_status = LV2_STATE_SUCCESS; - DR_LOG_INFO_0( "LV2 Restore State!"); + LG_LOG_INFO_0( "LV2 Restore State!"); return( lv2_status); } diff --git a/lv2_plugin.h b/lv2_plugin.h index ecb4a22..a764de6 100644 --- a/lv2_plugin.h +++ b/lv2_plugin.h @@ -19,30 +19,14 @@ /* along with Drummer. If not, see . */ /*----------------------------------------------------------------------------*/ + + /*----------------------------------------------------------------------------*/ /* Includes */ /*----------------------------------------------------------------------------*/ #ifndef _LV2_PLUGIN_H_ #define _LV2_PLUGIN_H_ -/* -#include "lv2/atom/atom.h" -#include "lv2/atom/forge.h" -#include "lv2/atom/util.h" -#include "lv2/core/lv2.h" -#include "lv2/core/lv2_util.h" -#include "lv2/log/log.h" -#include "lv2/log/logger.h" -#include "lv2/midi/midi.h" -#include "lv2/urid/urid.h" -#include "lv2/state/state.h" -*/ -//#include "lv2/lv2plug.in/ns/ext/atom/forge.h" -// util includes atom.h -//#include "lv2/lv2plug.in/ns/ext/atom/util.h" -//#include "lv2/lv2plug.in/ns/lv2core/lv2.h" -//#include "lv2/lv2plug.in/ns/ext/urid/urid.h" -//#include "lv2/lv2plug.in/ns/ext/state/state.h" @@ -380,13 +364,47 @@ typedef struct -# ifdef _LV2_PLUGIN_C_ +/*----------------------------------------------------------------------------*/ +/* DRD DATA & API definition */ +/*----------------------------------------------------------------------------*/ + +# ifdef _LV2_PLUGIN_C_ +# define DRD_LV2_DATA +# define DRD_LV2_API +# else +# define DRD_LV2_DATA extern +# define DRD_LV2_API extern +# endif + + + + + +/*----------------------------------------------------------------------------*/ +/* Public Data */ +/*----------------------------------------------------------------------------*/ + + + + + +/*----------------------------------------------------------------------------*/ +/* Public Prototypes */ +/*----------------------------------------------------------------------------*/ + + + + +# ifdef _LV2_PLUGIN_C_ + + /*----------------------------------------------------------------------------*/ /* Private Definitions */ /*----------------------------------------------------------------------------*/ #define DRD_MODULE_NAME "lv2" +#define LGD_MODULE_NAME "lv2" @@ -402,22 +420,6 @@ DRT_LV2_Base DRG_LV2_Base; /* Private Prototypes */ /*----------------------------------------------------------------------------*/ -/*----------------------------------------------------------------------------*/ -/* DR_Log */ -/*----------------------------------------------------------------------------*/ - -DRT_Status DR_LV2_Log_Write( DRT_Log_Type_Id, char *, va_list); - - - -/*----------------------------------------------------------------------------*/ -/* */ -/*----------------------------------------------------------------------------*/ - -//static inline void DR_LV2_Map_URIS( LV2_URID_Map *, DRT_Drummer_URIS *); - - - /*----------------------------------------------------------------------------*/ /* */ /*----------------------------------------------------------------------------*/ @@ -596,7 +598,7 @@ static const LV2_Descriptor DRG_LV2_Descriptor = -# else // ifdef _LV2_PLUGIN_C_ +# else // ifdef _LV2_PLUGIN_C_ /*----------------------------------------------------------------------------*/ /* Public Prototypes */ @@ -618,7 +620,7 @@ static const LV2_Descriptor DRG_LV2_Descriptor = -# endif // ifndef _LV2_PLUGIN_C_ +# endif // ifdef _LV2_PLUGIN_C_ diff --git a/lv2_ui.c b/lv2_ui.c index 1334a2a..623ad21 100644 --- a/lv2_ui.c +++ b/lv2_ui.c @@ -19,6 +19,8 @@ /* along with Drummer. If not, see . */ /*----------------------------------------------------------------------------*/ + + /*----------------------------------------------------------------------------*/ /* Includes */ /*----------------------------------------------------------------------------*/ @@ -33,109 +35,13 @@ -/*----------------------------------------------------------------------------*/ -/* DR_LV2UI_Log_Write */ -/*----------------------------------------------------------------------------*/ - -DRT_Status DR_LV2UI_Log_Write( DRT_Log_Type_Id Log_Type_Id, char *Out_Fmt, va_list Args) -{ - LV2_URID type; - - - switch( Log_Type_Id) - { - case DRD_LOG_TYPE_ID_TRACE: - { - type = DRG_LV2UI_Base.Logger.Trace; - break; - } - - case DRD_LOG_TYPE_ID_INFO: - { - type = DRG_LV2UI_Base.Logger.Note; - break; - } - - case DRD_LOG_TYPE_ID_WARNING: - { - type = DRG_LV2UI_Base.Logger.Warning; - break; - } - - case DRD_LOG_TYPE_ID_ERROR: - case DRD_LOG_TYPE_ID_UNKNOWN: - default: - { - type = DRG_LV2UI_Base.Logger.Error; - break; - } - } - - if( lv2_log_vprintf( &(DRG_LV2UI_Base.Logger), type, Out_Fmt, Args) == 0) - { - fprintf( stderr, "LV2 logger error...\n"); - } - - return( DRS_OK); -} - - - - - -/*----------------------------------------------------------------------------*/ -/* DR_LV2UI_Map_URIS */ -/*----------------------------------------------------------------------------*/ -/* -static inline void DR_LV2UI_Map_URIS( LV2_URID_Map *Map_Ptr, DRT_Drummer_URIS *URIS) -{ - URIS->Atom_Object = Map_Ptr->map( Map_Ptr->handle, LV2_ATOM__Object); - - URIS->String_URId = Map_Ptr->map( Map_Ptr->handle, LV2_ATOM__String); - URIS->Bool_URId = Map_Ptr->map( Map_Ptr->handle, LV2_ATOM__Bool); - URIS->Int_URId = Map_Ptr->map( Map_Ptr->handle, LV2_ATOM__Int); - URIS->Long_URId = Map_Ptr->map( Map_Ptr->handle, LV2_ATOM__Long); - URIS->Tuple_URId = Map_Ptr->map( Map_Ptr->handle, LV2_ATOM__Tuple); - - URIS->Midi_Event = Map_Ptr->map( Map_Ptr->handle, "http://lv2plug.in/ns/ext/midi#MidiEvent"); - - URIS->Atom_EventTransfer = Map_Ptr->map( Map_Ptr->handle, LV2_ATOM__eventTransfer); - - URIS->UI_Msg = Map_Ptr->map( Map_Ptr->handle, DRD_DRUMMER_URI "#uimsg"); - - URIS->UI_Enable = Map_Ptr->map( Map_Ptr->handle, DRD_DRUMMER_URI "#uienable"); - URIS->UI_Disable = Map_Ptr->map( Map_Ptr->handle, DRD_DRUMMER_URI "#uidisable"); - - URIS->Kit_Name_Update = Map_Ptr->map( Map_Ptr->handle, DRD_DRUMMER_URI "#kitnameupdate"); - URIS->Kit_Id_Update = Map_Ptr->map( Map_Ptr->handle, DRD_DRUMMER_URI "#kitidupdate"); - - URIS->Velocity_Ignore_Flag_Toggle = Map_Ptr->map( Map_Ptr->handle, DRD_DRUMMER_URI "#velocitytoggle"); - URIS->Note_Off_Ignore_Flag_Toggle = Map_Ptr->map( Map_Ptr->handle, DRD_DRUMMER_URI "#noteofftoggle"); - -/* - URIS->kit_path = Map_Ptr->map( Map_Ptr->handle, DRD_DRUMMER_URI "#kitpath"); - URIS->get_state = Map_Ptr->map( Map_Ptr->handle, DRD_DRUMMER_URI "#getstate"); - URIS->midi_info = Map_Ptr->map( Map_Ptr->handle, DRD_DRUMMER_URI "#midiinfo"); - URIS->sample_trigger = Map_Ptr->map( Map_Ptr->handle, DRD_DRUMMER_URI "#sampletrigger"); - URIS->channel_id = Map_Ptr->map( Map_Ptr->handle, DRD_DRUMMER_URI "#channelid"); - URIS->zero_position = Map_Ptr->map( Map_Ptr->handle, DRD_DRUMMER_URI "#zeroposition"); - URIS->sample_add = Map_Ptr->map( Map_Ptr->handle, DRD_DRUMMER_URI "#sampleadd"); - URIS->sample_remove = Map_Ptr->map( Map_Ptr->handle, DRD_DRUMMER_URI "#sampleremove"); -*/ -/* -} -*/ - - - - /*----------------------------------------------------------------------------*/ /* */ /*----------------------------------------------------------------------------*/ static void send_ui_disable( LV2UI_Handle handle) { - fprintf( stderr, "send_ui_disable called!\n"); + LG_LOG_TRACE_0( LGD_LOG_LEVEL_DEFAULT, "Send_ui_disable called!"); /* EgScopeUI* ui = (EgScopeUI*)handle; @@ -169,7 +75,7 @@ static void send_ui_disable( LV2UI_Handle handle) static void send_ui_enable( LV2UI_Handle handle) { - fprintf( stderr, "send_ui_enable called!\n"); + LG_LOG_TRACE_0( LGD_LOG_LEVEL_DEFAULT, "Send_ui_enable called!"); /* EgScopeUI* ui = (EgScopeUI*)handle; @@ -207,7 +113,7 @@ static DRT_Status DR_LV2UI_UI_Enable_Send( void) LV2_Atom *msg; - DR_LOG_INFO_0( "UI Enable Send!"); + LG_LOG_INFO_0( "UI Enable Send!"); @@ -255,7 +161,7 @@ static DRT_Status DR_LV2UI_UI_Disable_Send( void) LV2_Atom *msg; - DR_LOG_INFO_0( "UI Disable Send!"); + LG_LOG_INFO_0( "UI Disable Send!"); @@ -287,7 +193,7 @@ static DRT_Status DR_LV2UI_Kit_Update_Request_Send( void) LV2_Atom *msg; - DR_LOG_INFO_0( "Kit Update Request!"); + LG_LOG_INFO_0( "Kit Update Request!"); lv2_atom_forge_set_buffer( &( DRG_LV2UI_Base.Forge), obj_buf, sizeof( obj_buf)); @@ -315,7 +221,7 @@ static DRT_Status DR_LV2UI_Kit_Update_Request_Send( void) static gboolean on_cfg_changed( GtkWidget *widget, gpointer data) { - fprintf( stderr, "on_cfg_changed called!\n"); + LG_LOG_TRACE_0( LGD_LOG_LEVEL_DEFAULT, "on_cfg_changed called!"); /* EgScopeUI* ui = (EgScopeUI*)data; @@ -339,7 +245,7 @@ static gulong DRG_LV2UI_Expose_Id; static gboolean DR_LV2UI_Expose_Callback (GtkWidget *widget, GdkEventExpose *event, gpointer data) { - DR_LOG_INFO_0( "Expose Callback called!"); + LG_LOG_INFO_0( "Expose Callback called!"); /* DrMrUi *ui = (DrMrUi*)data; @@ -379,7 +285,7 @@ static void DR_LV2UI_Title_Label_Set( DRT_Kit_Id Kit_Id) if( ( status = DR_Kit_Logical_Id_Find( &kit_ptr, Kit_Id)) != DRS_OK) { - DR_LOG_WARNING_4( "Can't find kit id: (%d) Bank/Program: (%d/%d/%d)!", Kit_Id, bank_id_lsb, bank_id_msb, program_id); + LG_LOG_WARNING_4( "Can't find kit id: (%d) Bank/Program: (%d/%d/%d)!", Kit_Id, bank_id_lsb, bank_id_msb, program_id); kit_name_ptr = "No kit loaded"; } @@ -448,7 +354,7 @@ static GtkWidget *DR_LV2UI_Kit_ComboBox_Create( void) if( ( status = DR_Kits_Name_Get( &kit_name_tab, &kit_number)) != DRS_OK) { - DR_LOG_ERROR_1( "Can't get kit names: (%d)", status); + LG_LOG_ERROR_1( "Can't get kit names: (%d)", status); } else { @@ -495,7 +401,7 @@ static void DR_LV2UI_Kit_ComboBox_Changed( GtkComboBox *ComboBox_Ptr, gpointer if( !gtk_tree_model_iter_nth_child( model_ptr, &iter, NULL, gtk_combo_box_get_active( GTK_COMBO_BOX( ComboBox_Ptr)))) { - DR_LOG_INFO_0( "Line not found!"); + LG_LOG_INFO_0( "Line not found!"); return; } @@ -506,7 +412,7 @@ static void DR_LV2UI_Kit_ComboBox_Changed( GtkComboBox *ComboBox_Ptr, gpointer DRG_LV2UI_Base.Kit_Id = g_value_get_long(&value); */ - DR_LOG_INFO_1( "Kit_ComboBox_Changed: Id: (%d)!", DRG_LV2UI_Base.Kit_Id); + LG_LOG_INFO_1( "Kit_ComboBox_Changed: Id: (%d)!", DRG_LV2UI_Base.Kit_Id); DR_LV2UI_Kit_Update_Request_Send(); @@ -532,7 +438,7 @@ static DRT_Status DR_LV2UI_Kit_Update_Reply( DRT_Kit_Id Kit_Id) DR_LV2UI_Id_Bank_Program_Label_Set( DRG_LV2UI_Base.Kit_Id); - DR_LOG_INFO_1( "Kit_Update_Reply: Id: (%d)!", Kit_Id); + LG_LOG_INFO_1( "Kit_Update_Reply: Id: (%d)!", Kit_Id); return( DRS_OK); } @@ -593,7 +499,7 @@ static void DR_LV2UI_Channel_Id_ComboBox_Changed( GtkComboBox *ComboBox_Ptr, g { DRG_LV2UI_Base.Channel_Id = (float)gtk_combo_box_get_active( GTK_COMBO_BOX( ComboBox_Ptr)); - DR_LOG_INFO_1( "Channel_Id_ComboBox_Changed: Id: (%d)!", (int)( DRG_LV2UI_Base.Channel_Id)); + LG_LOG_INFO_1( "Channel_Id_ComboBox_Changed: Id: (%d)!", (int)( DRG_LV2UI_Base.Channel_Id)); DRG_LV2UI_Base.Write( DRG_LV2UI_Base.Controller, DRD_LV2_CHANNEL_ID, 4, 0, &( DRG_LV2UI_Base.Channel_Id)); @@ -635,7 +541,7 @@ static void DR_LV2UI_Base_Note_Spin_Changed( GtkSpinButton *Spin_Ptr, gpointer { DRG_LV2UI_Base.Base_Note = base; - DR_LOG_INFO_1( "Base_Note_Spin_Changed: Id: (%d)!", (int)( base)); + LG_LOG_INFO_1( "Base_Note_Spin_Changed: Id: (%d)!", (int)( base)); DRG_LV2UI_Base.Write( DRG_LV2UI_Base.Controller, DRD_LV2_BASE_NOTE, 4, 0, &( DRG_LV2UI_Base.Base_Note)); @@ -644,7 +550,7 @@ static void DR_LV2UI_Base_Note_Spin_Changed( GtkSpinButton *Spin_Ptr, gpointer } else { - fprintf( stderr,"Base spin got out of range: %f\n",base); + LG_LOG_ERROR_1( "Base spin got out of range: (%f)", base); } } @@ -698,7 +604,7 @@ static void DR_LV2UI_Position_Id_ComboBox_Changed( GtkComboBox *ComboBox_Ptr, { DRG_LV2UI_Base.Position_Id = (float)gtk_combo_box_get_active( GTK_COMBO_BOX( ComboBox_Ptr)); - DR_LOG_INFO_1( "Position_Id_ComboBox_Changed: Id: (%d)!", (int)( DRG_LV2UI_Base.Position_Id)); + LG_LOG_INFO_1( "Position_Id_ComboBox_Changed: Id: (%d)!", (int)( DRG_LV2UI_Base.Position_Id)); // DRG_LV2UI_Base.Write( DRG_LV2UI_Base.Controller, DRD_LV2_POSITION_ID, 4, 0, &( DRG_LV2UI_Base.Position_Id)); @@ -717,7 +623,7 @@ static gboolean DR_LV2UI_Velocity_Ignore_Flag_Toggled( GtkToggleButton *Button { DRG_LV2UI_Base.Velocity_Ignore_Flag = (float)gtk_toggle_button_get_active( Button_Ptr); - DR_LOG_INFO_1( "Velocity_Ignore_Flag_Toggled called: State: (%d)!", (int)( DRG_LV2UI_Base.Velocity_Ignore_Flag)); + LG_LOG_INFO_1( "Velocity_Ignore_Flag_Toggled called: State: (%d)!", (int)( DRG_LV2UI_Base.Velocity_Ignore_Flag)); DRG_LV2UI_Base.Write( DRG_LV2UI_Base.Controller, DRD_LV2_VELOCITY_IGNORE_FLAG, 4, 0, &( DRG_LV2UI_Base.Velocity_Ignore_Flag)); @@ -736,7 +642,7 @@ static gboolean DR_LV2UI_Note_Off_Ignore_Flag_Toggled( GtkToggleButton *Button { DRG_LV2UI_Base.Note_Off_Ignore_Flag = (float)gtk_toggle_button_get_active( Button_Ptr); - DR_LOG_INFO_1( "Note_Off_Ignore_Flag_Toggled called: State: (%d)!", (int)( DRG_LV2UI_Base.Note_Off_Ignore_Flag)); + LG_LOG_INFO_1( "Note_Off_Ignore_Flag_Toggled called: State: (%d)!", (int)( DRG_LV2UI_Base.Note_Off_Ignore_Flag)); DRG_LV2UI_Base.Write( DRG_LV2UI_Base.Controller, DRD_LV2_NOTE_OFF_IGNORE_FLAG, 4, 0, &( DRG_LV2UI_Base.Note_Off_Ignore_Flag)); @@ -857,7 +763,7 @@ DRT_Status DR_LV2UI_UI_Build( GtkWidget **Main_Widget_Ptr_Ptr) gtk_widget_show_all( *Main_Widget_Ptr_Ptr); - DR_LOG_INFO_0( "UI Build completed!"); + LG_LOG_INFO_0( "UI Build completed!"); return( DRS_OK); } @@ -881,7 +787,7 @@ static LV2UI_Handle DR_LV2UI_Instantiate( const LV2UI_Descriptor *LV2UI_Des DRT_Status status; - fprintf( stderr, "instanciate called!\n"); + LG_LOG_INFO_0( "instanciate called!"); DRG_LV2UI_Base.Write = Write_Function; DRG_LV2UI_Base.Controller = Controller; @@ -892,7 +798,7 @@ static LV2UI_Handle DR_LV2UI_Instantiate( const LV2UI_Descriptor *LV2UI_Des while( *LV2_Features_Ptr != NULL) { - fprintf( stderr, "Feature URI: [%s]\n", (*LV2_Features_Ptr)->URI); + LG_LOG_INFO_1( "Feature URI: [%s]", (*LV2_Features_Ptr)->URI); if( !strcmp( ( *LV2_Features_Ptr)->URI, LV2_URID_URI "#map")) { @@ -913,12 +819,12 @@ static LV2UI_Handle DR_LV2UI_Instantiate( const LV2UI_Descriptor *LV2UI_Des { if( DRG_LV2UI_Base.Map_Ptr == NULL) { - fprintf( stderr, "LV2 host does not support urid#map!\n"); + LG_LOG_ERROR_0( "LV2 host does not support urid#map!"); } if( DRG_LV2UI_Base.Logger.log == NULL) { - fprintf( stderr, "LV2 host does not support log#log!\n"); + LG_LOG_ERROR_0( "LV2 host does not support log#log!"); } return( NULL); @@ -928,17 +834,14 @@ static LV2UI_Handle DR_LV2UI_Instantiate( const LV2UI_Descriptor *LV2UI_Des // lv2_log_logger_init( &(DRG_LV2UI_Base.Logger), DRG_LV2UI_Base.Map_Ptr, DRG_LV2UI_Base.Logger.log); lv2_log_logger_set_map( &(DRG_LV2UI_Base.Logger), DRG_LV2UI_Base.Map_Ptr); - DRG_Base.Log_Stream_Out = stderr; - DRG_Base.Log_Writer_Ptr = DRD_LOG_WRITER_DEFAULT; - - if( ( status = DR_DataStruct_Init( DRD_LOG_WRITER_DEFAULT, DRD_SAMPLE_RATE_DEFAULT, DRD_THREAD_NUMBER_DEFAULT)) != DRS_OK) + if( ( status = DR_DataStruct_Init( DRD_SAMPLE_RATE_DEFAULT, DRD_THREAD_NUMBER_DEFAULT)) != DRS_OK) { - fprintf( stderr, "Can't init data structures (%d)!\n", status); + LG_LOG_ERROR_1( "Can't init data structures: (%d)!", status); } else { - lv2_log_error( &(DRG_LV2UI_Base.Logger), "UI: Test error log <%s>!\n", "Krash!"); - DR_LOG_ERROR_1( "Test error log <%s>!", "Krash!"); + lv2_log_error( &(DRG_LV2UI_Base.Logger), "LV2Log: UI: Test error log <%s>!\n", "Krash!"); + LG_LOG_ERROR_1( "LibLog: UI: Test error log <%s>!", "Krash!"); // DR_LV2UI_Map_URIS( DRG_LV2UI_Base.Map_Ptr, &(DRG_LV2UI_Base.URIS)); DR_LV2_Map_URIS( DRG_LV2UI_Base.Map_Ptr, &(DRG_LV2UI_Base.URIS)); @@ -948,7 +851,7 @@ static LV2UI_Handle DR_LV2UI_Instantiate( const LV2UI_Descriptor *LV2UI_Des /* Load Local Database copy waiting a shared DataStruct implementation ! */ if( ( status = DR_Kits_Load()) != DRS_OK) { - fprintf( stderr, "Can't load kits (%d)!\n", status); + LG_LOG_ERROR_1( "Can't load kits: (%d)!", status); } else { @@ -979,7 +882,7 @@ static LV2UI_Handle DR_LV2UI_Instantiate( const LV2UI_Descriptor *LV2UI_Des static void DR_LV2UI_Cleanup( LV2UI_Handle Instance_Ptr) { - DR_LOG_INFO_0( "Cleanup called!!"); + LG_LOG_INFO_0( "Cleanup called!!"); DR_LV2UI_UI_Disable_Send(); @@ -1009,11 +912,11 @@ static void DR_LV2UI_Port_Event( LV2UI_Handle Instance_Ptr, uint32_t Format, const void *Buffer_Ptr) { - DR_LOG_INFO_2( "Port_Event called: Port: (%d) Format: (%d)!", Port_Id, Format); + LG_LOG_INFO_2( "Port_Event called: Port: (%d) Format: (%d)!", Port_Id, Format); if( Port_Id == DRD_LV2_CORE_EVENT) { - DR_LOG_INFO_0( "Port_Event called: Core Event!"); + LG_LOG_INFO_0( "Port_Event called: Core Event!"); if( Format == DRG_LV2UI_Base.URIS.Atom_EventTransfer) { @@ -1039,7 +942,7 @@ static void DR_LV2UI_Port_Event( LV2UI_Handle Instance_Ptr, if( kit_update_request_ptr) { - DR_LOG_ERROR_0( "Kit Update Request: This shouldn't be received by me!"); + LG_LOG_ERROR_0( "Kit Update Request: This shouldn't be received by me!"); } @@ -1049,7 +952,7 @@ static void DR_LV2UI_Port_Event( LV2UI_Handle Instance_Ptr, kit_id = ( (const LV2_Atom_Long *)kit_update_reply_ptr)->body; - DR_LOG_INFO_1( "Kit Update Reply: Kit_Id: (%ld)!", kit_id); + LG_LOG_INFO_1( "Kit Update Reply: Kit_Id: (%ld)!", kit_id); DR_LV2UI_Kit_Update_Reply( kit_id); @@ -1062,29 +965,29 @@ static void DR_LV2UI_Port_Event( LV2UI_Handle Instance_Ptr, { end = lv2_atom_tuple_is_end( LV2_ATOM_BODY( (const LV2_Atom_Tuple *)kit_name_tab_ptr), ((const LV2_Atom_Tuple *)kit_name_tab_ptr)->atom.size, lv2_atom_tuple_next( iter)); - DR_LOG_INFO_3( "ATOM: type: (%d) size: (%d) Value: (%ld)", iter->type, iter->size, ( (const LV2_Atom_Long *)iter)->body); - DR_LOG_INFO_3( "ATOM: Iter: (%lx) size: (%ld) End: (%d)", lv2_atom_tuple_next( iter), ((const LV2_Atom_Tuple *)kit_name_tab_ptr)->atom.size, end); + LG_LOG_INFO_3( "ATOM: type: (%d) size: (%d) Value: (%ld)", iter->type, iter->size, ( (const LV2_Atom_Long *)iter)->body); + LG_LOG_INFO_3( "ATOM: Iter: (%lx) size: (%ld) End: (%d)", lv2_atom_tuple_next( iter), ((const LV2_Atom_Tuple *)kit_name_tab_ptr)->atom.size, end); if( iter->type == DRG_LV2UI_Base.URIS.Long_URId) { count = ( (const LV2_Atom_Long *)iter)->body; - DR_LOG_INFO_1( "ATOM: Long: (%ld)!", count); + LG_LOG_INFO_1( "ATOM: Long: (%ld)!", count); } else { if( iter->type == DRG_LV2UI_Base.URIS.String_URId) { - DR_LOG_INFO_0( "ATOM: String!"); + LG_LOG_INFO_0( "ATOM: String!"); kit_name_tab = (DRT_Kit_Name *)LV2_ATOM_BODY( iter); for( i = 0; i < count; i++) { - DR_LOG_INFO_3( " Kit: #: (%ld) Id: (%ld) Name: [%s]", i, kit_name_tab[i].Id, kit_name_tab[i].Name); + LG_LOG_INFO_3( " Kit: #: (%ld) Id: (%ld) Name: [%s]", i, kit_name_tab[i].Id, kit_name_tab[i].Name); } } else { - DR_LOG_INFO_0( "ATOM: ???"); + LG_LOG_INFO_0( "ATOM: ???"); } } } @@ -1096,7 +999,7 @@ static void DR_LV2UI_Port_Event( LV2UI_Handle Instance_Ptr, { DRG_LV2UI_Base.Velocity_Ignore_Flag = ( (const LV2_Atom_Float *)velocity_ignore_flag_ptr)->body; - DR_LOG_INFO_1( "UI Msg: Velocity Ignore Flag: (%f)!", DRG_LV2UI_Base.Velocity_Ignore_Flag); + LG_LOG_INFO_1( "UI Msg: Velocity Ignore Flag: (%f)!", DRG_LV2UI_Base.Velocity_Ignore_Flag); gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( DRG_LV2UI_Base.Velocity_Ignore_Flag_CheckBox_Ptr), (int)( DRG_LV2UI_Base.Velocity_Ignore_Flag)); } @@ -1105,50 +1008,50 @@ static void DR_LV2UI_Port_Event( LV2UI_Handle Instance_Ptr, { DRG_LV2UI_Base.Note_Off_Ignore_Flag = ( (const LV2_Atom_Float *)note_off_ignore_flag_ptr)->body; - DR_LOG_INFO_1( "UI Msg: Note Off Ignore Flag: (%f)!", DRG_LV2UI_Base.Note_Off_Ignore_Flag); + LG_LOG_INFO_1( "UI Msg: Note Off Ignore Flag: (%f)!", DRG_LV2UI_Base.Note_Off_Ignore_Flag); gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( DRG_LV2UI_Base.Note_Off_Ignore_Flag_CheckBox_Ptr), (int)( DRG_LV2UI_Base.Note_Off_Ignore_Flag)); } } else { - DR_LOG_ERROR_0( "Unknown resource type passed to ui!"); + LG_LOG_ERROR_0( "Unknown resource type passed to ui!"); } } else { - DR_LOG_ERROR_0( "Non resource message passed to ui!"); + LG_LOG_ERROR_0( "Non resource message passed to ui!"); } } else { - DR_LOG_ERROR_0( "Unknown format!"); + LG_LOG_ERROR_0( "Unknown format!"); } } else if( Port_Id == DRD_LV2_CHANNEL_ID) { DRG_LV2UI_Base.Channel_Id = *(float *)Buffer_Ptr; - DR_LOG_INFO_1( "Port_Event called: Channel Id: (%d)!", (int)( DRG_LV2UI_Base.Channel_Id)); + LG_LOG_INFO_1( "Port_Event called: Channel Id: (%d)!", (int)( DRG_LV2UI_Base.Channel_Id)); gtk_combo_box_set_active( GTK_COMBO_BOX( DRG_LV2UI_Base.Channel_ComboBox_Ptr), (int)( DRG_LV2UI_Base.Channel_Id)); } else if( Port_Id == DRD_LV2_BASE_NOTE) { - DR_LOG_INFO_0( "Port_Event called: Base Note!"); + LG_LOG_INFO_0( "Port_Event called: Base Note!"); } else if( Port_Id == DRD_LV2_VELOCITY_IGNORE_NOTE) { - DR_LOG_INFO_0( "Port_Event called: Velocity Ignore Note!"); - DR_LOG_INFO_1( "Received DRG_Base_Ptr: (%lx)!", (char *)( Buffer_Ptr)); + LG_LOG_INFO_0( "Port_Event called: Velocity Ignore Note!"); + LG_LOG_INFO_1( "Received DRG_Base_Ptr: (%lx)!", (char *)( Buffer_Ptr)); } else if( Port_Id == DRD_LV2_NOTE_OFF_IGNORE_NOTE) { - DR_LOG_INFO_0( "Port_Event called: Note Off Ignore Note!"); + LG_LOG_INFO_0( "Port_Event called: Note Off Ignore Note!"); } else if( Port_Id == DRD_LV2_VELOCITY_IGNORE_FLAG) { DRG_LV2UI_Base.Velocity_Ignore_Flag = *(float *)Buffer_Ptr; - DR_LOG_INFO_1( "Port_Event called: Velocity Ignore Flag: (%d)!", (int)( DRG_LV2UI_Base.Velocity_Ignore_Flag)); + LG_LOG_INFO_1( "Port_Event called: Velocity Ignore Flag: (%d)!", (int)( DRG_LV2UI_Base.Velocity_Ignore_Flag)); gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( DRG_LV2UI_Base.Velocity_Ignore_Flag_CheckBox_Ptr), (int)( DRG_LV2UI_Base.Velocity_Ignore_Flag)); } @@ -1156,21 +1059,21 @@ static void DR_LV2UI_Port_Event( LV2UI_Handle Instance_Ptr, { DRG_LV2UI_Base.Note_Off_Ignore_Flag = *(float *)Buffer_Ptr; - DR_LOG_INFO_1( "Port_Event called: Note Off Ignore Flag: (%d)!", (int)( DRG_LV2UI_Base.Note_Off_Ignore_Flag)); + LG_LOG_INFO_1( "Port_Event called: Note Off Ignore Flag: (%d)!", (int)( DRG_LV2UI_Base.Note_Off_Ignore_Flag)); gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( DRG_LV2UI_Base.Note_Off_Ignore_Flag_CheckBox_Ptr), (int)( DRG_LV2UI_Base.Note_Off_Ignore_Flag)); } else if( ( Port_Id >= DRD_LV2_GAIN_00) && ( Port_Id <= DRD_LV2_GAIN_31)) { - DR_LOG_INFO_1( "Port_Event called: Gain: (%d)!", ( Port_Id - DRD_LV2_GAIN_00)); + LG_LOG_INFO_1( "Port_Event called: Gain: (%d)!", ( Port_Id - DRD_LV2_GAIN_00)); } else if( ( Port_Id >= DRD_LV2_PAN_00) && ( Port_Id <= DRD_LV2_PAN_31)) { - DR_LOG_INFO_1( "Port_Event called: Pan: (%d)!", ( Port_Id - DRD_LV2_PAN_00)); + LG_LOG_INFO_1( "Port_Event called: Pan: (%d)!", ( Port_Id - DRD_LV2_PAN_00)); } else { - DR_LOG_INFO_2( "Port_Event called: Port: (%d) Format: (%d)!", Port_Id, Format); - DR_LOG_ERROR_0( "Port_Event called: Unknown port!"); + LG_LOG_INFO_2( "Port_Event called: Port: (%d) Format: (%d)!", Port_Id, Format); + LG_LOG_ERROR_0( "Port_Event called: Unknown port!"); } // if( Format == DRG_LV2UIBase.URIS.Atom_Object) diff --git a/lv2_ui.h b/lv2_ui.h index 082141d..4b42ad1 100644 --- a/lv2_ui.h +++ b/lv2_ui.h @@ -19,6 +19,8 @@ /* along with Drummer. If not, see . */ /*----------------------------------------------------------------------------*/ + + /*----------------------------------------------------------------------------*/ /* Includes */ /*----------------------------------------------------------------------------*/ @@ -101,6 +103,45 @@ typedef struct DRT_LV2UI_Base + +/*----------------------------------------------------------------------------*/ +/* DRD DATA & API definition */ +/*----------------------------------------------------------------------------*/ + +# ifdef _LV2_UI_C_ +# define DRD_GUI_DATA +# define DRD_GUI_API +# else +# define DRD_GUI_DATA extern +# define DRD_GUI_API extern +# endif + + + + + +/*----------------------------------------------------------------------------*/ +/* Public Data */ +/*----------------------------------------------------------------------------*/ + +/*----------------------------------------------------------------------------*/ +/* DRT_Base */ +/*----------------------------------------------------------------------------*/ + + + + + +/*----------------------------------------------------------------------------*/ +/* Public Prototypes */ +/*----------------------------------------------------------------------------*/ + + + + + + + # ifdef _LV2_UI_C_ /*----------------------------------------------------------------------------*/ @@ -108,6 +149,7 @@ typedef struct DRT_LV2UI_Base /*----------------------------------------------------------------------------*/ #define DRD_MODULE_NAME "gui" +#define LGD_MODULE_NAME "gui" @@ -137,14 +179,6 @@ char *DRG_LV2UI_Note_String = "C C#D D#E F F#G G#A A#B "; -/*----------------------------------------------------------------------------*/ -/* DR_LV2UI_Log_Write */ -/*----------------------------------------------------------------------------*/ - -DRT_Status DR_LV2UI_Log_Write( DRT_Log_Type_Id, char *, va_list); - - - /*----------------------------------------------------------------------------*/ /* DR_LV2UI_UI_Enable_Send */ /*----------------------------------------------------------------------------*/ @@ -317,15 +351,7 @@ static const LV2UI_Descriptor DRG_LV2UI_Descriptor = -# else // ifdef _LV2_UI_C_ - - - - - -/*----------------------------------------------------------------------------*/ -/* Public Prototypes */ -/*----------------------------------------------------------------------------*/ +# else // ifdef _LV2_UI_C_ @@ -334,7 +360,7 @@ static const LV2UI_Descriptor DRG_LV2UI_Descriptor = -# endif // ifndef _LV2_UI_C_ +# endif // ifdef _LV2_UI_C_ diff --git a/lv2_utils.c b/lv2_utils.c index 4d4e145..7336274 100644 --- a/lv2_utils.c +++ b/lv2_utils.c @@ -19,6 +19,8 @@ /* along with Drummer. If not, see . */ /*----------------------------------------------------------------------------*/ + + /*----------------------------------------------------------------------------*/ /* Includes */ /*----------------------------------------------------------------------------*/ diff --git a/lv2_utils.h b/lv2_utils.h index 04968d6..0249bc8 100644 --- a/lv2_utils.h +++ b/lv2_utils.h @@ -19,6 +19,8 @@ /* along with Drummer. If not, see . */ /*----------------------------------------------------------------------------*/ + + /*----------------------------------------------------------------------------*/ /* Includes */ /*----------------------------------------------------------------------------*/ @@ -96,15 +98,57 @@ typedef struct DRT_Drummer_URIS +/*----------------------------------------------------------------------------*/ +/* DRD DATA & API definition */ +/*----------------------------------------------------------------------------*/ + +# ifdef _LV2_UTILS_C_ +# define DRD_LVU_DATA +# define DRD_LVU_API +# else +# define DRD_LVU_DATA extern +# define DRD_LVU_API extern +# endif -# ifdef _LV2_UTILS_C_ + + + +/*----------------------------------------------------------------------------*/ +/* Public Data */ +/*----------------------------------------------------------------------------*/ + +/*----------------------------------------------------------------------------*/ +/* DRT_Base */ +/*----------------------------------------------------------------------------*/ + + + + +/*----------------------------------------------------------------------------*/ +/* Public Prototypes */ +/*----------------------------------------------------------------------------*/ + +/*----------------------------------------------------------------------------*/ +/* DR_LV2_Map_URIS */ +/*----------------------------------------------------------------------------*/ + +DRD_LVU_API void DR_LV2_Map_URIS( LV2_URID_Map *, DRT_Drummer_URIS *); + + + + + + + +# ifdef _LV2_UTILS_C_ /*----------------------------------------------------------------------------*/ /* Private Definitions */ /*----------------------------------------------------------------------------*/ #define DRD_MODULE_NAME "lvu" +#define LGD_MODULE_NAME "lvu" @@ -124,7 +168,7 @@ typedef struct DRT_Drummer_URIS /* DR_LV2_Map_URIS */ /*----------------------------------------------------------------------------*/ -void DR_LV2_Map_URIS( LV2_URID_Map *, DRT_Drummer_URIS *); +//void DR_LV2_Map_URIS( LV2_URID_Map *, DRT_Drummer_URIS *); @@ -141,29 +185,13 @@ void DR_LV2_Map_URIS( LV2_URID_Map *, DRT_Drummer_URIS *); -# else // ifdef _LV2_UTILS_C_ - -/*----------------------------------------------------------------------------*/ -/* Public Prototypes */ -/*----------------------------------------------------------------------------*/ - -/*----------------------------------------------------------------------------*/ -/* DR_LV2_Map_URIS */ -/*----------------------------------------------------------------------------*/ - -extern void DR_LV2_Map_URIS( LV2_URID_Map *, DRT_Drummer_URIS *); +# else // ifdef _LV2_UTILS_C_ - - - - - - -# endif // ifndef _LV2_UTILS_C_ +# endif // ifdef _LV2_UTILS_C_ diff --git a/utils.c b/utils.c index 13f2fff..ed6c241 100644 --- a/utils.c +++ b/utils.c @@ -19,6 +19,8 @@ /* along with Drummer. If not, see . */ /*----------------------------------------------------------------------------*/ + + /*----------------------------------------------------------------------------*/ /* Includes */ /*----------------------------------------------------------------------------*/ @@ -96,7 +98,7 @@ DRT_Status DR_Kit_Id_Convert( uint8_t *Bank_Id_LSB_Ptr, uint8_t *Bank_Id_MSB_ *Bank_Id_MSB_Ptr = ( Kit_Id / 128) % 128; *Bank_Id_LSB_Ptr = ( Kit_Id / 128) / 128; -// DR_LOG_INFO_4( "DR_Kit_Id_Convert: kit: id: (%d) -> Bank/Program: (%d/%d/%d)", Kit_Id, *Bank_Id_LSB_Ptr, *Bank_Id_MSB_Ptr, *Program_Id_Ptr); +// LG_LOG_INFO_4( "DR_Kit_Id_Convert: kit: id: (%d) -> Bank/Program: (%d/%d/%d)", Kit_Id, *Bank_Id_LSB_Ptr, *Bank_Id_MSB_Ptr, *Program_Id_Ptr); return( DRS_OK); } @@ -113,7 +115,7 @@ DRT_Status DR_Bank_Program_Id_Convert( DRT_Kit_Id *Kit_Id_Ptr, uint8_t Bank_I { *Kit_Id_Ptr = ( Bank_Id_LSB * 128 + Bank_Id_MSB) * 128 + Program_Id; -// DR_LOG_INFO_4( "DR_Bank_Program_Id_Convert: kit: id: (%d) <- Bank/Program: (%d/%d/%d)", *Kit_Id_Ptr, Bank_Id_LSB, Bank_Id_MSB, Program_Id); +// LG_LOG_INFO_4( "DR_Bank_Program_Id_Convert: kit: id: (%d) <- Bank/Program: (%d/%d/%d)", *Kit_Id_Ptr, Bank_Id_LSB, Bank_Id_MSB, Program_Id); return( DRS_OK); } diff --git a/utils.h b/utils.h index f72a82f..0432772 100644 --- a/utils.h +++ b/utils.h @@ -19,6 +19,8 @@ /* along with Drummer. If not, see . */ /*----------------------------------------------------------------------------*/ + + /*----------------------------------------------------------------------------*/ /* Includes */ /*----------------------------------------------------------------------------*/ @@ -48,25 +50,39 @@ -# ifdef _UTILS_C_ - /*----------------------------------------------------------------------------*/ -/* Private Definitions */ +/* DRD DATA & API definition */ /*----------------------------------------------------------------------------*/ -#define DRD_MODULE_NAME "utl" +# ifdef _UTILS_C_ +# define DRD_UTL_DATA +# define DRD_UTL_API +# else +# define DRD_UTL_DATA extern +# define DRD_UTL_API extern +# endif + + /*----------------------------------------------------------------------------*/ -/* Private Prototypes */ +/* Public Data */ +/*----------------------------------------------------------------------------*/ + + + + + +/*----------------------------------------------------------------------------*/ +/* Public Prototypes */ /*----------------------------------------------------------------------------*/ /*----------------------------------------------------------------------------*/ /* DR_Kit_Id_Convert */ /*----------------------------------------------------------------------------*/ -DRT_Status DR_Kit_Id_Convert( uint8_t *, uint8_t *, uint8_t *, DRT_Kit_Id); +DRD_UTL_API DRT_Status DR_Kit_Id_Convert( uint8_t *, uint8_t *, uint8_t *, DRT_Kit_Id); @@ -74,7 +90,29 @@ DRT_Status DR_Kit_Id_Convert( uint8_t *, uint8_t *, uint8_t *, DRT_Kit_Id); /* DR_Bank_Program_Id_Convert */ /*----------------------------------------------------------------------------*/ -DRT_Status DR_Bank_Program_Id_Convert( DRT_Kit_Id *, uint8_t, uint8_t, uint8_t); +DRD_UTL_API DRT_Status DR_Bank_Program_Id_Convert( DRT_Kit_Id *, uint8_t, uint8_t, uint8_t); + + + + + + + +# ifdef _UTILS_C_ + +/*----------------------------------------------------------------------------*/ +/* Private Definitions */ +/*----------------------------------------------------------------------------*/ + +#define DRD_MODULE_NAME "utl" +#define LGD_MODULE_NAME "utl" + + + +/*----------------------------------------------------------------------------*/ +/* Private Prototypes */ +/*----------------------------------------------------------------------------*/ + @@ -91,37 +129,17 @@ DRT_Status DR_Bank_Program_Id_Convert( DRT_Kit_Id *, uint8_t, uint8_t, uint8_t -# else // ifdef _UTILS_C_ +# else // ifdef _UTILS_C_ /*----------------------------------------------------------------------------*/ /* Public Prototypes */ /*----------------------------------------------------------------------------*/ -/*----------------------------------------------------------------------------*/ -/* DR_Kit_Id_Convert */ -/*----------------------------------------------------------------------------*/ - -extern DRT_Status DR_Kit_Id_Convert( uint8_t *, uint8_t *, uint8_t *, DRT_Kit_Id); - - - -/*----------------------------------------------------------------------------*/ -/* DR_Bank_Program_Id_Convert */ -/*----------------------------------------------------------------------------*/ - -extern DRT_Status DR_Bank_Program_Id_Convert( DRT_Kit_Id *, uint8_t, uint8_t, uint8_t); - - - - - - - -# endif // ifndef _UTILS_C_ +# endif // ifdef _UTILS_C_