1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MWL#192: non-blocking client API, after-review fixes.

Browse Source 
Main change is that non-blocking operation is now an option that must be
explicitly enabled with mysql_option(mysql, MYSQL_OPT_NONBLOCK, ...)
before any non-blocing operation can be used.

Also the CLIENT_REMEMBER_OPTIONS flag is now always enabled and thus
effectively ignored (it was not really useful anyway, and this simplifies
things when non-blocking mysql_real_connect() fails).
This commit is contained in:
unknown 2012-01-06 12:43:18 +01:00
parent a5b881594d
commit 17940b652d
23 changed files with 1727 additions and 765 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

516
COPYING.LESSER Normal file
View File

@ -0,0 +1,516 @@
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.
^L
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.
^L
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.
^L
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.
^L
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.
^L
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.
^L
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.
^L
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
^L
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 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!

2
Makefile.am
View File

@ -21,7 +21,7 @@ AUTOMAKE_OPTIONS = foreign
# These are built from source in the Docs directory # These are built from source in the Docs directory
EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \ EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \
README COPYING EXCEPTIONS-CLIENT \ README COPYING EXCEPTIONS-CLIENT \
CMakeLists.txt \ CMakeLists.txt COPYING.LESSER \
config/ac-macros/libevent_configure.m4 config/ac-macros/libevent_configure.m4
SUBDIRS = . include @docs_dirs@ @zlib_dir@ \ SUBDIRS = . include @docs_dirs@ @zlib_dir@ \
@readline_topdir@ sql-common scripts \ @readline_topdir@ sql-common scripts \

31
client/async_example.c
View File

@ -1,17 +1,15 @@
/* /*
Copyright 2011 Kristian Nielsen and Monty Program Ab. Copyright 2011 Kristian Nielsen and Monty Program Ab.
Experiments with non-blocking libmysql. This file 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 is free software: you can redistribute it and/or modify This library is distributed in the hope that it will be useful,
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
GNU General Public License for more details. Lesser General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this. If not, see <http://www.gnu.org/licenses/>. along with this. If not, see <http://www.gnu.org/licenses/>.
@ -133,6 +131,7 @@ doit(const char *host, const char *user, const char *password)
int status; int status;
mysql_init(&mysql); mysql_init(&mysql);
mysql_options(&mysql, MYSQL_OPT_NONBLOCK, 0);
mysql_options(&mysql, MYSQL_READ_DEFAULT_GROUP, "myapp"); mysql_options(&mysql, MYSQL_READ_DEFAULT_GROUP, "myapp");
/* Returns 0 when done, else flag for what to wait for when need to block. */ /* Returns 0 when done, else flag for what to wait for when need to block. */
@ -177,8 +176,18 @@ doit(const char *host, const char *user, const char *password)
fatal(&mysql, "Got error while retrieving rows"); fatal(&mysql, "Got error while retrieving rows");
mysql_free_result(res); mysql_free_result(res);
/* I suppose this must be non-blocking too. */ /*
mysql_close(&mysql); mysql_close() sends a COM_QUIT packet, and so in principle could block
waiting for the socket to accept the data.
In practise, for many applications it will probably be fine to use the
blocking mysql_close().
*/
status= mysql_close_start(&mysql);
while (status)
{
status= wait_for_mysql(&mysql, status);
status= mysql_close_cont(&mysql, status);
}
} }
int int

3
client/mysqltest.cc
View File

