aboutsummaryrefslogtreecommitdiffstats
path: root/luaevent
diff options
context:
space:
mode:
Diffstat (limited to 'luaevent')
-rw-r--r--luaevent/CHANGELOG37
-rw-r--r--luaevent/COROUTINE_MANAGEMENT39
-rw-r--r--luaevent/LICENSE4
-rw-r--r--luaevent/README13
-rw-r--r--luaevent/doc/COPYING504
-rw-r--r--luaevent/doc/PLAN19
-rw-r--r--luaevent/include/luaevent.h24
-rw-r--r--luaevent/luaevent.lua157
-rw-r--r--luaevent/premake.lua32
-rw-r--r--luaevent/src/luaevent.c184
-rw-r--r--luaevent/test/test.lua34
-rw-r--r--luaevent/test/testClient.lua19
12 files changed, 0 insertions, 1066 deletions
diff --git a/luaevent/CHANGELOG b/luaevent/CHANGELOG
deleted file mode 100644
index f2f964d..0000000
--- a/luaevent/CHANGELOG
+++ /dev/null
@@ -1,37 +0,0 @@
-======
-0.1.2 - Revision 15 - 2007-08-18
-+ Setup system to use new coro management as described in COROUTINE_MANAGEMENT
- The callbacks are called from the event_loop 'thread' rather than that which they are
- created in. This will prevent the self-resume problem as well as dead-thread problems.
-- Recognized issues to fix in next release:
- * Socket/event closing needs to be cleaned
- * luaevent.lua needs refactoring
- * luaevent.[ch] need to be cleaned up
-======
-0.1.1 - Revision 14 - 2007-06-13
-+ Fixed event-handling code to cancel events on nothing being returned
-+ Added socket/object cleanup.
-+ Filed bug to libevent about the strange valgrind-released errors
-- Recognized following issues:
- Timeouts needed
- Need to handle events setup from inside a coroutine... need to get a global Lua state from a thread...
-======
-0.1.0 - Revision 6 - 2007-06-10 22:00 EST
-Completed mostly working version
-* Moved to a mode where addevent calls a callback rather than it being instantiated within.
- If the callback returns -1, then no event is ever setup,
- Otherwise the integer value is used to setup the event.
- This allows for using coroutine.wrap rather than a cooked-up wrapper
-* Tests work, although there are a few remaining issues:
-* Need to figure a good way of preserving the event object,
- not sure if current method is good enough, since the socket
- is the only anchor, and it is only held inside the coro..
- circular reference, something that Lua 'handles' well.
-* Doing more than the maximum sockets the process is allows
- causes strangeness to occur in libevent.. somehow
- it is getting around to epoll_add which is causing valgrind
- to barf.
-* Added cheap protection code for failures in callback handlers
-======
-0.0.0 - Revision 2 - 2007-06-10 12:00 EST
-Initial public version, was broken due to self-resume coroutines
diff --git a/luaevent/COROUTINE_MANAGEMENT b/luaevent/COROUTINE_MANAGEMENT
deleted file mode 100644
index 1af0cb4..0000000
--- a/luaevent/COROUTINE_MANAGEMENT
+++ /dev/null
@@ -1,39 +0,0 @@
-Due to the issue w/ self-resuming threads and crashing out threads,
-a management system needs to be in place.
-
-Example thread system:
-
-MAIN
-EVENT_LOOP --------running---
-WAITING ON READ
-WAITING ON WRITE
-WAITING ON CONNECT
-
-
-Since main and the other 'waiting' threads are yielded, it is unsafe to call things arbitrarily on them
-or resume them from themselves...
-However the EVENT_LOOP one is running and thus can execute the callbacks (which can resume the threads)
-Each of the 'waiting' events are attached to an event and contain a pointer, this pointer can be setup to point
-to a per event_base item which will be updated w/ the lua_State of whatever calls EVENT_LOOP...
-this will guarantee that the thread will be resumed from the currently running EVENT_LOOP
-
-
-Other system that's more complicated and less likely:
-
-MAIN
-EVENT_LOOP a -----running---
-
-WAITING ON READ a
-WAITING ON WRITE a
-
-EVENT_LOOP b ----yielded
-WAITING ON READ b
-
-
-Since there can only be one event_loop running per event_base, you do not have to worry about
-cross-pollination of the different waits...
-
-NOTES:
-If the event_loop thread goes away... then the waiting coroutines will have no way to get back...
-though in this case, they are dead in the water anyways.. until a new event_loop starts...
-in which case the lua_State references has been updated... \ No newline at end of file
diff --git a/luaevent/LICENSE b/luaevent/LICENSE
deleted file mode 100644
index 334eadf..0000000
--- a/luaevent/LICENSE
+++ /dev/null
@@ -1,4 +0,0 @@
-LuaEvent - Binding of libevent to Lua to offer event-based IO programming
-Copyright (C) 2007 Thomas Harning <harningt@gmail.com>
-
-See doc/COPYING for more details. \ No newline at end of file
diff --git a/luaevent/README b/luaevent/README
deleted file mode 100644
index 7242bcc..0000000
--- a/luaevent/README
+++ /dev/null
@@ -1,13 +0,0 @@
-Build Requirements:
- premake (>= 3.3)
- libevent (recommend >= 1.3b)
-Usage Requirements:
- libevent (recommend >= 1.3b)
- LuaSocket
-
-See test/ directory for examples of usage.
-
-Project page: http://luaforge.net/projects/luaevent/
-GIT Repos:
-git://repo.or.cz/luaevent.git
-http://repo.or.cz/r/luaevent.git
diff --git a/luaevent/doc/COPYING b/luaevent/doc/COPYING
deleted file mode 100644
index 5ab7695..0000000
--- a/luaevent/doc/COPYING
+++ /dev/null
@@ -1,504 +0,0 @@
- 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.
-
- <one line to give the library's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- 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.
-
- <signature of Ty Coon>, 1 April 1990
- Ty Coon, President of Vice
-
-That's all there is to it!
-
-
diff --git a/luaevent/doc/PLAN b/luaevent/doc/PLAN
deleted file mode 100644
index d3e8778..0000000
--- a/luaevent/doc/PLAN
+++ /dev/null
@@ -1,19 +0,0 @@
--- Listener Scenario
-create socket, perform bind, set listening
-+add read-event listener
-+start loop
-
--- Comm Scenario
-provided socket
--inside loop
-begin coro
- read - data not ready
- yield sock, needRead
-end coro
-coro parent == callback
-(coro parent
- call coro(sock, event)
- if not ok, go back.. end
- if newEvent ~= event then
- unset event, reset newEvent
- end) \ No newline at end of file
diff --git a/luaevent/include/luaevent.h b/luaevent/include/luaevent.h
deleted file mode 100644
index 2878632..0000000
--- a/luaevent/include/luaevent.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* LuaEvent - Copyright (C) 2007 Thomas Harning <harningt@gmail.com>
- * Licensed as LGPL - See doc/COPYING for details */
-#ifndef LUAEVENT_H
-#define LUAEVENT_H
-
-#include <lua.h>
-#include <sys/types.h>
-#include <sys/time.h>
-#include <event.h>
-
-typedef struct {
- struct event_base* base;
- lua_State* loop_L;
-} le_base;
-
-typedef struct {
- struct event ev;
- le_base* base;
- int callbackRef;
-} le_callback;
-
-int luaopen_luaevent(lua_State* L);
-
-#endif
diff --git a/luaevent/luaevent.lua b/luaevent/luaevent.lua
deleted file mode 100644
index ec9bc15..0000000
--- a/luaevent/luaevent.lua
+++ /dev/null
@@ -1,157 +0,0 @@
---[[
- LuaEvent - Copyright (C) 2007 Thomas Harning <harningt@gmail.com>
- Licensed as LGPL - See doc/COPYING for details.
-]]
-module("luaevent", package.seeall)
-require("luaevent.core")
-
-local EV_READ = luaevent.core.EV_READ
-local EV_WRITE = luaevent.core.EV_WRITE
-local fair = false -- Not recommended for most cases...
-local base = luaevent.core.new()
-local sockMap = setmetatable({}, {'__mode', 'kv'})
-local function addevent(sock, ...)
- local item = base:addevent(sock, ...)
- if not item then print("FAILED TO SETUP ITEM") return item end
- local fd = sock:getfd()
- sockMap[item] = fd
- print("SETUP ITEM FOR: ", fd)
- if not hookedObjectMt then
- hookedObjectMt = true
- --[[
- local mt = debug.getmetatable(item)
- local oldGC = mt.__gc
- mt.__gc = function(...)
- print("RELEASING ITEM FOR: ", sockMap[(...)])
- return oldGC(...)
- end]]
- end
- return item
-end
--- Weak keys.. the keys are the client sockets
-local clientTable = setmetatable({}, {'__mode', 'kv'})
-
-local function getWrapper()
- local running = coroutine.running()
- return function(...)
- if coroutine.running() == running then return end
- return select(2, coroutine.resume(running, ...))
- end
-end
-
-function send(sock, data, start, stop)
- local s, err
- local from = start or 1
- local sent = 0
- repeat
- from = from + sent
- s, err, sent = sock:send(data, from, stop)
- -- Add extra coro swap for fairness
- -- CURRENTLY DISABLED FOR TESTING......
- if fair and math.random(100) > 90 then
- if not clientTable[sock] then clientTable[sock] = addevent(sock, EV_WRITE, getWrapper()) end
- coroutine.yield(EV_WRITE)
- end
- if s or err ~= "timeout" then return s, err, sent end
- if not clientTable[sock] then clientTable[sock] = addevent(sock, EV_WRITE, getWrapper()) end
- coroutine.yield(EV_WRITE)
- until false
-end
-function receive(sock, pattern, part)
- local s, err
- pattern = pattern or '*l'
- repeat
- s, err, part = sock:receive(pattern, part)
- if s or err ~= "timeout" then return s, err, part end
- if not clientTable[sock] then clientTable[sock] = addevent(sock, EV_READ, getWrapper()) end
- coroutine.yield(EV_READ)
- until false
-end
--- same as above but with special treatment when reading chunks,
--- unblocks on any data received.
-function receivePartial(client, pattern)
- local s, err, part
- pattern = pattern or "*l"
- repeat
- s, err, part = client:receive(pattern)
- if s or ( (type(pattern)=="number") and part~="" and part ~=nil ) or
- err ~= "timeout" then return s, err, part end
- if not clientTable[sock] then clientTable[sock] = addevent(sock, EV_READ, getWrapper()) end
- coroutine.yield(EV_READ)
- until false
-end
-function connect(sock, ...)
- sock:settimeout(0)
- local ret, err = sock:connect(...)
- if ret or err ~= "timeout" then return ret, err end
- if not clientTable[sock] then clientTable[sock] = addevent(sock, EV_WRITE, getWrapper()) end
- coroutine.yield(EV_WRITE)
- ret, err = sock:connect(...)
- if err == "already connected" then
- return 1
- end
- return ret, err
-end
--- Deprecated..
-function flush(sock)
-end
-local function clientCoroutine(sock, handler)
- -- Figure out what to do ......
- return handler(sock)
-end
-local function handleClient(co, client, handler)
- local ok, res, event = coroutine.resume(co, client, handler)
-end
-local function serverCoroutine(sock, callback)
- local listenItem = addevent(sock, EV_READ, getWrapper())
- repeat
- local event = coroutine.yield(EV_READ)
- -- Get new socket
- local client = sock:accept()
- if client then
- client:settimeout(0)
- local co = coroutine.create(clientCoroutine)
- handleClient(co, client, callback)
- end
- until false
-end
-function addserver(sock, callback)
- local coro = coroutine.create(serverCoroutine)
- assert(coroutine.resume(coro, sock, callback))
-end
-function addthread(func, ...)
- return coroutine.resume(coroutine.create(func), ...)
-end
-local _skt_mt = {__index = {
- connect = function(self, ...)
- return connect(self.socket, ...)
- end,
- send = function (self, data)
- return send(self.socket, data)
- end,
-
- receive = function (self, pattern)
- if (self.timeout==0) then
- return receivePartial(self.socket, pattern)
- end
- return receive(self.socket, pattern)
- end,
-
- flush = function (self)
- return flush(self.socket)
- end,
-
- settimeout = function (self,time)
- self.timeout=time
- return
- end,
-
- close = function(self)
- clientTable[self.socket]:close()
- self.socket:close()
- end
-}}
-function wrap(sock)
- return setmetatable({socket = sock}, _skt_mt)
-end
-loop = function(...) base:loop(...) end \ No newline at end of file
diff --git a/luaevent/premake.lua b/luaevent/premake.lua
deleted file mode 100644
index 654ffb0..0000000
--- a/luaevent/premake.lua
+++ /dev/null
@@ -1,32 +0,0 @@
-project.name = "luaevent.core"
-project.libdir = "lib"
-project.bindir = "bin"
-
-package = newpackage()
-package.kind = "dll"
-package.language = "c++"
-package.targetprefix = ""
-package.target = "core"
-
-package.links = {
- "event"
-}
-
-package.includepaths = {
- "include",
-}
-if linux then
- package.buildoptions = { "-Wall" }
- package.config["Debug"].buildoptions = { "-O0" }
- package.linkoptions = { "-Wall -L/usr/local/lib" }
- package.postbuildcommands = { "mkdir -p test/luaevent", "cp bin/* test/luaevent", "cp luaevent.lua test" }
-else
- print([[Other environements currently untested, may need tweaking]])
-end
-
-package.files = {
- matchrecursive(
- "src/*.c",
- "include/*.h"
- )
-}
diff --git a/luaevent/src/luaevent.c b/luaevent/src/luaevent.c
deleted file mode 100644
index 38f19ce..0000000
--- a/luaevent/src/luaevent.c
+++ /dev/null
@@ -1,184 +0,0 @@
-/* LuaEvent - Copyright (C) 2007 Thomas Harning <harningt@gmail.com>
- * Licensed as LGPL - See doc/COPYING for details */
- #include "luaevent.h"
-
-#include <lua.h>
-#include <lauxlib.h>
-#include <assert.h>
-
-#define EVENT_BASE_MT "EVENT_BASE_MT"
-#define EVENT_CALLBACK_ARG_MT "EVENT_CALLBACK_ARG_MT"
-#define MAIN_THREAD_LOCATION 1
-
-void setMainThread(lua_State* L) {
- lua_pushthread(L);
- lua_rawseti(L, LUA_ENVIRONINDEX, MAIN_THREAD_LOCATION);
-}
-lua_State* getMainThread(lua_State* L) {
- lua_State* g_L;
- lua_rawgeti(L, LUA_ENVIRONINDEX, MAIN_THREAD_LOCATION);
- g_L = lua_tothread(L, -1);
- lua_pop(L, 1);
- return g_L;
-}
-
-int luaevent_newbase(lua_State* L) {
- le_base *base = (le_base*)lua_newuserdata(L, sizeof(le_base));
- base->loop_L = NULL; /* No running loop */
- base->base = event_init();
- luaL_getmetatable(L, EVENT_BASE_MT);
- lua_setmetatable(L, -2);
- return 1;
-}
-
-void freeCallbackArgs(le_callback* arg, lua_State* L) {
- if(arg->base) {
- arg->base = NULL;
- event_del(&arg->ev);
- luaL_unref(L, LUA_REGISTRYINDEX, arg->callbackRef);
- }
-}
-/* le_callback is allocated at the beginning of the coroutine in which it
-is used, no need to manually de-allocate */
-
-/* Index for coroutine is fd as integer for *nix, as lightuserdata for Win */
-static void luaevent_callback(int fd, short event, void* p) {
- le_callback* arg = p;
- lua_State* L;
- int ret;
- assert(arg && arg->base && arg->base->loop_L);
- L = arg->base->loop_L;
- lua_rawgeti(L, LUA_REGISTRYINDEX, arg->callbackRef);
- lua_pushinteger(L, event);
- lua_call(L, 1, 1);
- ret = lua_tointeger(L, -1);
- lua_pop(L, 1);
- if(ret == -1) {
- freeCallbackArgs(arg, L);
- } else {
- struct event *ev = &arg->ev;
- int newEvent = ret;
- if(newEvent != event) { // Need to hook up new event...
- event_del(ev);
- event_set(ev, fd, EV_PERSIST | newEvent, luaevent_callback, arg);
- event_add(ev, NULL);
- }
- }
-}
-
-static int luaevent_base_gc(lua_State* L) {
- le_base *base = luaL_checkudata(L, 1, EVENT_BASE_MT);
- if(base->base) {
- event_base_free(base->base);
- base->base = NULL;
- }
- return 0;
-}
-
-static int luaevent_cb_gc(lua_State* L) {
- le_callback* arg = luaL_checkudata(L, 1, EVENT_CALLBACK_ARG_MT);
- freeCallbackArgs(arg, L);
- return 0;
-}
-
-int getSocketFd(lua_State* L, int idx) {
- int fd;
- luaL_checktype(L, idx, LUA_TUSERDATA);
- lua_getfield(L, idx, "getfd");
- if(lua_isnil(L, -1))
- return luaL_error(L, "Socket type missing 'getfd' method");
- lua_pushvalue(L, idx);
- lua_call(L, 1, 1);
- fd = lua_tointeger(L, -1);
- lua_pop(L, 1);
- return fd;
-}
-
-/* sock, event, callback */
-static int luaevent_addevent(lua_State* L) {
- int fd, event, callbackRef;
- le_callback* arg;
- le_base *base = luaL_checkudata(L, 1, EVENT_BASE_MT);
- fd = getSocketFd(L, 2);
- event = luaL_checkinteger(L, 3);
- luaL_checktype(L, 4, LUA_TFUNCTION);
- lua_pushvalue(L, 4);
- callbackRef = luaL_ref(L, LUA_REGISTRYINDEX);
- arg = lua_newuserdata(L, sizeof(*arg));
- luaL_getmetatable(L, EVENT_CALLBACK_ARG_MT);
- lua_setmetatable(L, -2);
-
- arg->base = base;
- arg->callbackRef = callbackRef;
- /* Setup event... */
- event_set(&arg->ev, fd, event | EV_PERSIST, luaevent_callback, arg);
- event_base_set(base->base, &arg->ev);
- event_add(&arg->ev, NULL);
- return 1;
-}
-
-static int luaevent_loop(lua_State* L) {
- le_base *base = luaL_checkudata(L, 1, EVENT_BASE_MT);
- base->loop_L = L;
- int ret = event_base_loop(base->base, 0);
- lua_pushinteger(L, ret);
- return 1;
-}
-
-static luaL_Reg base_funcs[] = {
- { "addevent", luaevent_addevent },
- { "loop", luaevent_loop },
- { NULL, NULL }
-};
-
-static luaL_Reg funcs[] = {
- { "new", luaevent_newbase },
- { NULL, NULL }
-};
-
-typedef struct {
- const char* name;
- int value;
-} namedInteger;
-
-static namedInteger consts[] = {
- {"LEAVE", -1},
- {"EV_READ", EV_READ},
- {"EV_WRITE", EV_WRITE},
- {NULL, 0}
-};
-
-void setNamedIntegers(lua_State* L, namedInteger* p) {
- while(p->name) {
- lua_pushinteger(L, p->value);
- lua_setfield(L, -2, p->name);
- p++;
- }
-}
-
-/* Verified ok */
-int luaopen_luaevent_core(lua_State* L) {
- /* Setup environ table */
- lua_createtable(L, 1, 0);
- lua_replace(L, LUA_ENVIRONINDEX);
- /* Setup metatable */
- luaL_newmetatable(L, EVENT_BASE_MT);
- lua_newtable(L);
- luaL_register(L, NULL, base_funcs);
- lua_setfield(L, -2, "__index");
- lua_pushcfunction(L, luaevent_base_gc);
- lua_setfield(L, -2, "__gc");
- lua_pop(L, 1);
- luaL_newmetatable(L, EVENT_CALLBACK_ARG_MT);
- lua_pushcfunction(L, luaevent_cb_gc);
- lua_setfield(L, -2, "__gc");
- lua_newtable(L);
- lua_pushcfunction(L, luaevent_cb_gc);
- lua_setfield(L, -2, "close");
- lua_setfield(L, -2, "__index");
- lua_pop(L, 1);
-
- luaL_register(L, "luaevent.core", funcs);
- setNamedIntegers(L, consts);
- return 1;
-}
diff --git a/luaevent/test/test.lua b/luaevent/test/test.lua
deleted file mode 100644
index 412857e..0000000
--- a/luaevent/test/test.lua
+++ /dev/null
@@ -1,34 +0,0 @@
--- Tests Copas with a simple Echo server
---
--- Run the test file and the connect to the server by telnet on the used port
--- to stop the test just send the command "quit"
-
-require"luaevent"
-require"socket"
-local oldPrint = print
-print = function(...)
- oldPrint("SRV", ...)
-end
-
-local function echoHandler(skt)
- while true do
- local data,ret = luaevent.receive(skt, 10)
- --print("GOT: ", data, ret)
- if data == "quit" or ret == 'closed' then
- break
- end
- luaevent.send(skt, data)
- collectgarbage()
- end
- skt:close()
- --print("DONE")
-end
-local server = assert(socket.bind("localhost", 20000))
-server:settimeout(0)
-local coro = coroutine.create
-coroutine.create = function(...)
- local ret = coro(...)
- return ret
-end
-luaevent.addserver(server, echoHandler)
-luaevent.loop()
diff --git a/luaevent/test/testClient.lua b/luaevent/test/testClient.lua
deleted file mode 100644
index fbbcf87..0000000
--- a/luaevent/test/testClient.lua
+++ /dev/null
@@ -1,19 +0,0 @@
-require"luaevent"
-require"socket"
-local oldPrint = print
-print = function(...)
- oldPrint("CLT", ...)
-end
-
-local function func()
- print("ACTIVATED")
- local sock = socket.tcp()
- --sock:
- sock = luaevent.wrap(sock)
- print(assert(sock:connect("localhost", 20000)))
- for i = 1, 100 do assert(sock:send("Greet me ")) assert(sock:receive(10)) collectgarbage() end
-end
-
-luaevent.addthread(func)
-
-luaevent.loop() \ No newline at end of file