From 7968cefc1467e11fd3b5c302e15a7341436eab9e Mon Sep 17 00:00:00 2001 From: Good Guy Date: Mon, 6 Jun 2022 11:02:39 -0600 Subject: [PATCH] add libbthread to main directory for Android from Andrew --- cinelerra-5.1/Makefile.am | 2 +- cinelerra-5.1/cinelerra/Makefile | 2 +- cinelerra-5.1/libbthread-master/.gitignore | 20 + cinelerra-5.1/libbthread-master/LICENSE | 504 ++++++++++++++++++ cinelerra-5.1/libbthread-master/Makefile.am | 23 + cinelerra-5.1/libbthread-master/README.md | 41 ++ cinelerra-5.1/libbthread-master/bthread.h | 31 ++ cinelerra-5.1/libbthread-master/configure.ac | 38 ++ cinelerra-5.1/libbthread-master/just-pt.cc | 216 ++++++++ cinelerra-5.1/libbthread-master/pt-cancel.c | 58 ++ cinelerra-5.1/libbthread-master/pt-docancel.c | 42 ++ cinelerra-5.1/libbthread-master/pt-init.c | 45 ++ cinelerra-5.1/libbthread-master/pt-internal.h | 80 +++ .../libbthread-master/pt-setcancelstate.c | 57 ++ .../libbthread-master/pt-setcanceltype.c | 57 ++ .../libbthread-master/pt-testcancel.c | 39 ++ cinelerra-5.1/libzmpeg3/Makefile | 2 +- cinelerra-5.1/mpeg2enc/Makefile | 2 +- cinelerra-5.1/mplexlo/Makefile | 2 +- 19 files changed, 1256 insertions(+), 5 deletions(-) create mode 100644 cinelerra-5.1/libbthread-master/.gitignore create mode 100644 cinelerra-5.1/libbthread-master/LICENSE create mode 100644 cinelerra-5.1/libbthread-master/Makefile.am create mode 100644 cinelerra-5.1/libbthread-master/README.md create mode 100644 cinelerra-5.1/libbthread-master/bthread.h create mode 100644 cinelerra-5.1/libbthread-master/configure.ac create mode 100644 cinelerra-5.1/libbthread-master/just-pt.cc create mode 100644 cinelerra-5.1/libbthread-master/pt-cancel.c create mode 100644 cinelerra-5.1/libbthread-master/pt-docancel.c create mode 100644 cinelerra-5.1/libbthread-master/pt-init.c create mode 100644 cinelerra-5.1/libbthread-master/pt-internal.h create mode 100644 cinelerra-5.1/libbthread-master/pt-setcancelstate.c create mode 100644 cinelerra-5.1/libbthread-master/pt-setcanceltype.c create mode 100644 cinelerra-5.1/libbthread-master/pt-testcancel.c diff --git a/cinelerra-5.1/Makefile.am b/cinelerra-5.1/Makefile.am index ea53b474..4214a9ac 100644 --- a/cinelerra-5.1/Makefile.am +++ b/cinelerra-5.1/Makefile.am @@ -10,7 +10,7 @@ AM_MAKEFLAGS := -j$(WANT_JOBS) AUTOMAKE_OPTIONS=foreign ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = thirdparty libzmpeg3 mpeg2enc mplexlo \ +SUBDIRS = thirdparty libbthread-master libzmpeg3 mpeg2enc mplexlo \ db guicast cinelerra plugins doc po db/utils BUILT_SOURCES := bin diff --git a/cinelerra-5.1/cinelerra/Makefile b/cinelerra-5.1/cinelerra/Makefile index fe3e67a7..d9ff3b93 100644 --- a/cinelerra-5.1/cinelerra/Makefile +++ b/cinelerra-5.1/cinelerra/Makefile @@ -453,7 +453,7 @@ LIBS += -la52 -ltwolame -lmp3lame endif LIBS += -lgif -ltheoraenc -ltheoradec -lvorbisfile -lvorbisenc -ltiff ifeq ($(shell uname -o), Android) -LIBS += -landroid-shmem -liconv jpt.a +LIBS += -landroid-shmem -liconv ../libbthread-master/jpt.a endif LIBS += $(shared_libs) LIBS += $(system_libs) diff --git a/cinelerra-5.1/libbthread-master/.gitignore b/cinelerra-5.1/libbthread-master/.gitignore new file mode 100644 index 00000000..173fd369 --- /dev/null +++ b/cinelerra-5.1/libbthread-master/.gitignore @@ -0,0 +1,20 @@ +/Makefile +/Makefile.in +/aclocal.m4 +/autom4te.cache/ +/config.* +/configure +/depcomp +/install-sh +/libtool +/ltmain.sh +/m4/ +/missing +/stamp-h? +.deps/ +.dirstamp +.libs/ +*.l[ao] +*~ +/compile +*.o diff --git a/cinelerra-5.1/libbthread-master/LICENSE b/cinelerra-5.1/libbthread-master/LICENSE new file mode 100644 index 00000000..8000a6fa --- /dev/null +++ b/cinelerra-5.1/libbthread-master/LICENSE @@ -0,0 +1,504 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +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 this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. 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 not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +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 +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the 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 +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "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 +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY 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 +LIBRARY (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 LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey 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 library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random + Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! diff --git a/cinelerra-5.1/libbthread-master/Makefile.am b/cinelerra-5.1/libbthread-master/Makefile.am new file mode 100644 index 00000000..41724def --- /dev/null +++ b/cinelerra-5.1/libbthread-master/Makefile.am @@ -0,0 +1,23 @@ +# Copyright (C) 2002 Free Software Foundation, Inc. +# This file is part of the GNU C Library. +# +# The GNU C Library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Library General Public License as +# published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# The GNU C Library 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 +# Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public +# License along with the GNU C Library; see the file COPYING.LIB. If not, +# write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +# Boston, MA 02111-1307, USA. + +lib_LTLIBRARIES = libbthread.la +libbthread_la_SOURCES = pt-cancel.c pt-docancel.c pt-init.c pt-setcancelstate.c pt-setcanceltype.c pt-testcancel.c pt-internal.h +include_HEADERS = bthread.h +check_PROGRAMS = bthread-test +bthread_test_SOURCES = pt-test.c diff --git a/cinelerra-5.1/libbthread-master/README.md b/cinelerra-5.1/libbthread-master/README.md new file mode 100644 index 00000000..2b001045 --- /dev/null +++ b/cinelerra-5.1/libbthread-master/README.md @@ -0,0 +1,41 @@ +libbthread +========== + +library that provide some missing posix threading function to the bionic libc. + +while i was porting tens of linux projects under the dSploit android app i found that +the bionic libc does not provide some POSIX thread functions like `pthread_cancel`, `pthread_testcancel` and so on. + +so, i developed this library, which exploit some unused bits in the bionic thread structure. + +there is many thing to develop, like support for deferred cancels, but basic thread cancellation works :smiley: + +i hope that you find this library useful :wink: + +-- tux_mind + +License +========== + +Project is licensed under GNU LGPL v2.0 (Library General Public License) + +pt-internal.h - is from The Android Open Source Project and licensed under Apache License, Version 2.0 + +building +======== + +```bash +$ autoreconf -i +$ export PATH="$PATH:/path/to/ndk/toolchains/llvm/prebuilt/linux-x86_64/bin" +$ target_host=aarch64-linux-android +$ export AR=${target_host}-ar +$ export AS=${target_host}-as +$ export CC=${target_host}21-clang +$ export CXX=${target_host}21-clang++ +$ export LD=${target_host}-ld +$ export STRIP=${target_host}-strip +$ export CFLAGS="-fPIE -fPIC" +$ export LDFLAGS="-pie" +$ ./configure --host=${target_host} +$ make +``` diff --git a/cinelerra-5.1/libbthread-master/bthread.h b/cinelerra-5.1/libbthread-master/bthread.h new file mode 100644 index 00000000..57a0c492 --- /dev/null +++ b/cinelerra-5.1/libbthread-master/bthread.h @@ -0,0 +1,31 @@ +/* BThread main header + Copyright (C) 2002 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library 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 + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +# define PTHREAD_CANCEL_ENABLE 0x00000010 +# define PTHREAD_CANCEL_DISABLE 0x00000000 + +# define PTHREAD_CANCEL_ASYNCHRONOUS 0x00000020 +# define PTHREAD_CANCEL_DEFERRED 0x00000000 + +#define PTHREAD_CANCELED ((void *) -1) + +int pthread_setcancelstate (int , int *); +int pthread_setcanceltype (int , int *); +void pthread_testcancel (void); +int pthread_cancel (pthread_t t); diff --git a/cinelerra-5.1/libbthread-master/configure.ac b/cinelerra-5.1/libbthread-master/configure.ac new file mode 100644 index 00000000..a8b16c41 --- /dev/null +++ b/cinelerra-5.1/libbthread-master/configure.ac @@ -0,0 +1,38 @@ +# Copyright (C) 2002 Free Software Foundation, Inc. +# This file is part of the GNU C Library. +# +# The GNU C Library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Library General Public License as +# published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# The GNU C Library 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 +# Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public +# License along with the GNU C Library; see the file COPYING.LIB. If not, +# write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +# Boston, MA 02111-1307, USA. + +AC_PREREQ([2.69]) +AC_INIT([libbthread], [0.2], []) +AC_CONFIG_SRCDIR([pt-cancel.c]) +AC_CONFIG_HEADERS([config.h]) +AM_INIT_AUTOMAKE([foreign]) + +LT_INIT + +# Checks for programs. +AC_PROG_CC + +# Checks for header files. +AC_CHECK_HEADERS([stdlib.h unistd.h]) + +# Checks for typedefs, structures, and compiler characteristics. +AC_TYPE_PID_T + +AC_CONFIG_FILES([Makefile]) + +AC_OUTPUT diff --git a/cinelerra-5.1/libbthread-master/just-pt.cc b/cinelerra-5.1/libbthread-master/just-pt.cc new file mode 100644 index 00000000..37f2b999 --- /dev/null +++ b/cinelerra-5.1/libbthread-master/just-pt.cc @@ -0,0 +1,216 @@ +/* Cancel a thread. + Copyright (C) 2002 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library 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 + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ +#include +#if defined(__TERMUX__) + +#include + +#include + +#include + +int +pthread_cancel (pthread_t t) +{ + int err = 0; + struct pthread_internal_t *p = (struct pthread_internal_t*) t; + + pthread_init(); + + pthread_mutex_lock (&p->cancel_lock); + if (p->attr.flags & PTHREAD_ATTR_FLAG_CANCEL_PENDING) + { + pthread_mutex_unlock (&p->cancel_lock); + return 0; + } + + p->attr.flags |= PTHREAD_ATTR_FLAG_CANCEL_PENDING; + + if (!(p->attr.flags & PTHREAD_ATTR_FLAG_CANCEL_ENABLE)) + { + pthread_mutex_unlock (&p->cancel_lock); + return 0; + } + + if (p->attr.flags & PTHREAD_ATTR_FLAG_CANCEL_ASYNCRONOUS) { + pthread_mutex_unlock (&p->cancel_lock); + err = __pthread_do_cancel (p); + } else { + // DEFERRED CANCEL NOT IMPLEMENTED YET + pthread_mutex_unlock (&p->cancel_lock); + } + + return err; +} +/* Cancel a thread. + +#include + +#include + +static void +call_exit (void) +{ + pthread_exit (0); +} + +int +__pthread_do_cancel (struct pthread_internal_t *p) +{ + + if(p == (struct pthread_internal_t *)pthread_self()) + call_exit (); + else if(p->attr.flags & PTHREAD_ATTR_FLAG_CANCEL_HANDLER) + pthread_kill((pthread_t)p, SIGRTMIN); + else + pthread_kill((pthread_t)p, SIGTERM); + + return 0; +} +/* Init a thread. */ + +#include +#include +#include +#include + +void pthread_cancel_handler(int signum) { + pthread_exit(0); +} + +void pthread_init(void) { + struct sigaction sa; + struct pthread_internal_t * p = (struct pthread_internal_t *)pthread_self(); + + if(p->attr.flags & PTHREAD_ATTR_FLAG_CANCEL_HANDLER) + return; + + // set thread status as pthread_create should do. + // ASYNCROUNOUS is not set, see pthread_setcancelstate(3) + p->attr.flags |= PTHREAD_ATTR_FLAG_CANCEL_HANDLER|PTHREAD_ATTR_FLAG_CANCEL_ENABLE; + + sa.sa_handler = pthread_cancel_handler; + sigemptyset(&(sa.sa_mask)); + sa.sa_flags = 0; + + sigaction(SIGRTMIN, &sa, NULL); +} +/* Set the cancel state for the calling thread. */ + +#include +#include +#include +#include + +int +pthread_setcancelstate (int state, int *oldstate) +{ + struct pthread_internal_t *p = (struct pthread_internal_t*)pthread_self(); + int newflags; + + pthread_init(); + + switch (state) + { + default: + return EINVAL; + case PTHREAD_CANCEL_ENABLE: + case PTHREAD_CANCEL_DISABLE: + break; + } + + pthread_mutex_lock (&p->cancel_lock); + if (oldstate) + *oldstate = p->attr.flags & PTHREAD_ATTR_FLAG_CANCEL_ENABLE; + + if(state == PTHREAD_ATTR_FLAG_CANCEL_ENABLE) + p->attr.flags |= PTHREAD_ATTR_FLAG_CANCEL_ENABLE; + else + p->attr.flags &= ~PTHREAD_ATTR_FLAG_CANCEL_ENABLE; + newflags=p->attr.flags; + pthread_mutex_unlock (&p->cancel_lock); + + if((newflags & PTHREAD_ATTR_FLAG_CANCEL_PENDING) && (newflags & PTHREAD_ATTR_FLAG_CANCEL_ENABLE) && (newflags & PTHREAD_ATTR_FLAG_CANCEL_ASYNCRONOUS)) + __pthread_do_cancel(p); + + return 0; +} +/* */ + +#include +#include +#include +#include + +int +pthread_setcanceltype (int type, int *oldtype) +{ + struct pthread_internal_t *p = (struct pthread_internal_t*)pthread_self(); + int newflags; + + pthread_init(); + + switch (type) + { + default: + return EINVAL; + case PTHREAD_CANCEL_DEFERRED: + case PTHREAD_CANCEL_ASYNCHRONOUS: + break; + } + + pthread_mutex_lock (&p->cancel_lock); + if (oldtype) + *oldtype = p->attr.flags & PTHREAD_ATTR_FLAG_CANCEL_ASYNCRONOUS; + + if(type == PTHREAD_CANCEL_ASYNCHRONOUS) + p->attr.flags |= PTHREAD_ATTR_FLAG_CANCEL_ASYNCRONOUS; + else + p->attr.flags &= ~PTHREAD_ATTR_FLAG_CANCEL_ASYNCRONOUS; + newflags=p->attr.flags; + pthread_mutex_unlock (&p->cancel_lock); + + if((newflags & PTHREAD_ATTR_FLAG_CANCEL_PENDING) && (newflags & PTHREAD_ATTR_FLAG_CANCEL_ENABLE) && (newflags & PTHREAD_ATTR_FLAG_CANCEL_ASYNCRONOUS)) + __pthread_do_cancel(p); + + return 0; +} +/* Add an explicit cancelation point. */ + +#include +#include +#include + +void +pthread_testcancel (void) +{ + struct pthread_internal_t *p = (struct pthread_internal_t*)pthread_self(); + int cancelled; + + pthread_init(); + + pthread_mutex_lock (&p->cancel_lock); + cancelled = (p->attr.flags & PTHREAD_ATTR_FLAG_CANCEL_ENABLE) && (p->attr.flags & PTHREAD_ATTR_FLAG_CANCEL_PENDING); + pthread_mutex_unlock (&p->cancel_lock); + + if (cancelled) + pthread_exit (PTHREAD_CANCELED); + +} +#endif diff --git a/cinelerra-5.1/libbthread-master/pt-cancel.c b/cinelerra-5.1/libbthread-master/pt-cancel.c new file mode 100644 index 00000000..7683662d --- /dev/null +++ b/cinelerra-5.1/libbthread-master/pt-cancel.c @@ -0,0 +1,58 @@ +/* Cancel a thread. + Copyright (C) 2002 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library 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 + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include + +#include + +#include + +int +pthread_cancel (pthread_t t) +{ + int err = 0; + struct pthread_internal_t *p = (struct pthread_internal_t*) t; + + pthread_init(); + + pthread_mutex_lock (&p->cancel_lock); + if (p->attr.flags & PTHREAD_ATTR_FLAG_CANCEL_PENDING) + { + pthread_mutex_unlock (&p->cancel_lock); + return 0; + } + + p->attr.flags |= PTHREAD_ATTR_FLAG_CANCEL_PENDING; + + if (!(p->attr.flags & PTHREAD_ATTR_FLAG_CANCEL_ENABLE)) + { + pthread_mutex_unlock (&p->cancel_lock); + return 0; + } + + if (p->attr.flags & PTHREAD_ATTR_FLAG_CANCEL_ASYNCRONOUS) { + pthread_mutex_unlock (&p->cancel_lock); + err = __pthread_do_cancel (p); + } else { + // DEFERRED CANCEL NOT IMPLEMENTED YET + pthread_mutex_unlock (&p->cancel_lock); + } + + return err; +} diff --git a/cinelerra-5.1/libbthread-master/pt-docancel.c b/cinelerra-5.1/libbthread-master/pt-docancel.c new file mode 100644 index 00000000..d6a74df7 --- /dev/null +++ b/cinelerra-5.1/libbthread-master/pt-docancel.c @@ -0,0 +1,42 @@ +/* Cancel a thread. + Copyright (C) 2002, 2007, 2008 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library 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 + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include + +#include + +static void +call_exit (void) +{ + pthread_exit (0); +} + +int +__pthread_do_cancel (struct pthread_internal_t *p) +{ + + if(p == (struct pthread_internal_t *)pthread_self()) + call_exit (); + else if(p->attr.flags & PTHREAD_ATTR_FLAG_CANCEL_HANDLER) + pthread_kill((pthread_t)p, SIGRTMIN); + else + pthread_kill((pthread_t)p, SIGTERM); + + return 0; +} diff --git a/cinelerra-5.1/libbthread-master/pt-init.c b/cinelerra-5.1/libbthread-master/pt-init.c new file mode 100644 index 00000000..7579da62 --- /dev/null +++ b/cinelerra-5.1/libbthread-master/pt-init.c @@ -0,0 +1,45 @@ +/* Init a thread. + Copyright (C) 2002 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library 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 + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include +#include +#include +#include + +void pthread_cancel_handler(int signum) { + pthread_exit(0); +} + +void pthread_init(void) { + struct sigaction sa; + struct pthread_internal_t * p = (struct pthread_internal_t *)pthread_self(); + + if(p->attr.flags & PTHREAD_ATTR_FLAG_CANCEL_HANDLER) + return; + + // set thread status as pthread_create should do. + // ASYNCROUNOUS is not set, see pthread_setcancelstate(3) + p->attr.flags |= PTHREAD_ATTR_FLAG_CANCEL_HANDLER|PTHREAD_ATTR_FLAG_CANCEL_ENABLE; + + sa.sa_handler = pthread_cancel_handler; + sigemptyset(&(sa.sa_mask)); + sa.sa_flags = 0; + + sigaction(SIGRTMIN, &sa, NULL); +} diff --git a/cinelerra-5.1/libbthread-master/pt-internal.h b/cinelerra-5.1/libbthread-master/pt-internal.h new file mode 100644 index 00000000..19f3f1cb --- /dev/null +++ b/cinelerra-5.1/libbthread-master/pt-internal.h @@ -0,0 +1,80 @@ +/* + * Copyright (C) 2008 The Android Open Source Project + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ +#ifndef _PTHREAD_INTERNAL_H_ +#define _PTHREAD_INTERNAL_H_ + +#include + +struct pthread_internal_t { + struct pthread_internal_t* next; + struct pthread_internal_t* prev; + + pid_t tid; + + void** tls; + + volatile pthread_attr_t attr; + + __pthread_cleanup_t* cleanup_stack; + + void* (*start_routine)(void*); + void* start_routine_arg; + void* return_value; + + void* alternate_signal_stack; + + /* + * The dynamic linker implements dlerror(3), which makes it hard for us to implement this + * per-thread buffer by simply using malloc(3) and free(3). + */ +#define __BIONIC_DLERROR_BUFFER_SIZE 508 + char dlerror_buffer[__BIONIC_DLERROR_BUFFER_SIZE]; + + // ugly hack: use last 4 bytes of dlerror_buffer as cancel_lock + pthread_mutex_t cancel_lock; +}; + +/* Has the thread a cancellation request? */ +#define PTHREAD_ATTR_FLAG_CANCEL_PENDING 0x00000008 + +/* Has the thread enabled cancellation? */ +#define PTHREAD_ATTR_FLAG_CANCEL_ENABLE 0x00000010 + +/* Has the thread asyncronous cancellation? */ +#define PTHREAD_ATTR_FLAG_CANCEL_ASYNCRONOUS 0x00000020 + +/* Has the thread a cancellation handler? */ +#define PTHREAD_ATTR_FLAG_CANCEL_HANDLER 0x00000040 + +struct pthread_internal_t *__pthread_getid ( pthread_t ); + +int __pthread_do_cancel (struct pthread_internal_t *); + +void pthread_init(void); + +#endif /* _PTHREAD_INTERNAL_H_ */ diff --git a/cinelerra-5.1/libbthread-master/pt-setcancelstate.c b/cinelerra-5.1/libbthread-master/pt-setcancelstate.c new file mode 100644 index 00000000..ecc0d65b --- /dev/null +++ b/cinelerra-5.1/libbthread-master/pt-setcancelstate.c @@ -0,0 +1,57 @@ +/* Set the cancel state for the calling thread. + Copyright (C) 2002 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library 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 + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include +#include +#include +#include + +int +pthread_setcancelstate (int state, int *oldstate) +{ + struct pthread_internal_t *p = (struct pthread_internal_t*)pthread_self(); + int newflags; + + pthread_init(); + + switch (state) + { + default: + return EINVAL; + case PTHREAD_CANCEL_ENABLE: + case PTHREAD_CANCEL_DISABLE: + break; + } + + pthread_mutex_lock (&p->cancel_lock); + if (oldstate) + *oldstate = p->attr.flags & PTHREAD_ATTR_FLAG_CANCEL_ENABLE; + + if(state == PTHREAD_ATTR_FLAG_CANCEL_ENABLE) + p->attr.flags |= PTHREAD_ATTR_FLAG_CANCEL_ENABLE; + else + p->attr.flags &= ~PTHREAD_ATTR_FLAG_CANCEL_ENABLE; + newflags=p->attr.flags; + pthread_mutex_unlock (&p->cancel_lock); + + if((newflags & PTHREAD_ATTR_FLAG_CANCEL_PENDING) && (newflags & PTHREAD_ATTR_FLAG_CANCEL_ENABLE) && (newflags & PTHREAD_ATTR_FLAG_CANCEL_ASYNCRONOUS)) + __pthread_do_cancel(p); + + return 0; +} diff --git a/cinelerra-5.1/libbthread-master/pt-setcanceltype.c b/cinelerra-5.1/libbthread-master/pt-setcanceltype.c new file mode 100644 index 00000000..1b8cda1a --- /dev/null +++ b/cinelerra-5.1/libbthread-master/pt-setcanceltype.c @@ -0,0 +1,57 @@ +/* Set the cancel type for the calling thread. + Copyright (C) 2002 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library 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 + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include +#include +#include +#include + +int +pthread_setcanceltype (int type, int *oldtype) +{ + struct pthread_internal_t *p = (struct pthread_internal_t*)pthread_self(); + int newflags; + + pthread_init(); + + switch (type) + { + default: + return EINVAL; + case PTHREAD_CANCEL_DEFERRED: + case PTHREAD_CANCEL_ASYNCHRONOUS: + break; + } + + pthread_mutex_lock (&p->cancel_lock); + if (oldtype) + *oldtype = p->attr.flags & PTHREAD_ATTR_FLAG_CANCEL_ASYNCRONOUS; + + if(type == PTHREAD_CANCEL_ASYNCHRONOUS) + p->attr.flags |= PTHREAD_ATTR_FLAG_CANCEL_ASYNCRONOUS; + else + p->attr.flags &= ~PTHREAD_ATTR_FLAG_CANCEL_ASYNCRONOUS; + newflags=p->attr.flags; + pthread_mutex_unlock (&p->cancel_lock); + + if((newflags & PTHREAD_ATTR_FLAG_CANCEL_PENDING) && (newflags & PTHREAD_ATTR_FLAG_CANCEL_ENABLE) && (newflags & PTHREAD_ATTR_FLAG_CANCEL_ASYNCRONOUS)) + __pthread_do_cancel(p); + + return 0; +} diff --git a/cinelerra-5.1/libbthread-master/pt-testcancel.c b/cinelerra-5.1/libbthread-master/pt-testcancel.c new file mode 100644 index 00000000..9d5dbdf3 --- /dev/null +++ b/cinelerra-5.1/libbthread-master/pt-testcancel.c @@ -0,0 +1,39 @@ +/* Add an explicit cancelation point. + Copyright (C) 2002 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library 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 + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include +#include +#include + +void +pthread_testcancel (void) +{ + struct pthread_internal_t *p = (struct pthread_internal_t*)pthread_self(); + int cancelled; + + pthread_init(); + + pthread_mutex_lock (&p->cancel_lock); + cancelled = (p->attr.flags & PTHREAD_ATTR_FLAG_CANCEL_ENABLE) && (p->attr.flags & PTHREAD_ATTR_FLAG_CANCEL_PENDING); + pthread_mutex_unlock (&p->cancel_lock); + + if (cancelled) + pthread_exit (PTHREAD_CANCELED); + +} diff --git a/cinelerra-5.1/libzmpeg3/Makefile b/cinelerra-5.1/libzmpeg3/Makefile index 7e96761f..d854fa97 100644 --- a/cinelerra-5.1/libzmpeg3/Makefile +++ b/cinelerra-5.1/libzmpeg3/Makefile @@ -83,7 +83,7 @@ ifeq ($(WANT_CIN_3RDPARTY),no) LIBS += -la52 endif ifeq ($(shell uname -o), Android) -LIBS += jpt.a +LIBS += ../libbthread-master/jpt.a endif LIBS += $(lib_a52dec) $(lib_djbfft) $(lib_libbthread) diff --git a/cinelerra-5.1/mpeg2enc/Makefile b/cinelerra-5.1/mpeg2enc/Makefile index ceac3cec..f517e52f 100644 --- a/cinelerra-5.1/mpeg2enc/Makefile +++ b/cinelerra-5.1/mpeg2enc/Makefile @@ -60,7 +60,7 @@ ifeq ($(WANT_CIN_3RDPARTY),no) LIBS += -la52 endif ifeq ($(shell uname -o), Android) -LIBS += jpt.a +LIBS += ../libbthread-master/jpt.a endif HVEG2LIB = $(OBJDIR)/hveg2enc.a diff --git a/cinelerra-5.1/mplexlo/Makefile b/cinelerra-5.1/mplexlo/Makefile index 66126523..068c4981 100644 --- a/cinelerra-5.1/mplexlo/Makefile +++ b/cinelerra-5.1/mplexlo/Makefile @@ -17,7 +17,7 @@ ifeq ($(WANT_CIN_3RDPARTY),no) LIBS += -la52 endif ifeq ($(shell uname -o), Android) -LIBS += jpt.a +LIBS += ../libbthread-master/jpt.a endif OUTPUT := $(OBJDIR)/mplexlo -- 2.26.2