@ -5368,6 +5368,7 @@ void do_connect(struct st_command *command)
#endif #endif
if (!(con_slot->mysql= mysql_init(0))) if (!(con_slot->mysql= mysql_init(0)))
die("Failed on mysql_init()"); die("Failed on mysql_init()");
mysql_options(con_slot->mysql, MYSQL_OPT_NONBLOCK, 0);
if (opt_compress || con_compress) if (opt_compress || con_compress)
mysql_options(con_slot->mysql, MYSQL_OPT_COMPRESS, NullS); mysql_options(con_slot->mysql, MYSQL_OPT_COMPRESS, NullS);
mysql_options(con_slot->mysql, MYSQL_OPT_LOCAL_INFILE, 0); mysql_options(con_slot->mysql, MYSQL_OPT_LOCAL_INFILE, 0);
@ -7491,6 +7492,7 @@ int util_query(MYSQL* org_mysql, const char* query){
/* enable local infile, in non-binary builds often disabled by default */ /* enable local infile, in non-binary builds often disabled by default */
mysql_options(mysql, MYSQL_OPT_LOCAL_INFILE, 0); mysql_options(mysql, MYSQL_OPT_LOCAL_INFILE, 0);
mysql_options(mysql, MYSQL_OPT_NONBLOCK, 0);
safe_connect(mysql, "util", org_mysql->host, org_mysql->user, safe_connect(mysql, "util", org_mysql->host, org_mysql->user,
org_mysql->passwd, org_mysql->db, org_mysql->port, org_mysql->passwd, org_mysql->db, org_mysql->port,
org_mysql->unix_socket); org_mysql->unix_socket);
@ -8226,6 +8228,7 @@ int main(int argc, char **argv)
if (!(con->name = my_strdup("default", MYF(MY_WME)))) if (!(con->name = my_strdup("default", MYF(MY_WME))))
die("Out of memory"); die("Out of memory");
mysql_options(con->mysql, MYSQL_OPT_NONBLOCK, 0);
safe_connect(con->mysql, con->name, opt_host, opt_user, opt_pass, safe_connect(con->mysql, con->name, opt_host, opt_user, opt_pass,
opt_db, opt_port, unix_sock); opt_db, opt_port, unix_sock);

2
include/Makefile.am
View File

@ -46,7 +46,7 @@ noinst_HEADERS = config-win.h config-netware.h lf.h my_bit.h \
atomic/rwlock.h atomic/x86-gcc.h \ atomic/rwlock.h atomic/x86-gcc.h \
atomic/generic-msvc.h \ atomic/generic-msvc.h \
atomic/gcc_builtins.h my_libwrap.h my_stacktrace.h \ atomic/gcc_builtins.h my_libwrap.h my_stacktrace.h \
wqueue.h waiting_threads.h my_context.h wqueue.h waiting_threads.h my_context.h mysql_async.h
EXTRA_DIST = mysql.h.pp mysql/plugin_auth.h.pp mysql/client_plugin.h.pp CMakeLists.txt EXTRA_DIST = mysql.h.pp mysql/plugin_auth.h.pp mysql/client_plugin.h.pp CMakeLists.txt

23
include/my_context.h
View File

@ -1,17 +1,15 @@
/* /*
Copyright 2011 Kristian Nielsen Copyright 2011 Kristian Nielsen and Monty Program Ab
Experiments with non-blocking libmysql. This file 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 is free software: you can redistribute it and/or modify This library is distributed in the hope that it will be useful,
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
GNU General Public License for more details. Lesser General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this. If not, see <http://www.gnu.org/licenses/>. along with this. If not, see <http://www.gnu.org/licenses/>.
@ -164,11 +162,14 @@ struct mysql_async_context {
/* /*
This is set to the value that should be returned from foo_start() or This is set to the value that should be returned from foo_start() or
foo_cont() when a call is suspended. foo_cont() when a call is suspended.
*/
unsigned int events_to_wait_for;
/*
It is also set to the event(s) that triggered when a suspended call is It is also set to the event(s) that triggered when a suspended call is
resumed, eg. whether we woke up due to connection completed or timeout resumed, eg. whether we woke up due to connection completed or timeout
in mysql_real_connect_cont(). in mysql_real_connect_cont().
*/ */
unsigned int ret_status; unsigned int events_occured;
/* /*
This is set to the result of the whole asynchronous operation when it This is set to the result of the whole asynchronous operation when it
completes. It uses a union, as different calls have different return completes. It uses a union, as different calls have different return

4
include/my_dbug.h
View File

@ -134,6 +134,8 @@ extern void dbug_free_code_state(void **code_state_store);
#define DEBUGGER_OFF do { _dbug_on_= 0; } while(0) #define DEBUGGER_OFF do { _dbug_on_= 0; } while(0)
#define DEBUGGER_ON do { _dbug_on_= 1; } while(0) #define DEBUGGER_ON do { _dbug_on_= 1; } while(0)
#define IF_DBUG(A) A #define IF_DBUG(A) A
#define DBUG_SWAP_CODE_STATE(arg) dbug_swap_code_state(arg)
#define DBUG_FREE_CODE_STATE(arg) dbug_free_code_state(arg)
#ifndef __WIN__ #ifndef __WIN__
#define DBUG_ABORT() (_db_flush_(), abort()) #define DBUG_ABORT() (_db_flush_(), abort())
#else #else
@ -193,6 +195,8 @@ extern void _db_suicide_();
#define DEBUGGER_OFF do { } while(0) #define DEBUGGER_OFF do { } while(0)
#define DEBUGGER_ON do { } while(0) #define DEBUGGER_ON do { } while(0)
#define IF_DBUG(A) #define IF_DBUG(A)
#define DBUG_SWAP_CODE_STATE(arg) do { } while(0)
#define DBUG_FREE_CODE_STATE(arg) do { } while(0)
#define DBUG_ABORT() do { } while(0) #define DBUG_ABORT() do { } while(0)
#define DBUG_SUICIDE() do { } while(0) #define DBUG_SUICIDE() do { } while(0)

45
include/mysql.h
View File

@ -169,7 +169,9 @@ enum mysql_option
MYSQL_OPT_USE_REMOTE_CONNECTION, MYSQL_OPT_USE_EMBEDDED_CONNECTION, MYSQL_OPT_USE_REMOTE_CONNECTION, MYSQL_OPT_USE_EMBEDDED_CONNECTION,
MYSQL_OPT_GUESS_CONNECTION, MYSQL_SET_CLIENT_IP, MYSQL_SECURE_AUTH, MYSQL_OPT_GUESS_CONNECTION, MYSQL_SET_CLIENT_IP, MYSQL_SECURE_AUTH,
MYSQL_REPORT_DATA_TRUNCATION, MYSQL_OPT_RECONNECT, MYSQL_REPORT_DATA_TRUNCATION, MYSQL_OPT_RECONNECT,
MYSQL_OPT_SSL_VERIFY_SERVER_CERT, MYSQL_PLUGIN_DIR, MYSQL_DEFAULT_AUTH MYSQL_OPT_SSL_VERIFY_SERVER_CERT, MYSQL_PLUGIN_DIR, MYSQL_DEFAULT_AUTH,
/* MariaDB options */
MYSQL_OPT_NONBLOCK=6000
}; };
/** /**
@ -264,8 +266,6 @@ typedef struct character_set
struct st_mysql_methods; struct st_mysql_methods;
struct st_mysql_stmt; struct st_mysql_stmt;
struct st_mysql_extension;
typedef struct st_mysql typedef struct st_mysql
{ {
NET net; /* Communication parameters */ NET net; /* Communication parameters */
@ -320,7 +320,7 @@ typedef struct st_mysql
my_bool *unbuffered_fetch_owner; my_bool *unbuffered_fetch_owner;
/* needed for embedded server - no net buffer to store the 'info' */ /* needed for embedded server - no net buffer to store the 'info' */
char *info_buffer; char *info_buffer;
struct st_mysql_extension *extension; void *extension;
} MYSQL; } MYSQL;
@ -382,14 +382,21 @@ typedef struct st_mysql_parameters
Flag bits, the asynchronous methods return a combination of these ORed Flag bits, the asynchronous methods return a combination of these ORed
together to let the application know when to resume the suspended operation. together to let the application know when to resume the suspended operation.
*/ */
typedef enum {
MYSQL_WAIT_READ= 1, /* Wait for data to be available on socket to read */ /*
/* mysql_get_socket_fd() will return socket descriptor*/ Wait for data to be available on socket to read.
MYSQL_WAIT_WRITE= 2, /* Wait for socket to be ready to write data */ mysql_get_socket_fd() will return socket descriptor.
MYSQL_WAIT_EXCEPT= 4, /* Wait for select() to mark exception on socket */ */
MYSQL_WAIT_TIMEOUT= 8 /* Wait until timeout occurs. Value of timeout can be */ #define MYSQL_WAIT_READ 1
/* obtained from mysql_get_timeout_value() */ /* Wait for socket to be ready to write data. */
} MYSQL_ASYNC_STATUS; #define MYSQL_WAIT_WRITE 2
/* Wait for select() to mark exception on socket. */
#define MYSQL_WAIT_EXCEPT 4
/*
Wait until timeout occurs. Value of timeout can be obtained from
mysql_get_timeout_value().
*/
#define MYSQL_WAIT_TIMEOUT 8
#if !defined(MYSQL_SERVER) && !defined(EMBEDDED_LIBRARY) #if !defined(MYSQL_SERVER) && !defined(EMBEDDED_LIBRARY)
#define max_allowed_packet (*mysql_get_parameters()->p_max_allowed_packet) #define max_allowed_packet (*mysql_get_parameters()->p_max_allowed_packet)
@ -943,6 +950,7 @@ my_bool STDCALL mysql_more_results(MYSQL *mysql);
int STDCALL mysql_next_result(MYSQL *mysql); int STDCALL mysql_next_result(MYSQL *mysql);
int STDCALL mysql_next_result_start(int *ret, MYSQL *mysql); int STDCALL mysql_next_result_start(int *ret, MYSQL *mysql);
int STDCALL mysql_next_result_cont(int *ret, MYSQL *mysql, int status); int STDCALL mysql_next_result_cont(int *ret, MYSQL *mysql, int status);
void STDCALL mysql_close_slow_part(MYSQL *mysql);
void STDCALL mysql_close(MYSQL *sock); void STDCALL mysql_close(MYSQL *sock);
int STDCALL mysql_close_start(MYSQL *sock); int STDCALL mysql_close_start(MYSQL *sock);
int STDCALL mysql_close_cont(MYSQL *sock, int status); int STDCALL mysql_close_cont(MYSQL *sock, int status);
@ -958,20 +966,7 @@ unsigned int STDCALL mysql_get_timeout_value(const MYSQL *mysql);
#ifdef USE_OLD_FUNCTIONS #ifdef USE_OLD_FUNCTIONS
MYSQL * STDCALL mysql_connect(MYSQL *mysql, const char *host, MYSQL * STDCALL mysql_connect(MYSQL *mysql, const char *host,
const char *user, const char *passwd); const char *user, const char *passwd);
int STDCALL mysql_connect_start(MYSQL **ret, MYSQL *mysql,
const char *host, const char *user,
const char *passwd);
int STDCALL mysql_connect_cont(MYSQL **ret, MYSQL *mysql,
int status);
int STDCALL mysql_create_db(MYSQL *mysql, const char *DB); int STDCALL mysql_create_db(MYSQL *mysql, const char *DB);
int STDCALL mysql_create_db_start(int *ret, MYSQL *mysql,
const char *DB);
int STDCALL mysql_create_db_cont(int *ret, MYSQL *mysql,
int status);
int STDCALL mysql_drop_db(MYSQL *mysql, const char *DB);
int STDCALL mysql_drop_db_start(int *ret, MYSQL *mysql,
const char *DB);
int STDCALL mysql_drop_db_cont(int *ret, MYSQL *mysql, int status);
int STDCALL mysql_drop_db(MYSQL *mysql, const char *DB); int STDCALL mysql_drop_db(MYSQL *mysql, const char *DB);
#define mysql_reload(mysql) mysql_refresh((mysql),REFRESH_GRANT) #define mysql_reload(mysql) mysql_refresh((mysql),REFRESH_GRANT)
#endif #endif

13
include/mysql.h.pp
View File

@ -257,7 +257,8 @@ enum mysql_option
MYSQL_OPT_USE_REMOTE_CONNECTION, MYSQL_OPT_USE_EMBEDDED_CONNECTION, MYSQL_OPT_USE_REMOTE_CONNECTION, MYSQL_OPT_USE_EMBEDDED_CONNECTION,
MYSQL_OPT_GUESS_CONNECTION, MYSQL_SET_CLIENT_IP, MYSQL_SECURE_AUTH, MYSQL_OPT_GUESS_CONNECTION, MYSQL_SET_CLIENT_IP, MYSQL_SECURE_AUTH,
MYSQL_REPORT_DATA_TRUNCATION, MYSQL_OPT_RECONNECT, MYSQL_REPORT_DATA_TRUNCATION, MYSQL_OPT_RECONNECT,
MYSQL_OPT_SSL_VERIFY_SERVER_CERT, MYSQL_PLUGIN_DIR, MYSQL_DEFAULT_AUTH MYSQL_OPT_SSL_VERIFY_SERVER_CERT, MYSQL_PLUGIN_DIR, MYSQL_DEFAULT_AUTH,
MYSQL_OPT_NONBLOCK=6000
}; };
struct st_mysql_options_extention; struct st_mysql_options_extention;
struct st_mysql_options { struct st_mysql_options {
@ -318,7 +319,6 @@ typedef struct character_set
} MY_CHARSET_INFO; } MY_CHARSET_INFO;
struct st_mysql_methods; struct st_mysql_methods;
struct st_mysql_stmt; struct st_mysql_stmt;
struct st_mysql_extension;
typedef struct st_mysql typedef struct st_mysql
{ {
NET net; NET net;
@ -354,7 +354,7 @@ typedef struct st_mysql
void *thd; void *thd;
my_bool *unbuffered_fetch_owner; my_bool *unbuffered_fetch_owner;
char *info_buffer; char *info_buffer;
struct st_mysql_extension *extension; void *extension;
} MYSQL; } MYSQL;
typedef struct st_mysql_res { typedef struct st_mysql_res {
my_ulonglong row_count; my_ulonglong row_count;
@ -392,12 +392,6 @@ typedef struct st_mysql_parameters
unsigned long *p_net_buffer_length; unsigned long *p_net_buffer_length;
void *extension; void *extension;
} MYSQL_PARAMETERS; } MYSQL_PARAMETERS;
typedef enum {
MYSQL_WAIT_READ= 1,
MYSQL_WAIT_WRITE= 2,
MYSQL_WAIT_EXCEPT= 4,
MYSQL_WAIT_TIMEOUT= 8
} MYSQL_ASYNC_STATUS;
int mysql_server_init(int argc, char **argv, char **groups); int mysql_server_init(int argc, char **argv, char **groups);
void mysql_server_end(void); void mysql_server_end(void);
MYSQL_PARAMETERS * mysql_get_parameters(void); MYSQL_PARAMETERS * mysql_get_parameters(void);
@ -776,6 +770,7 @@ my_bool mysql_more_results(MYSQL *mysql);
int mysql_next_result(MYSQL *mysql); int mysql_next_result(MYSQL *mysql);
int mysql_next_result_start(int *ret, MYSQL *mysql); int mysql_next_result_start(int *ret, MYSQL *mysql);
int mysql_next_result_cont(int *ret, MYSQL *mysql, int status); int mysql_next_result_cont(int *ret, MYSQL *mysql, int status);
void mysql_close_slow_part(MYSQL *mysql);
void mysql_close(MYSQL *sock); void mysql_close(MYSQL *sock);
int mysql_close_start(MYSQL *sock); int mysql_close_start(MYSQL *sock);
int mysql_close_cont(MYSQL *sock, int status); int mysql_close_cont(MYSQL *sock, int status);

36
include/mysql_async.h Normal file
View File

@ -0,0 +1,36 @@
/* Copyright (C) 2012 MariaDB Services and Kristian Nielsen
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; version 2 of the License.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
/* Common definitions for MariaDB non-blocking client library. */
#ifndef MYSQL_ASYNC_H
#define MYSQL_ASYNC_H
extern int my_connect_async(struct mysql_async_context *b, my_socket fd,
const struct sockaddr *name, uint namelen,
uint timeout);
extern ssize_t my_recv_async(struct mysql_async_context *b, int fd,
unsigned char *buf, size_t size, uint timeout);
extern ssize_t my_send_async(struct mysql_async_context *b, int fd,
const unsigned char *buf, size_t size,
uint timeout);
extern my_bool my_poll_read_async(struct mysql_async_context *b,
uint timeout);
extern int my_ssl_read_async(struct mysql_async_context *b, SSL *ssl,
void *buf, int size);
extern int my_ssl_write_async(struct mysql_async_context *b, SSL *ssl,
const void *buf, int size);
#endif /* MYSQL_ASYNC_H */

9
include/mysql_com.h
View File

@ -159,6 +159,15 @@ enum enum_server_command
#define CLIENT_PLUGIN_AUTH (1UL << 19) /* Client supports plugin authentication */ #define CLIENT_PLUGIN_AUTH (1UL << 19) /* Client supports plugin authentication */
#define CLIENT_SSL_VERIFY_SERVER_CERT (1UL << 30) #define CLIENT_SSL_VERIFY_SERVER_CERT (1UL << 30)
/*
It used to be that if mysql_real_connect() failed, it would delete any
options set by the client, unless the CLIENT_REMEMBER_OPTIONS flag was
given.
That behaviour does not appear very useful, and it seems unlikely that
any applications would actually depend on this. So from MariaDB 5.5 we
always preserve any options set in case of failed connect, and this
option is effectively always set.
*/
#define CLIENT_REMEMBER_OPTIONS (1UL << 31) #define CLIENT_REMEMBER_OPTIONS (1UL << 31)
#ifdef HAVE_COMPRESS #ifdef HAVE_COMPRESS

3
include/sql_common.h
View File

@ -32,9 +32,6 @@ struct mysql_async_context;
struct st_mysql_options_extention { struct st_mysql_options_extention {
char *plugin_dir; char *plugin_dir;
char *default_auth; char *default_auth;
};
struct st_mysql_extension {
struct mysql_async_context *async_context; struct mysql_async_context *async_context;
}; };

1
mysql-test/r/non_blocking_api.result
View File

@ -1,3 +1,4 @@
drop table if exists t1;
CREATE TABLE t1 (a INT PRIMARY KEY); CREATE TABLE t1 (a INT PRIMARY KEY);
INSERT INTO t1 VALUES (1); INSERT INTO t1 VALUES (1);
SELECT * FROM t1; SELECT * FROM t1;

2
mysql-test/t/mysql_client_test_nonblock.test
View File

@ -1,6 +1,6 @@
# This runs the mysql_client_test using the non-blocking API. # This runs the mysql_client_test using the non-blocking API.
# This test should work in embedded server after we fix mysqltest # The non-blocking API is not supported in the embedded server.
-- source include/not_embedded.inc -- source include/not_embedded.inc
SET @old_general_log= @@global.general_log; SET @old_general_log= @@global.general_log;

4
mysql-test/t/non_blocking_api.test
View File

@ -1,5 +1,9 @@
# Test mixing the use of blocking and non-blocking API in a single connection. # Test mixing the use of blocking and non-blocking API in a single connection.
--disable_warnings
drop table if exists t1;
--enable_warnings
--enable_non_blocking_api --enable_non_blocking_api
connect (con_nonblock,localhost,root,,test); connect (con_nonblock,localhost,root,,test);
--disable_non_blocking_api --disable_non_blocking_api

122
mysys/my_context.c
View File

@ -1,17 +1,15 @@
/* /*
Copyright 2011 Kristian Nielsen Copyright 2011 Kristian Nielsen and Monty Program Ab
Experiments with non-blocking libmysql. This file 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 is free software: you can redistribute it and/or modify This library is distributed in the hope that it will be useful,
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
GNU General Public License for more details. Lesser General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this. If not, see <http://www.gnu.org/licenses/>. along with this. If not, see <http://www.gnu.org/licenses/>.
@ -22,10 +20,8 @@
swapcontext(). swapcontext().
*/ */
#include <stdio.h>
#include <errno.h>
#include "mysys_priv.h" #include "mysys_priv.h"
#include "m_string.h"
#include "my_context.h" #include "my_context.h"
#ifdef HAVE_VALGRIND_VALGRIND_H #ifdef HAVE_VALGRIND_VALGRIND_H
@ -77,13 +73,9 @@ my_context_continue(struct my_context *c)
if (!c->active) if (!c->active)
return 0; return 0;
#ifndef DBUG_OFF DBUG_SWAP_CODE_STATE(&c->dbug_state);
dbug_swap_code_state(&c->dbug_state);
#endif
err= swapcontext(&c->base_context, &c->spawned_context); err= swapcontext(&c->base_context, &c->spawned_context);
#ifndef DBUG_OFF DBUG_SWAP_CODE_STATE(&c->dbug_state);
dbug_swap_code_state(&c->dbug_state);
#endif
if (err) if (err)
{ {
fprintf(stderr, "Aieie, swapcontext() failed: %d (errno=%d)\n", fprintf(stderr, "Aieie, swapcontext() failed: %d (errno=%d)\n",
@ -135,21 +127,16 @@ my_context_yield(struct my_context *c)
int int
my_context_init(struct my_context *c, size_t stack_size) my_context_init(struct my_context *c, size_t stack_size)
{ {
if (2*sizeof(int) < sizeof(void *)) #if SIZEOF_CHARP > SIZEOF_INT*2
{ #error Error: Unable to store pointer in 2 ints on this architecture
fprintf(stderr, #endif
"Error: Unable to store pointer in 2 ints on this architecture\n"); bzero(c, sizeof(*c))
return -1;
}
if (!(c->stack= malloc(stack_size))) if (!(c->stack= malloc(stack_size)))
return -1; /* Out of memory */ return -1; /* Out of memory */
c->stack_size= stack_size; c->stack_size= stack_size;
#ifdef HAVE_VALGRIND_VALGRIND_H #ifdef HAVE_VALGRIND_VALGRIND_H
c->valgrind_stack_id= c->valgrind_stack_id=
VALGRIND_STACK_REGISTER(c->stack, ((unsigned char *)(c->stack))+stack_size); VALGRIND_STACK_REGISTER(c->stack, ((unsigned char *)(c->stack))+stack_size);
#endif
#ifndef DBUG_OFF
c->dbug_state= NULL;
#endif #endif
return 0; return 0;
} }
@ -164,9 +151,7 @@ my_context_destroy(struct my_context *c)
#endif #endif
free(c->stack); free(c->stack);
} }
#ifndef DBUG_OFF DBUG_FREE_CODE_STATE(&c->dbug_state);
dbug_free_code_state(&c->dbug_state);
#endif
} }
#endif /* MY_CONTEXT_USE_UCONTEXT */ #endif /* MY_CONTEXT_USE_UCONTEXT */
@ -206,9 +191,7 @@ my_context_spawn(struct my_context *c, void (*f)(void *), void *d)
{ {
int ret; int ret;
#ifndef DBUG_OFF DBUG_SWAP_CODE_STATE(&c->dbug_state);
dbug_swap_code_state(&c->dbug_state);
#endif
/* /*
There are 6 callee-save registers we need to save and restore when There are 6 callee-save registers we need to save and restore when
@ -262,9 +245,7 @@ my_context_spawn(struct my_context *c, void (*f)(void *), void *d)
: "rcx", "rdx", "r8", "r9", "r10", "r11", "memory", "cc" : "rcx", "rdx", "r8", "r9", "r10", "r11", "memory", "cc"
); );
#ifndef DBUG_OFF DBUG_SWAP_CODE_STATE(&c->dbug_state);
dbug_swap_code_state(&c->dbug_state);
#endif
return ret; return ret;
} }
@ -274,9 +255,7 @@ my_context_continue(struct my_context *c)
{ {
int ret; int ret;
#ifndef DBUG_OFF DBUG_SWAP_CODE_STATE(&c->dbug_state);
dbug_swap_code_state(&c->dbug_state);
#endif
__asm__ __volatile__ __asm__ __volatile__
( (
@ -335,9 +314,7 @@ my_context_continue(struct my_context *c)
: "rcx", "rdx", "rsi", "rdi", "r8", "r9", "r10", "r11", "memory", "cc" : "rcx", "rdx", "rsi", "rdi", "r8", "r9", "r10", "r11", "memory", "cc"
); );
#ifndef DBUG_OFF DBUG_SWAP_CODE_STATE(&c->dbug_state);
dbug_swap_code_state(&c->dbug_state);
#endif
return ret; return ret;
} }
@ -386,15 +363,13 @@ my_context_yield(struct my_context *c)
int int
my_context_init(struct my_context *c, size_t stack_size) my_context_init(struct my_context *c, size_t stack_size)
{ {
bzero(c, sizeof(*c));
if (!(c->stack_bot= malloc(stack_size))) if (!(c->stack_bot= malloc(stack_size)))
return -1; /* Out of memory */ return -1; /* Out of memory */
c->stack_top= ((unsigned char *)(c->stack_bot)) + stack_size; c->stack_top= ((unsigned char *)(c->stack_bot)) + stack_size;
#ifdef HAVE_VALGRIND_VALGRIND_H #ifdef HAVE_VALGRIND_VALGRIND_H
c->valgrind_stack_id= c->valgrind_stack_id=
VALGRIND_STACK_REGISTER(c->stack_bot, c->stack_top); VALGRIND_STACK_REGISTER(c->stack_bot, c->stack_top);
#endif
#ifndef DBUG_OFF
c->dbug_state= NULL;
#endif #endif
return 0; return 0;
} }
@ -409,9 +384,7 @@ my_context_destroy(struct my_context *c)
VALGRIND_STACK_DEREGISTER(c->valgrind_stack_id); VALGRIND_STACK_DEREGISTER(c->valgrind_stack_id);
#endif #endif
} }
#ifndef DBUG_OFF DBUG_FREE_CODE_STATE(&c->dbug_state);
dbug_free_code_state(&c->dbug_state);
#endif
} }
#endif /* MY_CONTEXT_USE_X86_64_GCC_ASM */ #endif /* MY_CONTEXT_USE_X86_64_GCC_ASM */
@ -449,9 +422,7 @@ my_context_spawn(struct my_context *c, void (*f)(void *), void *d)
{ {
int ret; int ret;
#ifndef DBUG_OFF DBUG_SWAP_CODE_STATE(&c->dbug_state);
dbug_swap_code_state(&c->dbug_state);
#endif
/* /*
There are 4 callee-save registers we need to save and restore when There are 4 callee-save registers we need to save and restore when
@ -504,9 +475,7 @@ my_context_spawn(struct my_context *c, void (*f)(void *), void *d)
: "ecx", "edx", "memory", "cc" : "ecx", "edx", "memory", "cc"
); );
#ifndef DBUG_OFF DBUG_SWAP_CODE_STATE(&c->dbug_state);
dbug_swap_code_state(&c->dbug_state);
#endif
return ret; return ret;
} }
@ -516,9 +485,7 @@ my_context_continue(struct my_context *c)
{ {
int ret; int ret;
#ifndef DBUG_OFF DBUG_SWAP_CODE_STATE(&c->dbug_state);
dbug_swap_code_state(&c->dbug_state);
#endif
__asm__ __volatile__ __asm__ __volatile__
( (
@ -573,9 +540,7 @@ my_context_continue(struct my_context *c)
: "ecx", "edx", "memory", "cc" : "ecx", "edx", "memory", "cc"
); );
#ifndef DBUG_OFF DBUG_SWAP_CODE_STATE(&c->dbug_state);
dbug_swap_code_state(&c->dbug_state);
#endif
return ret; return ret;
} }
@ -622,15 +587,13 @@ my_context_yield(struct my_context *c)
int int
my_context_init(struct my_context *c, size_t stack_size) my_context_init(struct my_context *c, size_t stack_size)
{ {
bzero(c, sizeof(*c));
if (!(c->stack_bot= malloc(stack_size))) if (!(c->stack_bot= malloc(stack_size)))
return -1; /* Out of memory */ return -1; /* Out of memory */
c->stack_top= ((unsigned char *)(c->stack_bot)) + stack_size; c->stack_top= ((unsigned char *)(c->stack_bot)) + stack_size;
#ifdef HAVE_VALGRIND_VALGRIND_H #ifdef HAVE_VALGRIND_VALGRIND_H
c->valgrind_stack_id= c->valgrind_stack_id=
VALGRIND_STACK_REGISTER(c->stack_bot, c->stack_top); VALGRIND_STACK_REGISTER(c->stack_bot, c->stack_top);
#endif
#ifndef DBUG_OFF
c->dbug_state= NULL;
#endif #endif
return 0; return 0;
} }
@ -645,9 +608,7 @@ my_context_destroy(struct my_context *c)
VALGRIND_STACK_DEREGISTER(c->valgrind_stack_id); VALGRIND_STACK_DEREGISTER(c->valgrind_stack_id);
#endif #endif
} }
#ifndef DBUG_OFF DBUG_FREE_CODE_STATE(&c->dbug_state);
dbug_free_code_state(&c->dbug_state);
#endif
} }
#endif /* MY_CONTEXT_USE_I386_GCC_ASM */ #endif /* MY_CONTEXT_USE_I386_GCC_ASM */
@ -685,22 +646,17 @@ my_context_trampoline(void *p)
int int
my_context_init(struct my_context *c, size_t stack_size) my_context_init(struct my_context *c, size_t stack_size)
{ {
#ifndef DBUG_OFF bzero(c, sizeof(*c));
c->dbug_state= NULL;
#endif
c->lib_fiber= CreateFiber(stack_size, my_context_trampoline, c); c->lib_fiber= CreateFiber(stack_size, my_context_trampoline, c);
if (c->lib_fiber) if (c->lib_fiber)
return 0; return 0;
else return -1;
return -1;
} }
void void
my_context_destroy(struct my_context *c) my_context_destroy(struct my_context *c)
{ {
#ifndef DBUG_OFF DBUG_FREE_CODE_STATE(&c->dbug_state);
dbug_free_code_state(&c->dbug_state);
#endif
if (c->lib_fiber) if (c->lib_fiber)
{ {
DeleteFiber(c->lib_fiber); DeleteFiber(c->lib_fiber);
@ -723,26 +679,18 @@ my_context_spawn(struct my_context *c, void (*f)(void *), void *d)
if (current_fiber == NULL || current_fiber == (void *)0x1e00) if (current_fiber == NULL || current_fiber == (void *)0x1e00)
current_fiber= ConvertThreadToFiber(c); current_fiber= ConvertThreadToFiber(c);
c->app_fiber= current_fiber; c->app_fiber= current_fiber;
#ifndef DBUG_OFF DBUG_SWAP_CODE_STATE(&c->dbug_state);
dbug_swap_code_state(&c->dbug_state);
#endif
SwitchToFiber(c->lib_fiber); SwitchToFiber(c->lib_fiber);
#ifndef DBUG_OFF DBUG_SWAP_CODE_STATE(&c->dbug_state);
dbug_swap_code_state(&c->dbug_state);
#endif
return c->return_value; return c->return_value;
} }
int int
my_context_continue(struct my_context *c) my_context_continue(struct my_context *c)
{ {
#ifndef DBUG_OFF DBUG_SWAP_CODE_STATE(&c->dbug_state);
dbug_swap_code_state(&c->dbug_state);
#endif
SwitchToFiber(c->lib_fiber); SwitchToFiber(c->lib_fiber);
#ifndef DBUG_OFF DBUG_SWAP_CODE_STATE(&c->dbug_state);
dbug_swap_code_state(&c->dbug_state);
#endif
return c->return_value; return c->return_value;
} }

165
sql-common/client.c
View File

@ -108,7 +108,8 @@ my_bool net_flush(NET *net);
#include "client_settings.h" #include "client_settings.h"
#include <sql_common.h> #include <sql_common.h>
#include <mysql/client_plugin.h> #include <mysql/client_plugin.h>
#include "my_context.h" #include <my_context.h>
#include <mysql_async.h>
#define native_password_plugin_name "mysql_native_password" #define native_password_plugin_name "mysql_native_password"
#define old_password_plugin_name "mysql_old_password" #define old_password_plugin_name "mysql_old_password"
@ -1051,23 +1052,17 @@ static int add_init_command(struct st_mysql_options *options, const char *cmd)
return 0; return 0;
} }
#define mysql_extension_get(MYSQL, X) \ #define extension_set(OPTS, X, VAL) \
((MYSQL)->extension ? (MYSQL)->extension->X : NULL) if (!(OPTS)->extension) \
#define mysql_extension_set(MYSQL, X, VAL) \ (OPTS)->extension= (struct st_mysql_options_extention *) \
if (!(MYSQL)->extension) \ my_malloc(sizeof(struct st_mysql_options_extention), \
(MYSQL)->extension= (struct st_mysql_extension *) \
my_malloc(sizeof(struct st_mysql_extension), \
MYF(MY_WME | MY_ZEROFILL)); \ MYF(MY_WME | MY_ZEROFILL)); \
(MYSQL)->extension->X= VAL; (OPTS)->extension->X= VAL;
#define extension_set_string(OPTS, X, STR) \ #define extension_set_string(OPTS, X, STR) \
if ((OPTS)->extension) \ if ((OPTS)->extension) \
my_free((OPTS)->extension->X, MYF(MY_ALLOW_ZERO_PTR)); \ my_free((OPTS)->extension->X, MYF(MY_ALLOW_ZERO_PTR)); \
else \ extension_set(OPTS, X, my_strdup((STR), MYF(MY_WME)));
(OPTS)->extension= (struct st_mysql_options_extention *) \
my_malloc(sizeof(struct st_mysql_options_extention), \
MYF(MY_WME | MY_ZEROFILL)); \
(OPTS)->extension->X= my_strdup((STR), MYF(MY_WME));
void mysql_read_default_options(struct st_mysql_options *options, void mysql_read_default_options(struct st_mysql_options *options,
const char *filename,const char *group) const char *filename,const char *group)
@ -1276,36 +1271,6 @@ void mysql_read_default_options(struct st_mysql_options *options,
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }
/*
Fetch the context for asynchronous API calls, allocating a new one if
necessary.
*/
#define STACK_SIZE (4096*15)
struct mysql_async_context *
mysql_get_async_context(MYSQL *mysql)
{
struct mysql_async_context *b;
if ((b= mysql_extension_get(mysql, async_context)))
return b;
if (!(b= (struct mysql_async_context *)
my_malloc(sizeof(*b), MYF(MY_ZEROFILL))))
{
set_mysql_error(mysql, CR_OUT_OF_MEMORY, unknown_sqlstate);
return NULL;
}
if (my_context_init(&b->async_context, STACK_SIZE))
{
my_free(b, MYF(0));
return NULL;
}
mysql_extension_set(mysql, async_context, b)
if (mysql->net.vio)
mysql->net.vio->async_context= b;
return b;
}
/************************************************************************** /**************************************************************************
Get column lengths of the current row Get column lengths of the current row
@ -2581,20 +2546,16 @@ static int
connect_sync_or_async(MYSQL *mysql, NET *net, my_socket fd, connect_sync_or_async(MYSQL *mysql, NET *net, my_socket fd,
const struct sockaddr *name, uint namelen) const struct sockaddr *name, uint namelen)
{ {
extern int my_connect_async(struct mysql_async_context *b, my_socket fd, if (mysql->options.extension && mysql->options.extension->async_context &&
const struct sockaddr *name, uint namelen, mysql->options.extension->async_context->active)
uint timeout);
struct mysql_async_context *actxt= mysql_extension_get(mysql, async_context);
if (actxt && actxt->active)
{ {
my_bool old_mode; my_bool old_mode;
vio_blocking(net->vio, FALSE, &old_mode); vio_blocking(net->vio, FALSE, &old_mode);
return my_connect_async(actxt, fd, name, namelen, return my_connect_async(mysql->options.extension->async_context, fd,
mysql->options.connect_timeout); name, namelen, mysql->options.connect_timeout);
} }
else
return my_connect(fd, name, namelen, mysql->options.connect_timeout); return my_connect(fd, name, namelen, mysql->options.connect_timeout);
} }
MYSQL * STDCALL MYSQL * STDCALL
@ -2612,7 +2573,6 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user,
struct sockaddr_in sock_addr; struct sockaddr_in sock_addr;
ulong pkt_length; ulong pkt_length;
NET *net= &mysql->net; NET *net= &mysql->net;
struct mysql_async_context *actxt;
#ifdef MYSQL_SERVER #ifdef MYSQL_SERVER
thr_alarm_t alarmed; thr_alarm_t alarmed;
ALARM alarm_buff; ALARM alarm_buff;
@ -2881,8 +2841,9 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user,
goto error; goto error;
} }
if ((actxt= mysql_extension_get(mysql, async_context)) && actxt->active) if (mysql->options.extension && mysql->options.extension->async_context &&
net->vio->async_context= actxt; mysql->options.extension->async_context->active)
net->vio->async_context= mysql->options.extension->async_context;
if (my_net_init(net, net->vio)) if (my_net_init(net, net->vio))
{ {
@ -3114,8 +3075,6 @@ error:
/* Free alloced memory */ /* Free alloced memory */
end_server(mysql); end_server(mysql);
mysql_close_free(mysql); mysql_close_free(mysql);
if (!(client_flag & CLIENT_REMEMBER_OPTIONS))
mysql_close_free_options(mysql);
} }
DBUG_RETURN(0); DBUG_RETURN(0);
} }
@ -3184,7 +3143,6 @@ my_bool mysql_reconnect(MYSQL *mysql)
DBUG_RETURN(1); DBUG_RETURN(1);
} }
mysql_init(&tmp_mysql); mysql_init(&tmp_mysql);
tmp_mysql.extension= mysql->extension;
tmp_mysql.options= mysql->options; tmp_mysql.options= mysql->options;
tmp_mysql.options.my_cnf_file= tmp_mysql.options.my_cnf_group= 0; tmp_mysql.options.my_cnf_file= tmp_mysql.options.my_cnf_group= 0;
tmp_mysql.rpl_pivot= mysql->rpl_pivot; tmp_mysql.rpl_pivot= mysql->rpl_pivot;
@ -3199,7 +3157,9 @@ my_bool mysql_reconnect(MYSQL *mysql)
(The vio will be put in the original MYSQL permanently once we successfully (The vio will be put in the original MYSQL permanently once we successfully
reconnect, or be discarded if we fail to reconnect.) reconnect, or be discarded if we fail to reconnect.)
*/ */
if ((ctxt= mysql_extension_get(mysql, async_context)) && ctxt->active) if (mysql->options.extension &&
(ctxt= mysql->options.extension->async_context) &&
mysql->options.extension->async_context->active)
{ {
hook_data.orig_mysql= mysql; hook_data.orig_mysql= mysql;
hook_data.new_mysql= &tmp_mysql; hook_data.new_mysql= &tmp_mysql;
@ -3208,7 +3168,7 @@ my_bool mysql_reconnect(MYSQL *mysql)
} }
if (!mysql_real_connect(&tmp_mysql,mysql->host,mysql->user,mysql->passwd, if (!mysql_real_connect(&tmp_mysql,mysql->host,mysql->user,mysql->passwd,
mysql->db, mysql->port, mysql->unix_socket, mysql->db, mysql->port, mysql->unix_socket,
mysql->client_flag | CLIENT_REMEMBER_OPTIONS)) mysql->client_flag))
{ {
if (ctxt) if (ctxt)
my_context_install_suspend_resume_hook(ctxt, NULL, NULL); my_context_install_suspend_resume_hook(ctxt, NULL, NULL);
@ -3220,7 +3180,6 @@ my_bool mysql_reconnect(MYSQL *mysql)
if (mysql_set_character_set(&tmp_mysql, mysql->charset->csname)) if (mysql_set_character_set(&tmp_mysql, mysql->charset->csname))
{ {
DBUG_PRINT("error", ("mysql_set_character_set() failed")); DBUG_PRINT("error", ("mysql_set_character_set() failed"));
tmp_mysql.extension= NULL;
bzero((char*) &tmp_mysql.options,sizeof(tmp_mysql.options)); bzero((char*) &tmp_mysql.options,sizeof(tmp_mysql.options));
mysql_close(&tmp_mysql); mysql_close(&tmp_mysql);
if (ctxt) if (ctxt)
@ -3241,11 +3200,7 @@ my_bool mysql_reconnect(MYSQL *mysql)
tmp_mysql.stmts= mysql->stmts; tmp_mysql.stmts= mysql->stmts;
mysql->stmts= 0; mysql->stmts= 0;
/* /* Don't free options as these are now used in tmp_mysql */
Don't free options as these are now used in tmp_mysql.
Same with extension.
*/
mysql->extension= NULL;
bzero((char*) &mysql->options,sizeof(mysql->options)); bzero((char*) &mysql->options,sizeof(mysql->options));
mysql->free_me=0; mysql->free_me=0;
mysql_close(mysql); mysql_close(mysql);
@ -3315,8 +3270,14 @@ static void mysql_close_free_options(MYSQL *mysql)
#endif /* HAVE_SMEM */ #endif /* HAVE_SMEM */
if (mysql->options.extension) if (mysql->options.extension)
{ {
struct mysql_async_context *ctxt= mysql->options.extension->async_context;
my_free(mysql->options.extension->plugin_dir,MYF(MY_ALLOW_ZERO_PTR)); my_free(mysql->options.extension->plugin_dir,MYF(MY_ALLOW_ZERO_PTR));
my_free(mysql->options.extension->default_auth,MYF(MY_ALLOW_ZERO_PTR)); my_free(mysql->options.extension->default_auth,MYF(MY_ALLOW_ZERO_PTR));
if (ctxt)
{
my_context_destroy(&ctxt->async_context);
my_free(ctxt, MYF(0));
}
my_free(mysql->options.extension,MYF(0)); my_free(mysql->options.extension,MYF(0));
} }
bzero((char*) &mysql->options,sizeof(mysql->options)); bzero((char*) &mysql->options,sizeof(mysql->options));
@ -3324,21 +3285,6 @@ static void mysql_close_free_options(MYSQL *mysql)
} }
static void
mysql_close_free_extension(MYSQL *mysql)
{
if (mysql->extension)
{
if (mysql->extension->async_context)
{
my_context_destroy(&mysql->extension->async_context->async_context);
my_free(mysql->extension->async_context, MYF(0));
}
my_free(mysql->extension, MYF(0));
mysql->extension= NULL;
}
}
static void mysql_close_free(MYSQL *mysql) static void mysql_close_free(MYSQL *mysql)
{ {
my_free((uchar*) mysql->host_info,MYF(MY_ALLOW_ZERO_PTR)); my_free((uchar*) mysql->host_info,MYF(MY_ALLOW_ZERO_PTR));
@ -3447,14 +3393,11 @@ void mysql_detach_stmt_list(LIST **stmt_list __attribute__((unused)),
used for non-blocking operation of blocking stuff, so that later part can used for non-blocking operation of blocking stuff, so that later part can
_not_ be done non-blocking. _not_ be done non-blocking.
Therefore, mysql_pre_close() is used to run the parts of mysql_close() that Therefore, mysql_close_slow_part() is used to run the parts of mysql_close()
may block. It can be called before mysql_close(), and in that case that may block. It can be called before mysql_close(), and in that case
mysql_close() is guaranteed not to need to block. mysql_close() is guaranteed not to need to block. */
*/ void STDCALL mysql_close_slow_part(MYSQL *mysql)
void mysql_pre_close(MYSQL *mysql)
{ {
if (!mysql)
return;
/* If connection is still up, send a QUIT message */ /* If connection is still up, send a QUIT message */
if (mysql->net.vio != 0) if (mysql->net.vio != 0)
{ {
@ -3473,9 +3416,8 @@ void STDCALL mysql_close(MYSQL *mysql)
if (mysql) /* Some simple safety */ if (mysql) /* Some simple safety */
{ {
mysql_pre_close(mysql); mysql_close_slow_part(mysql);
mysql_close_free_options(mysql); mysql_close_free_options(mysql);
mysql_close_free_extension(mysql);
mysql_close_free(mysql); mysql_close_free(mysql);
mysql_detach_stmt_list(&mysql->stmts, "mysql_close"); mysql_detach_stmt_list(&mysql->stmts, "mysql_close");
#ifndef TO_BE_DELETED #ifndef TO_BE_DELETED
@ -3806,9 +3748,14 @@ mysql_fetch_lengths(MYSQL_RES *res)
} }
#define ASYNC_CONTEXT_DEFAULT_STACK_SIZE (4096*15)
int STDCALL int STDCALL
mysql_options(MYSQL *mysql,enum mysql_option option, const void *arg) mysql_options(MYSQL *mysql,enum mysql_option option, const void *arg)
{ {
struct mysql_async_context *ctxt;
size_t stacksize;
DBUG_ENTER("mysql_option"); DBUG_ENTER("mysql_option");
DBUG_PRINT("enter",("option: %d",(int) option)); DBUG_PRINT("enter",("option: %d",(int) option));
switch (option) { switch (option) {
@ -3892,6 +3839,39 @@ mysql_options(MYSQL *mysql,enum mysql_option option, const void *arg)
case MYSQL_DEFAULT_AUTH: case MYSQL_DEFAULT_AUTH:
extension_set_string(&mysql->options, default_auth, arg); extension_set_string(&mysql->options, default_auth, arg);
break; break;
case MYSQL_OPT_NONBLOCK:
if (mysql->options.extension &&
(ctxt = mysql->options.extension->async_context) != 0)
{
/*
We must not allow changing the stack size while a non-blocking call is
suspended (as the stack is then in use).
*/
if (ctxt->suspended)
DBUG_RETURN(1);
my_context_destroy(&ctxt->async_context);
my_free(ctxt, MYF(0));
}
if (!(ctxt= (struct mysql_async_context *)
my_malloc(sizeof(*ctxt), MYF(MY_ZEROFILL))))
{
set_mysql_error(mysql, CR_OUT_OF_MEMORY, unknown_sqlstate);
DBUG_RETURN(1);
}
stacksize= 0;
if (arg)
stacksize= *(const size_t *)arg;
if (!stacksize)
stacksize= ASYNC_CONTEXT_DEFAULT_STACK_SIZE;
if (my_context_init(&ctxt->async_context, stacksize))
{
my_free(ctxt, MYF(0));
DBUG_RETURN(1);
}
extension_set(&(mysql->options), async_context, ctxt)
if (mysql->net.vio)
mysql->net.vio->async_context= ctxt;
break;
default: default:
DBUG_RETURN(1); DBUG_RETURN(1);
} }
@ -4102,6 +4082,5 @@ mysql_get_socket(const MYSQL *mysql)
{ {
if (mysql->net.vio) if (mysql->net.vio)
return mysql->net.vio->sd; return mysql->net.vio->sd;
else return INVALID_SOCKET;
return INVALID_SOCKET;
} }

1443
sql-common/mysql_async.c
View File

File diff suppressed because it is too large Load Diff

29
tests/async_queries.c
View File

@ -1,17 +1,15 @@
/* /*
Copyright 2011 Kristian Nielsen and Monty Program Ab. Copyright 2011 Kristian Nielsen and Monty Program Ab.
Experiments with non-blocking libmysql. This file 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 is free software: you can redistribute it and/or modify This library is distributed in the hope that it will be useful,
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
GNU General Public License for more details. Lesser General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this. If not, see <http://www.gnu.org/licenses/>. along with this. If not, see <http://www.gnu.org/licenses/>.
@ -93,7 +91,7 @@ static struct my_option options[] =
&opt_user, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, &opt_user, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"connections", 'n', "Number of simultaneous connections/queries.", {"connections", 'n', "Number of simultaneous connections/queries.",
&opt_connections, &opt_connections, 0, GET_UINT, REQUIRED_ARG, &opt_connections, &opt_connections, 0, GET_UINT, REQUIRED_ARG,
0, 0, 0, 0, 0, 0}, 5, 0, 0, 0, 0, 0},
{"queryfile", 'q', "Name of file containing extra queries to run", {"queryfile", 'q', "Name of file containing extra queries to run",
&opt_query_file, &opt_query_file, 0, GET_STR, REQUIRED_ARG, &opt_query_file, &opt_query_file, 0, GET_STR, REQUIRED_ARG,
0, 0, 0, 0, 0, 0}, 0, 0, 0, 0, 0, 0},
@ -219,8 +217,8 @@ again:
break; break;
case 20: case 20:
free(sd->query_element->query); my_free(sd->query_element->query, MYF(0));
free(sd->query_element); my_free(sd->query_element, MYF(0));
if (sd->err) if (sd->err)
{ {
printf("%d | Error: %s\n", sd->index, mysql_error(&sd->mysql)); printf("%d | Error: %s\n", sd->index, mysql_error(&sd->mysql));
@ -315,8 +313,8 @@ add_query(const char *q)
char *q2; char *q2;
size_t len; size_t len;
e= malloc(sizeof(*e)); e= my_malloc(sizeof(*e), MYF(0));
q2= strdup(q); q2= my_strdup(q, MYF(0));
if (!e || !q2) if (!e || !q2)
fatal(NULL, "Out of memory"); fatal(NULL, "Out of memory");
@ -395,7 +393,7 @@ main(int argc, char *argv[])
add_query(*argv++); add_query(*argv++);
} }
sds= malloc(opt_connections * sizeof(*sds)); sds= my_malloc(opt_connections * sizeof(*sds), MYF(0));
if (!sds) if (!sds)
fatal(NULL, "Out of memory"); fatal(NULL, "Out of memory");
@ -412,6 +410,7 @@ main(int argc, char *argv[])
for (i= 0; i < opt_connections; i++) for (i= 0; i < opt_connections; i++)
{ {
mysql_init(&sds[i].mysql); mysql_init(&sds[i].mysql);
mysql_options(&sds[i].mysql, MYSQL_OPT_NONBLOCK, 0);
mysql_options(&sds[i].mysql, MYSQL_READ_DEFAULT_GROUP, "async_queries"); mysql_options(&sds[i].mysql, MYSQL_READ_DEFAULT_GROUP, "async_queries");
/* /*

2
tests/mysql_client_test.c
View File

@ -260,6 +260,8 @@ static MYSQL *mysql_client_init(MYSQL* con)
if (res && shared_memory_base_name) if (res && shared_memory_base_name)
mysql_options(res, MYSQL_SHARED_MEMORY_BASE_NAME, shared_memory_base_name); mysql_options(res, MYSQL_SHARED_MEMORY_BASE_NAME, shared_memory_base_name);
#endif #endif
if (res && non_blocking_api_enabled)
mysql_options(res, MYSQL_OPT_NONBLOCK, 0);
return res; return res;
} }

24
tests/nonblock-wrappers.h
View File

@ -1,17 +1,19 @@
/* Copyright (c) 2011 Monty Program Ab /*
Copyright 2011 Kristian Nielsen and Monty Program Ab
This program is free software; you can redistribute it and/or modify This file is free software; you can redistribute it and/or
it under the terms of the GNU General Public License as published by modify it under the terms of the GNU Lesser General Public
the Free Software Foundation; version 2 of the License. License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful, This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
GNU General Public License for more details. Lesser General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this. If not, see <http://www.gnu.org/licenses/>.
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ */
/* /*
Wrappers that re-implement the normal blocking libmysql API calls in terms Wrappers that re-implement the normal blocking libmysql API calls in terms

8
vio/viosocket.c
View File

@ -22,6 +22,7 @@
#include "vio_priv.h" #include "vio_priv.h"
#include "my_context.h" #include "my_context.h"
#include <mysql_async.h>
int vio_errno(Vio *vio __attribute__((unused))) int vio_errno(Vio *vio __attribute__((unused)))
{ {
@ -32,8 +33,6 @@ int vio_errno(Vio *vio __attribute__((unused)))
size_t vio_read(Vio * vio, uchar* buf, size_t size) size_t vio_read(Vio * vio, uchar* buf, size_t size)
{ {
size_t r; size_t r;
extern ssize_t my_recv_async(struct mysql_async_context *b, int fd,
unsigned char *buf, size_t size, uint timeout);
DBUG_ENTER("vio_read"); DBUG_ENTER("vio_read");
DBUG_PRINT("enter", ("sd: %d buf: 0x%lx size: %u", vio->sd, (long) buf, DBUG_PRINT("enter", ("sd: %d buf: 0x%lx size: %u", vio->sd, (long) buf,
(uint) size)); (uint) size));
@ -119,9 +118,6 @@ size_t vio_read_buff(Vio *vio, uchar* buf, size_t size)
size_t vio_write(Vio * vio, const uchar* buf, size_t size) size_t vio_write(Vio * vio, const uchar* buf, size_t size)
{ {
size_t r; size_t r;
extern ssize_t my_send_async(struct mysql_async_context *b, int fd,
const unsigned char *buf, size_t size,
uint timeout);
DBUG_ENTER("vio_write"); DBUG_ENTER("vio_write");
DBUG_PRINT("enter", ("sd: %d buf: 0x%lx size: %u", vio->sd, (long) buf, DBUG_PRINT("enter", ("sd: %d buf: 0x%lx size: %u", vio->sd, (long) buf,
(uint) size)); (uint) size));
@ -394,8 +390,6 @@ void vio_in_addr(Vio *vio, struct in_addr *in)
my_bool vio_poll_read(Vio *vio,uint timeout) my_bool vio_poll_read(Vio *vio,uint timeout)
{ {
extern my_bool my_poll_read_async(struct mysql_async_context *b,
uint timeout);
#ifndef HAVE_POLL #ifndef HAVE_POLL
#if __WIN__ #if __WIN__
int res; int res;

5
vio/viossl.c
View File

@ -22,6 +22,7 @@
#include "vio_priv.h" #include "vio_priv.h"
#include "my_context.h" #include "my_context.h"
#include <mysql_async.h>
#ifdef HAVE_OPENSSL #ifdef HAVE_OPENSSL
@ -91,8 +92,6 @@ report_errors(SSL* ssl)
size_t vio_ssl_read(Vio *vio, uchar* buf, size_t size) size_t vio_ssl_read(Vio *vio, uchar* buf, size_t size)
{ {
size_t r; size_t r;
extern int my_ssl_read_async(struct mysql_async_context *b, SSL *ssl,
void *buf, int size);
DBUG_ENTER("vio_ssl_read"); DBUG_ENTER("vio_ssl_read");
DBUG_PRINT("enter", ("sd: %d buf: 0x%lx size: %u ssl: 0x%lx", DBUG_PRINT("enter", ("sd: %d buf: 0x%lx size: %u ssl: 0x%lx",
vio->sd, (long) buf, (uint) size, (long) vio->ssl_arg)); vio->sd, (long) buf, (uint) size, (long) vio->ssl_arg));
@ -113,8 +112,6 @@ size_t vio_ssl_read(Vio *vio, uchar* buf, size_t size)
size_t vio_ssl_write(Vio *vio, const uchar* buf, size_t size) size_t vio_ssl_write(Vio *vio, const uchar* buf, size_t size)
{ {
size_t r; size_t r;
extern int my_ssl_write_async(struct mysql_async_context *b, SSL *ssl,
const void *buf, int size);
DBUG_ENTER("vio_ssl_write"); DBUG_ENTER("vio_ssl_write");
DBUG_PRINT("enter", ("sd: %d buf: 0x%lx size: %u", vio->sd, DBUG_PRINT("enter", ("sd: %d buf: 0x%lx size: %u", vio->sd,
(long) buf, (uint) size)); (long) buf, (uint) size));