Compare commits
No commits in common. "origin" and "master" have entirely different histories.
78 changed files with 3013 additions and 2622 deletions
6
.gitignore
vendored
Normal file
6
.gitignore
vendored
Normal file
|
|
@ -0,0 +1,6 @@
|
||||||
|
*.a
|
||||||
|
*.c~
|
||||||
|
*.h~
|
||||||
|
*.log
|
||||||
|
*.o
|
||||||
|
test/test_*
|
||||||
|
|
@ -1,3 +0,0 @@
|
||||||
SSH_AUTH_SOCK=/tmp/ssh-QHib2992/agent.2992; export SSH_AUTH_SOCK;
|
|
||||||
SSH_AGENT_PID=2993; export SSH_AGENT_PID;
|
|
||||||
echo Agent pid 2993;
|
|
||||||
20
HEADER
20
HEADER
|
|
@ -1,20 +0,0 @@
|
||||||
#-------------------------------------------------------------------%
|
|
||||||
#
|
|
||||||
# LIBNAZGUL : Library
|
|
||||||
#
|
|
||||||
#-------------------------------------------------------------------%
|
|
||||||
#
|
|
||||||
# IUP GMI 2, Module de Système. 2003-2004.
|
|
||||||
# Cours de J-M. Rifflet.
|
|
||||||
#
|
|
||||||
#-------------------------------------------------------------------%
|
|
||||||
#
|
|
||||||
# Projet de :
|
|
||||||
# Glenn ROLLAND,
|
|
||||||
# Sebastian SCHAWOHL,
|
|
||||||
# Rivka ZANA
|
|
||||||
#
|
|
||||||
# pour plus de détails au sujet du projet, voir le
|
|
||||||
# fichier README
|
|
||||||
#
|
|
||||||
#-------------------------------------------------------------------%
|
|
||||||
603
LICENSE
603
LICENSE
|
|
@ -1,23 +1,25 @@
|
||||||
|
GNU LIBRARY GENERAL PUBLIC LICENSE
|
||||||
GNU GENERAL PUBLIC LICENSE
|
|
||||||
Version 2, June 1991
|
Version 2, June 1991
|
||||||
|
|
||||||
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
|
Copyright (C) 1991 Free Software Foundation, Inc.
|
||||||
675 Mass Ave, Cambridge, MA 02139, USA
|
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
Everyone is permitted to copy and distribute verbatim copies
|
Everyone is permitted to copy and distribute verbatim copies
|
||||||
of this license document, but changing it is not allowed.
|
of this license document, but changing it is not allowed.
|
||||||
|
|
||||||
|
[This is the first released version of the library GPL. It is
|
||||||
|
numbered 2 because it goes with version 2 of the ordinary GPL.]
|
||||||
|
|
||||||
Preamble
|
Preamble
|
||||||
|
|
||||||
The licenses for most software are designed to take away your
|
The licenses for most software are designed to take away your
|
||||||
freedom to share and change it. By contrast, the GNU General Public
|
freedom to share and change it. By contrast, the GNU General Public
|
||||||
License is intended to guarantee your freedom to share and change free
|
Licenses are intended to guarantee your freedom to share and change
|
||||||
software--to make sure the software is free for all its users. This
|
free software--to make sure the software is free for all its users.
|
||||||
General Public License applies to most of the Free Software
|
|
||||||
Foundation's software and to any other program whose authors commit to
|
This license, the Library General Public License, applies to some
|
||||||
using it. (Some other Free Software Foundation software is covered by
|
specially designated Free Software Foundation software, and to any
|
||||||
the GNU Library General Public License instead.) You can apply it to
|
other libraries whose authors decide to use it. You can use it for
|
||||||
your programs, too.
|
your libraries, too.
|
||||||
|
|
||||||
When we speak of free software, we are referring to freedom, not
|
When we speak of free software, we are referring to freedom, not
|
||||||
price. Our General Public Licenses are designed to make sure that you
|
price. Our General Public Licenses are designed to make sure that you
|
||||||
|
|
@ -28,195 +30,347 @@ in new free programs; and that you know you can do these things.
|
||||||
|
|
||||||
To protect your rights, we need to make restrictions that forbid
|
To protect your rights, we need to make restrictions that forbid
|
||||||
anyone to deny you these rights or to ask you to surrender the rights.
|
anyone to deny you these rights or to ask you to surrender the rights.
|
||||||
These restrictions translate to certain responsibilities for you if you
|
These restrictions translate to certain responsibilities for you if
|
||||||
distribute copies of the software, or if you modify it.
|
you distribute copies of the library, or if you modify it.
|
||||||
|
|
||||||
For example, if you distribute copies of such a program, whether
|
For example, if you distribute copies of the library, whether gratis
|
||||||
gratis or for a fee, you must give the recipients all the rights that
|
or for a fee, you must give the recipients all the rights that we gave
|
||||||
you have. You must make sure that they, too, receive or can get the
|
you. You must make sure that they, too, receive or can get the source
|
||||||
source code. And you must show them these terms so they know their
|
code. If you link a program with the library, you must provide
|
||||||
rights.
|
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 two steps: (1) copyright the software, and
|
Our method of protecting your rights has two steps: (1) copyright
|
||||||
(2) offer you this license which gives you legal permission to copy,
|
the library, and (2) offer you this license which gives you legal
|
||||||
distribute and/or modify the software.
|
permission to copy, distribute and/or modify the library.
|
||||||
|
|
||||||
Also, for each author's protection and ours, we want to make certain
|
Also, for each distributor's protection, we want to make certain
|
||||||
that everyone understands that there is no warranty for this free
|
that everyone understands that there is no warranty for this free
|
||||||
software. If the software is modified by someone else and passed on, we
|
library. If the library is modified by someone else and passed on, we
|
||||||
want its recipients to know that what they have is not the original, so
|
want its recipients to know that what they have is not the original
|
||||||
that any problems introduced by others will not reflect on the original
|
version, so that any problems introduced by others will not reflect on
|
||||||
authors' reputations.
|
the original authors' reputations.
|
||||||
|
|
||||||
Finally, any free program is threatened constantly by software
|
Finally, any free program is threatened constantly by software
|
||||||
patents. We wish to avoid the danger that redistributors of a free
|
patents. We wish to avoid the danger that companies distributing free
|
||||||
program will individually obtain patent licenses, in effect making the
|
software will individually obtain patent licenses, thus in effect
|
||||||
program proprietary. To prevent this, we have made it clear that any
|
transforming the program into proprietary software. To prevent this,
|
||||||
patent must be licensed for everyone's free use or not licensed at all.
|
we have made it clear that any patent must be licensed for everyone's
|
||||||
|
free use or not licensed at all.
|
||||||
|
|
||||||
|
Most GNU software, including some libraries, is covered by the ordinary
|
||||||
|
GNU General Public License, which was designed for utility programs. This
|
||||||
|
license, the GNU Library General Public License, applies to certain
|
||||||
|
designated libraries. This license is quite different from the ordinary
|
||||||
|
one; be sure to read it in full, and don't assume that anything in it is
|
||||||
|
the same as in the ordinary license.
|
||||||
|
|
||||||
|
The reason we have a separate public license for some libraries is that
|
||||||
|
they blur the distinction we usually make between modifying or adding to a
|
||||||
|
program and simply using it. Linking a program with a library, without
|
||||||
|
changing the library, is in some sense simply using the library, and is
|
||||||
|
analogous to running a utility program or application program. However, in
|
||||||
|
a textual and legal sense, the linked executable is a combined work, a
|
||||||
|
derivative of the original library, and the ordinary General Public License
|
||||||
|
treats it as such.
|
||||||
|
|
||||||
|
Because of this blurred distinction, using the ordinary General
|
||||||
|
Public License for libraries did not effectively promote software
|
||||||
|
sharing, because most developers did not use the libraries. We
|
||||||
|
concluded that weaker conditions might promote sharing better.
|
||||||
|
|
||||||
|
However, unrestricted linking of non-free programs would deprive the
|
||||||
|
users of those programs of all benefit from the free status of the
|
||||||
|
libraries themselves. This Library General Public License is intended to
|
||||||
|
permit developers of non-free programs to use free libraries, while
|
||||||
|
preserving your freedom as a user of such programs to change the free
|
||||||
|
libraries that are incorporated in them. (We have not seen how to achieve
|
||||||
|
this as regards changes in header files, but we have achieved it as regards
|
||||||
|
changes in the actual functions of the Library.) The hope is that this
|
||||||
|
will lead to faster development of free libraries.
|
||||||
|
|
||||||
The precise terms and conditions for copying, distribution and
|
The precise terms and conditions for copying, distribution and
|
||||||
modification follow.
|
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, while the latter only
|
||||||
|
works together with the library.
|
||||||
|
|
||||||
|
Note that it is possible for a library to be covered by the ordinary
|
||||||
|
General Public License rather than by this special one.
|
||||||
|
|
||||||
GNU GENERAL PUBLIC LICENSE
|
GNU LIBRARY GENERAL PUBLIC LICENSE
|
||||||
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
|
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
|
||||||
|
|
||||||
0. This License applies to any program or other work which contains
|
0. This License Agreement applies to any software library which
|
||||||
a notice placed by the copyright holder saying it may be distributed
|
contains a notice placed by the copyright holder or other authorized
|
||||||
under the terms of this General Public License. The "Program", below,
|
party saying it may be distributed under the terms of this Library
|
||||||
refers to any such program or work, and a "work based on the Program"
|
General Public License (also called "this License"). Each licensee is
|
||||||
means either the Program or any derivative work under copyright law:
|
addressed as "you".
|
||||||
that is to say, a work containing the Program or a portion of it,
|
|
||||||
either verbatim or with modifications and/or translated into another
|
A "library" means a collection of software functions and/or data
|
||||||
language. (Hereinafter, translation is included without limitation in
|
prepared so as to be conveniently linked with application programs
|
||||||
the term "modification".) Each licensee is addressed as "you".
|
(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
|
Activities other than copying, distribution and modification are not
|
||||||
covered by this License; they are outside its scope. The act of
|
covered by this License; they are outside its scope. The act of
|
||||||
running the Program is not restricted, and the output from the Program
|
running a program using the Library is not restricted, and output from
|
||||||
is covered only if its contents constitute a work based on the
|
such a program is covered only if its contents constitute a work based
|
||||||
Program (independent of having been made by running the Program).
|
on the Library (independent of the use of the Library in a tool for
|
||||||
Whether that is true depends on what the Program does.
|
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 Program's
|
1. You may copy and distribute verbatim copies of the Library's
|
||||||
source code as you receive it, in any medium, provided that you
|
complete source code as you receive it, in any medium, provided that
|
||||||
conspicuously and appropriately publish on each copy an appropriate
|
you conspicuously and appropriately publish on each copy an
|
||||||
copyright notice and disclaimer of warranty; keep intact all the
|
appropriate copyright notice and disclaimer of warranty; keep intact
|
||||||
notices that refer to this License and to the absence of any warranty;
|
all the notices that refer to this License and to the absence of any
|
||||||
and give any other recipients of the Program a copy of this License
|
warranty; and distribute a copy of this License along with the
|
||||||
along with the Program.
|
Library.
|
||||||
|
|
||||||
You may charge a fee for the physical act of transferring a copy, and
|
You may charge a fee for the physical act of transferring a copy,
|
||||||
you may at your option offer warranty protection in exchange for a fee.
|
and you may at your option offer warranty protection in exchange for a
|
||||||
|
fee.
|
||||||
2. You may modify your copy or copies of the Program or any portion
|
|
||||||
of it, thus forming a work based on the Program, and copy and
|
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
|
distribute such modifications or work under the terms of Section 1
|
||||||
above, provided that you also meet all of these conditions:
|
above, provided that you also meet all of these conditions:
|
||||||
|
|
||||||
a) You must cause the modified files to carry prominent notices
|
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.
|
stating that you changed the files and the date of any change.
|
||||||
|
|
||||||
b) You must cause any work that you distribute or publish, that in
|
c) You must cause the whole of the work to be licensed at no
|
||||||
whole or in part contains or is derived from the Program or any
|
charge to all third parties under the terms of this License.
|
||||||
part thereof, to be licensed as a whole 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.)
|
||||||
|
|
||||||
c) If the modified program normally reads commands interactively
|
|
||||||
when run, you must cause it, when started running for such
|
|
||||||
interactive use in the most ordinary way, to print or display an
|
|
||||||
announcement including an appropriate copyright notice and a
|
|
||||||
notice that there is no warranty (or else, saying that you provide
|
|
||||||
a warranty) and that users may redistribute the program under
|
|
||||||
these conditions, and telling the user how to view a copy of this
|
|
||||||
License. (Exception: if the Program itself is interactive but
|
|
||||||
does not normally print such an announcement, your work based on
|
|
||||||
the Program is not required to print an announcement.)
|
|
||||||
|
|
||||||
These requirements apply to the modified work as a whole. If
|
These requirements apply to the modified work as a whole. If
|
||||||
identifiable sections of that work are not derived from the Program,
|
identifiable sections of that work are not derived from the Library,
|
||||||
and can be reasonably considered independent and separate works in
|
and can be reasonably considered independent and separate works in
|
||||||
themselves, then this License, and its terms, do not apply to those
|
themselves, then this License, and its terms, do not apply to those
|
||||||
sections when you distribute them as separate works. But when you
|
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
|
distribute the same sections as part of a whole which is a work based
|
||||||
on the Program, the distribution of the whole must be on the terms of
|
on the Library, the distribution of the whole must be on the terms of
|
||||||
this License, whose permissions for other licensees extend to the
|
this License, whose permissions for other licensees extend to the
|
||||||
entire whole, and thus to each and every part regardless of who wrote it.
|
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
|
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
|
your rights to work written entirely by you; rather, the intent is to
|
||||||
exercise the right to control the distribution of derivative or
|
exercise the right to control the distribution of derivative or
|
||||||
collective works based on the Program.
|
collective works based on the Library.
|
||||||
|
|
||||||
In addition, mere aggregation of another work not based on the Program
|
In addition, mere aggregation of another work not based on the Library
|
||||||
with the Program (or with a work based on the Program) on a volume of
|
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
|
a storage or distribution medium does not bring the other work under
|
||||||
the scope of this License.
|
the scope of this License.
|
||||||
|
|
||||||
3. You may copy and distribute the Program (or a work based on it,
|
3. You may opt to apply the terms of the ordinary GNU General Public
|
||||||
under Section 2) in object code or executable form under the terms of
|
License instead of this License to a given copy of the Library. To do
|
||||||
Sections 1 and 2 above provided that you also do one of the following:
|
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,
|
||||||
a) Accompany it with the complete corresponding machine-readable
|
instead of to this License. (If a newer version than version 2 of the
|
||||||
source code, which must be distributed under the terms of Sections
|
ordinary GNU General Public License has appeared, then you can specify
|
||||||
1 and 2 above on a medium customarily used for software interchange; or,
|
that version instead if you wish.) Do not make any other change in
|
||||||
|
these notices.
|
||||||
b) Accompany it with a written offer, valid for at least three
|
|
||||||
years, to give any third party, for a charge no more than your
|
|
||||||
cost of physically performing source distribution, a complete
|
|
||||||
machine-readable copy of the corresponding source code, to be
|
|
||||||
distributed under the terms of Sections 1 and 2 above on a medium
|
|
||||||
customarily used for software interchange; or,
|
|
||||||
|
|
||||||
c) Accompany it with the information you received as to the offer
|
|
||||||
to distribute corresponding source code. (This alternative is
|
|
||||||
allowed only for noncommercial distribution and only if you
|
|
||||||
received the program in object code or executable form with such
|
|
||||||
an offer, in accord with Subsection b above.)
|
|
||||||
|
|
||||||
The source code for a work means the preferred form of the work for
|
|
||||||
making modifications to it. For an executable work, 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 executable. However, as a
|
|
||||||
special exception, the source code 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.
|
|
||||||
|
|
||||||
If distribution of executable or 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 counts as
|
|
||||||
distribution of the source code, even though third parties are not
|
|
||||||
compelled to copy the source along with the object code.
|
|
||||||
|
|
||||||
4. You may not copy, modify, sublicense, or distribute the Program
|
Once this change is made in a given copy, it is irreversible for
|
||||||
except as expressly provided under this License. Any attempt
|
that copy, so the ordinary GNU General Public License applies to all
|
||||||
otherwise to copy, modify, sublicense or distribute the Program is
|
subsequent copies and derivative works made from that copy.
|
||||||
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.
|
|
||||||
|
|
||||||
5. You are not required to accept this License, since you have not
|
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 compile 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) 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.
|
||||||
|
|
||||||
|
c) 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.
|
||||||
|
|
||||||
|
d) 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 source code 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
|
signed it. However, nothing else grants you permission to modify or
|
||||||
distribute the Program or its derivative works. These actions are
|
distribute the Library or its derivative works. These actions are
|
||||||
prohibited by law if you do not accept this License. Therefore, by
|
prohibited by law if you do not accept this License. Therefore, by
|
||||||
modifying or distributing the Program (or any work based on the
|
modifying or distributing the Library (or any work based on the
|
||||||
Program), you indicate your acceptance of this License to do so, and
|
Library), you indicate your acceptance of this License to do so, and
|
||||||
all its terms and conditions for copying, distributing or modifying
|
all its terms and conditions for copying, distributing or modifying
|
||||||
the Program or works based on it.
|
the Library or works based on it.
|
||||||
|
|
||||||
6. Each time you redistribute the Program (or any work based on the
|
10. Each time you redistribute the Library (or any work based on the
|
||||||
Program), the recipient automatically receives a license from the
|
Library), the recipient automatically receives a license from the
|
||||||
original licensor to copy, distribute or modify the Program subject to
|
original licensor to copy, distribute, link with or modify the Library
|
||||||
these terms and conditions. You may not impose any further
|
subject to these terms and conditions. You may not impose any further
|
||||||
restrictions on the recipients' exercise of the rights granted herein.
|
restrictions on the recipients' exercise of the rights granted herein.
|
||||||
You are not responsible for enforcing compliance by third parties to
|
You are not responsible for enforcing compliance by third parties to
|
||||||
this License.
|
this License.
|
||||||
|
|
||||||
7. If, as a consequence of a court judgment or allegation of patent
|
11. If, as a consequence of a court judgment or allegation of patent
|
||||||
infringement or for any other reason (not limited to patent issues),
|
infringement or for any other reason (not limited to patent issues),
|
||||||
conditions are imposed on you (whether by court order, agreement or
|
conditions are imposed on you (whether by court order, agreement or
|
||||||
otherwise) that contradict the conditions of this License, they do not
|
otherwise) that contradict the conditions of this License, they do not
|
||||||
excuse you from the conditions of this License. If you cannot
|
excuse you from the conditions of this License. If you cannot
|
||||||
distribute so as to satisfy simultaneously your obligations under this
|
distribute so as to satisfy simultaneously your obligations under this
|
||||||
License and any other pertinent obligations, then as a consequence you
|
License and any other pertinent obligations, then as a consequence you
|
||||||
may not distribute the Program at all. For example, if a patent
|
may not distribute the Library at all. For example, if a patent
|
||||||
license would not permit royalty-free redistribution of the Program by
|
license would not permit royalty-free redistribution of the Library by
|
||||||
all those who receive copies directly or indirectly through you, then
|
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
|
the only way you could satisfy both it and this License would be to
|
||||||
refrain entirely from distribution of the Program.
|
refrain entirely from distribution of the Library.
|
||||||
|
|
||||||
If any portion of this section is held invalid or unenforceable under
|
If any portion of this section is held invalid or unenforceable under any
|
||||||
any particular circumstance, the balance of the section is intended to
|
particular circumstance, the balance of the section is intended to apply,
|
||||||
apply and the section as a whole is intended to apply in other
|
and the section as a whole is intended to apply in other circumstances.
|
||||||
circumstances.
|
|
||||||
|
|
||||||
It is not the purpose of this section to induce you to infringe any
|
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
|
patents or other property right claims or to contest validity of any
|
||||||
such claims; this section has the sole purpose of protecting the
|
such claims; this section has the sole purpose of protecting the
|
||||||
integrity of the free software distribution system, which is
|
integrity of the free software distribution system which is
|
||||||
implemented by public license practices. Many people have made
|
implemented by public license practices. Many people have made
|
||||||
generous contributions to the wide range of software distributed
|
generous contributions to the wide range of software distributed
|
||||||
through that system in reliance on consistent application of that
|
through that system in reliance on consistent application of that
|
||||||
|
|
@ -226,117 +380,102 @@ impose that choice.
|
||||||
|
|
||||||
This section is intended to make thoroughly clear what is believed to
|
This section is intended to make thoroughly clear what is believed to
|
||||||
be a consequence of the rest of this License.
|
be a consequence of the rest of this License.
|
||||||
|
|
||||||
8. If the distribution and/or use of the Program is restricted in
|
12. If the distribution and/or use of the Library is restricted in
|
||||||
certain countries either by patents or by copyrighted interfaces, the
|
certain countries either by patents or by copyrighted interfaces, the
|
||||||
original copyright holder who places the Program under this License
|
original copyright holder who places the Library under this License may add
|
||||||
may add an explicit geographical distribution limitation excluding
|
an explicit geographical distribution limitation excluding those countries,
|
||||||
those countries, so that distribution is permitted only in or among
|
so that distribution is permitted only in or among countries not thus
|
||||||
countries not thus excluded. In such case, this License incorporates
|
excluded. In such case, this License incorporates the limitation as if
|
||||||
the limitation as if written in the body of this License.
|
written in the body of this License.
|
||||||
|
|
||||||
9. The Free Software Foundation may publish revised and/or new versions
|
13. The Free Software Foundation may publish revised and/or new
|
||||||
of the General Public License from time to time. Such new versions will
|
versions of the Library General Public License from time to time.
|
||||||
be similar in spirit to the present version, but may differ in detail to
|
Such new versions will be similar in spirit to the present version,
|
||||||
address new problems or concerns.
|
but may differ in detail to address new problems or concerns.
|
||||||
|
|
||||||
Each version is given a distinguishing version number. If the Program
|
Each version is given a distinguishing version number. If the Library
|
||||||
specifies a version number of this License which applies to it and "any
|
specifies a version number of this License which applies to it and
|
||||||
later version", you have the option of following the terms and conditions
|
"any later version", you have the option of following the terms and
|
||||||
either of that version or of any later version published by the Free
|
conditions either of that version or of any later version published by
|
||||||
Software Foundation. If the Program does not specify a version number of
|
the Free Software Foundation. If the Library does not specify a
|
||||||
this License, you may choose any version ever published by the Free Software
|
license version number, you may choose any version ever published by
|
||||||
Foundation.
|
the Free Software Foundation.
|
||||||
|
|
||||||
10. If you wish to incorporate parts of the Program into other free
|
14. If you wish to incorporate parts of the Library into other free
|
||||||
programs whose distribution conditions are different, write to the author
|
programs whose distribution conditions are incompatible with these,
|
||||||
to ask for permission. For software which is copyrighted by the Free
|
write to the author to ask for permission. For software which is
|
||||||
Software Foundation, write to the Free Software Foundation; we sometimes
|
copyrighted by the Free Software Foundation, write to the Free
|
||||||
make exceptions for this. Our decision will be guided by the two goals
|
Software Foundation; we sometimes make exceptions for this. Our
|
||||||
of preserving the free status of all derivatives of our free software and
|
decision will be guided by the two goals of preserving the free status
|
||||||
of promoting the sharing and reuse of software generally.
|
of all derivatives of our free software and of promoting the sharing
|
||||||
|
and reuse of software generally.
|
||||||
|
|
||||||
NO WARRANTY
|
NO WARRANTY
|
||||||
|
|
||||||
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
|
15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
|
||||||
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
|
WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
|
||||||
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
|
EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
|
||||||
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
|
OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
|
||||||
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
|
||||||
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
|
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||||
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
|
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
|
||||||
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
|
LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
|
||||||
REPAIR OR CORRECTION.
|
THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||||
|
|
||||||
12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
|
||||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
|
WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
|
||||||
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
|
AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
|
||||||
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
|
FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
|
||||||
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
|
CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
|
||||||
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
|
LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
|
||||||
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
|
RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
|
||||||
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
|
FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
|
||||||
POSSIBILITY OF SUCH DAMAGES.
|
SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
|
||||||
|
DAMAGES.
|
||||||
|
|
||||||
END OF TERMS AND CONDITIONS
|
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).
|
||||||
|
|
||||||
How to Apply These Terms to Your New Programs
|
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.
|
||||||
|
|
||||||
If you develop a new program, and you want it to be of the greatest
|
<one line to give the library's name and a brief idea of what it does.>
|
||||||
possible use to the public, the best way to achieve this is to make it
|
Copyright (C) <year> <name of author>
|
||||||
free software which everyone can redistribute and change under these terms.
|
|
||||||
|
|
||||||
To do so, attach the following notices to the program. It is safest
|
This library is free software; you can redistribute it and/or
|
||||||
to attach them to the start of each source file to most effectively
|
modify it under the terms of the GNU Library General Public
|
||||||
convey the exclusion of warranty; and each file should have at least
|
License as published by the Free Software Foundation; either
|
||||||
the "copyright" line and a pointer to where the full notice is found.
|
version 2 of the License, or (at your option) any later version.
|
||||||
|
|
||||||
<one line to give the program's name and a brief idea of what it does.>
|
This library is distributed in the hope that it will be useful,
|
||||||
Copyright (C) 19yy <name of author>
|
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU General Public License as published by
|
|
||||||
the Free Software Foundation; either version 2 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
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.
|
Library 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
|
|
||||||
|
|
||||||
|
You should have received a copy of the GNU Library 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.
|
Also add information on how to contact you by electronic and paper mail.
|
||||||
|
|
||||||
If the program is interactive, make it output a short notice like this
|
|
||||||
when it starts in an interactive mode:
|
|
||||||
|
|
||||||
Gnomovision version 69, Copyright (C) 19yy name of author
|
|
||||||
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
|
||||||
This is free software, and you are welcome to redistribute it
|
|
||||||
under certain conditions; type `show c' for details.
|
|
||||||
|
|
||||||
The hypothetical commands `show w' and `show c' should show the appropriate
|
|
||||||
parts of the General Public License. Of course, the commands you use may
|
|
||||||
be called something other than `show w' and `show c'; they could even be
|
|
||||||
mouse-clicks or menu items--whatever suits your program.
|
|
||||||
|
|
||||||
You should also get your employer (if you work as a programmer) or your
|
You should also get your employer (if you work as a programmer) or your
|
||||||
school, if any, to sign a "copyright disclaimer" for the program, if
|
school, if any, to sign a "copyright disclaimer" for the library, if
|
||||||
necessary. Here is a sample; alter the names:
|
necessary. Here is a sample; alter the names:
|
||||||
|
|
||||||
Yoyodyne, Inc., hereby disclaims all copyright interest in the program
|
Yoyodyne, Inc., hereby disclaims all copyright interest in the
|
||||||
`Gnomovision' (which makes passes at compilers) written by James Hacker.
|
library `Frob' (a library for tweaking knobs) written by James Random Hacker.
|
||||||
|
|
||||||
<signature of Ty Coon>, 1 April 1989
|
<signature of Ty Coon>, 1 April 1990
|
||||||
Ty Coon, President of Vice
|
Ty Coon, President of Vice
|
||||||
|
|
||||||
This General Public License does not permit incorporating your program into
|
That's all there is to it!
|
||||||
proprietary programs. If your program is a subroutine library, you may
|
|
||||||
consider it more useful to permit linking proprietary applications with the
|
|
||||||
library. If this is what you want to do, use the GNU Library General
|
|
||||||
Public License instead of this License.
|
|
||||||
|
|
|
||||||
49
Makefile
49
Makefile
|
|
@ -1,33 +1,8 @@
|
||||||
#-------------------------------------------------------------------%
|
|
||||||
#
|
|
||||||
# LIBNAZGUL : Library
|
|
||||||
#
|
|
||||||
#-------------------------------------------------------------------%
|
|
||||||
#
|
|
||||||
# IUP GMI 2, Module de Système. 2003-2004.
|
|
||||||
# Cours de J-M. Rifflet.
|
|
||||||
#
|
|
||||||
#-------------------------------------------------------------------%
|
|
||||||
#
|
|
||||||
# Projet de :
|
|
||||||
# Glenn ROLLAND,
|
|
||||||
# Sebastian SCHAWOHL,
|
|
||||||
# Rivka ZANA
|
|
||||||
#
|
|
||||||
# pour plus de détails au sujet du projet, voir le
|
|
||||||
# fichier README
|
|
||||||
#
|
|
||||||
#-------------------------------------------------------------------%
|
|
||||||
|
|
||||||
PRJNAME=Libnazgul
|
PROJECT_NAME=libnazgul
|
||||||
GDATE:= $(shell date +"%Y-%m-%d_r%H%M")
|
TIMESTAMP:= $(shell date +"%Y-%m-%d_r%H%M")
|
||||||
GFILENAME:= $(PRJNAME)-$(GDATE).tar.bz2
|
ARCHIVE:= $(PROJECT_NAME)-$(TIMESTAMP).tar.bz2
|
||||||
PATH_GFILENAME:= ../$(GFILENAME)
|
|
||||||
GFILESIZE:=
|
|
||||||
LOCALDIR=$(shell pwd)
|
LOCALDIR=$(shell pwd)
|
||||||
LASTONSERVER = $(shell ssh glenux.ath.cx -l warbrain "ls -rt ~/Projet/Archives/$(PRJNAME)* | tail -n 1")
|
|
||||||
#MAILS=warbrain@glenux.ath.cx
|
|
||||||
#MAILS=glenuxian@airpost.net rolland@dptmaths.ens-cachan.fr el_shogun@netcourrier.com rolandgl@ufr-info-p7.jussieu.fr
|
|
||||||
|
|
||||||
all: subdir
|
all: subdir
|
||||||
|
|
||||||
|
|
@ -50,20 +25,6 @@ clean:
|
||||||
|
|
||||||
package: clean createpackage sendtoarchives
|
package: clean createpackage sendtoarchives
|
||||||
|
|
||||||
#mail: clean createpackage sendpackage sendtoarchives
|
zip:
|
||||||
|
tar -cjvf ../$(ARCHIVE) -C ../ $(PROJECT_NAME)
|
||||||
createpackage:
|
|
||||||
tar -cjvf $(PATH_GFILENAME) -C ../ $(PRJNAME)
|
|
||||||
|
|
||||||
sendtoarchives:
|
|
||||||
mv $(PATH_GFILENAME) ../Archives
|
|
||||||
|
|
||||||
#sendpackage:
|
|
||||||
# (echo -e "\nCi joint le fichier:\n$(shell du -sh $(PATH_GFILENAME))" \
|
|
||||||
# && echo -e "\nPour décompresser:" \
|
|
||||||
# && echo -e "\n\ttar -xjvf $(GFILENAME)\n" \
|
|
||||||
# && echo -e "\n(n'oubliez pas de supprimer l'ancien répertoire du même nom avant de décompresser)" \
|
|
||||||
# && echo -e "\n\nHistorique des modifications :\n" \
|
|
||||||
# && cat CHANGELOG ) \
|
|
||||||
# | mutt $(MAILS) -a $(PATH_GFILENAME) -s "[$(PRJNAME)] $(GDATE)"
|
|
||||||
|
|
||||||
|
|
|
||||||
17
README
17
README
|
|
@ -1,22 +1,21 @@
|
||||||
#-------------------------------------------------------------------%
|
#-------------------------------------------------------------------%
|
||||||
#
|
#
|
||||||
# LIBNAZGUL : Library
|
# LIBNAZGUL
|
||||||
#
|
#
|
||||||
#-------------------------------------------------------------------%
|
#-------------------------------------------------------------------%
|
||||||
#
|
#
|
||||||
# IUP GMI 2, Module de Système. 2003-2004.
|
# IUP GMI 2nd year,
|
||||||
# Cours de J-M. Rifflet.
|
# Project for the Operating Systems course,
|
||||||
|
# Classes by J-M. Rifflet, 2003-2004.
|
||||||
#
|
#
|
||||||
#-------------------------------------------------------------------%
|
#-------------------------------------------------------------------%
|
||||||
#
|
#
|
||||||
# Projet de :
|
# Authors :
|
||||||
# Glenn ROLLAND,
|
#
|
||||||
# Sebastian SCHAWOHL,
|
# Glenn ROLLAND
|
||||||
|
# Sebastian SCHAWOHL
|
||||||
# Rivka ZANA
|
# Rivka ZANA
|
||||||
#
|
#
|
||||||
# pour plus de détails au sujet du projet, voir le
|
|
||||||
# fichier README
|
|
||||||
#
|
|
||||||
#-------------------------------------------------------------------%
|
#-------------------------------------------------------------------%
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,9 @@
|
||||||
\documentclass[12pt,a4paper]{report}
|
\documentclass[12pt,a4paper]{report}
|
||||||
\usepackage{a4wide}
|
%\usepackage{a4wide}
|
||||||
\usepackage{geometry}
|
\usepackage{geometry}
|
||||||
\usepackage{typehtml}
|
%\usepackage{typehtml}
|
||||||
\usepackage[latin1]{inputenc}
|
\usepackage[latin1]{inputenc}
|
||||||
\usepackage{listings}
|
%\usepackage{listings}
|
||||||
\usepackage[french]{babel}
|
\usepackage[french]{babel}
|
||||||
\usepackage{fancyheadings}
|
\usepackage{fancyheadings}
|
||||||
\usepackage{color}
|
\usepackage{color}
|
||||||
|
|
|
||||||
|
|
@ -1,9 +0,0 @@
|
||||||
#!/bin/bash
|
|
||||||
|
|
||||||
export CVS_RSH=ssh
|
|
||||||
export CVSROOT=:ext:login@cvs.tuxfamily.org:/cvsroot/libnazgul
|
|
||||||
|
|
||||||
# ci commit
|
|
||||||
# co new branch
|
|
||||||
# update
|
|
||||||
exec $SHELL
|
|
||||||
|
|
@ -1,8 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
if [ -f .ssh-agent ]; then
|
|
||||||
. .ssh-agent
|
|
||||||
else
|
|
||||||
killall ssh-agent
|
|
||||||
ssh-agent > .ssh-agent
|
|
||||||
ssh-add ~/.ssh/id_rsa
|
|
||||||
fi
|
|
||||||
|
|
@ -9,11 +9,8 @@
|
||||||
|
|
||||||
/* TODO: prevoir le cas des négatifs dans la taille ... */
|
/* TODO: prevoir le cas des négatifs dans la taille ... */
|
||||||
|
|
||||||
void * msgAllocate(msgSpace *space,
|
void *msgAllocate(msgSpace * space, int pool, int taille, int option)
|
||||||
int pool,
|
{
|
||||||
int taille,
|
|
||||||
int option
|
|
||||||
){
|
|
||||||
void *resultAddr = NULL;
|
void *resultAddr = NULL;
|
||||||
int bufferFreeSize;
|
int bufferFreeSize;
|
||||||
int i;
|
int i;
|
||||||
|
|
@ -32,10 +29,8 @@ void * msgAllocate(msgSpace *space,
|
||||||
int bufferFreeIndex;
|
int bufferFreeIndex;
|
||||||
msgPoolData *mSPoolDataTabAddr;
|
msgPoolData *mSPoolDataTabAddr;
|
||||||
|
|
||||||
|
|
||||||
selectedPoolIndex = -1;
|
selectedPoolIndex = -1;
|
||||||
|
|
||||||
|
|
||||||
mSPoolDataTabAddr = msgPoolDataTabOpen(space);
|
mSPoolDataTabAddr = msgPoolDataTabOpen(space);
|
||||||
if (mSPoolDataTabAddr == NULL) {
|
if (mSPoolDataTabAddr == NULL) {
|
||||||
NZG_ERROR("msgPoolDataTabOpen", space->poolDataTabId);
|
NZG_ERROR("msgPoolDataTabOpen", space->poolDataTabId);
|
||||||
|
|
@ -76,29 +71,40 @@ if (mSPoolDataTabAddr==NULL){
|
||||||
fprintf(stderr, "[ ALLOCATION ANYPOOL : %d ]\n", (int)getpid());
|
fprintf(stderr, "[ ALLOCATION ANYPOOL : %d ]\n", (int)getpid());
|
||||||
// choisir le pool au hasard (ou presque)
|
// choisir le pool au hasard (ou presque)
|
||||||
for (i = 0; i < (space->poolNb); i++) {
|
for (i = 0; i < (space->poolNb); i++) {
|
||||||
printf("- boucle %d\n",i); fflush(stdout);
|
printf("- boucle %d\n", i);
|
||||||
|
fflush(stdout);
|
||||||
if (mSPoolDataTabAddr[i].bufferSize >= taille) {
|
if (mSPoolDataTabAddr[i].bufferSize >= taille) {
|
||||||
printf("( buffSize > taille )\n"); fflush(stdout);
|
printf("( buffSize > taille )\n");
|
||||||
|
fflush(stdout);
|
||||||
/* choisir le numero du semaphore
|
/* choisir le numero du semaphore
|
||||||
en fonction du nombre de lock poses / nombre de buffer */
|
en fonction du nombre de lock poses / nombre de buffer */
|
||||||
msgPoolSemIdIntern(ressourceSemId,space->id,i);
|
msgPoolSemIdIntern(ressourceSemId, space->id,
|
||||||
ressourceSemFd = sem_open(ressourceSemId,O_CREAT,SEM_DEFAULT_MODE,0);
|
i);
|
||||||
|
ressourceSemFd =
|
||||||
|
sem_open(ressourceSemId, O_CREAT,
|
||||||
|
SEM_DEFAULT_MODE, 0);
|
||||||
if (ressourceSemFd == SEM_FAILED) {
|
if (ressourceSemFd == SEM_FAILED) {
|
||||||
NZG_ERROR("sem_open", ressourceSemId);
|
NZG_ERROR("sem_open", ressourceSemId);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
/* on remplit le tableau avec les valeurs des semaphores */
|
/* on remplit le tableau avec les valeurs des semaphores */
|
||||||
|
|
||||||
if (sem_getvalue(ressourceSemFd, &ressourceSemVal) < 0){
|
if (sem_getvalue
|
||||||
NZG_ERROR("sem_getvalue",ressourceSemId);
|
(ressourceSemFd, &ressourceSemVal) < 0) {
|
||||||
|
NZG_ERROR("sem_getvalue",
|
||||||
|
ressourceSemId);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
printf("RESSOURCESEMVAL %d\n", ressourceSemVal);
|
printf("RESSOURCESEMVAL %d\n", ressourceSemVal);
|
||||||
if (ressourceSemVal <= 0) {
|
if (ressourceSemVal <= 0) {
|
||||||
printf("resVal < 0 : %d\n",ressourceSemVal);
|
printf("resVal < 0 : %d\n",
|
||||||
|
ressourceSemVal);
|
||||||
/* il y a ressourceSemVal processus qui attendent déja... */
|
/* il y a ressourceSemVal processus qui attendent déja... */
|
||||||
semPoolCoef[nbLockedSem] =
|
semPoolCoef[nbLockedSem] =
|
||||||
(float) ((1-ressourceSemVal) / mSPoolDataTabAddr[i].bufferNb);
|
(float)((1 -
|
||||||
|
ressourceSemVal) /
|
||||||
|
mSPoolDataTabAddr[i].
|
||||||
|
bufferNb);
|
||||||
nbLockedSem++;
|
nbLockedSem++;
|
||||||
}
|
}
|
||||||
if (sem_trywait(ressourceSemFd) == 0) {
|
if (sem_trywait(ressourceSemFd) == 0) {
|
||||||
|
|
@ -110,13 +116,15 @@ if (mSPoolDataTabAddr==NULL){
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if (sem_close(ressourceSemFd) < 0) {
|
if (sem_close(ressourceSemFd) < 0) {
|
||||||
NZG_ERROR("sem_getvalue",ressourceSemId);
|
NZG_ERROR("sem_getvalue",
|
||||||
|
ressourceSemId);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
} // if buffSize > taille
|
} // if buffSize > taille
|
||||||
} // for
|
} // for
|
||||||
|
|
||||||
printf("ERRORDETECT outFor\n"); fflush(stdout);
|
printf("ERRORDETECT outFor\n");
|
||||||
|
fflush(stdout);
|
||||||
|
|
||||||
if (!gotRessourceSem) {
|
if (!gotRessourceSem) {
|
||||||
printf("Calcul du meilleur en cas de liberation\n");
|
printf("Calcul du meilleur en cas de liberation\n");
|
||||||
|
|
@ -125,7 +133,8 @@ if (mSPoolDataTabAddr==NULL){
|
||||||
/* on cherche le pool avec le moins de lock poses / nbre de buffer
|
/* on cherche le pool avec le moins de lock poses / nbre de buffer
|
||||||
* le numéro du pool est stocké dans idxPoolOptimum */
|
* le numéro du pool est stocké dans idxPoolOptimum */
|
||||||
for (i = 0; i < nbLockedSem; i++) {
|
for (i = 0; i < nbLockedSem; i++) {
|
||||||
printf("Coef %d : %d\n",i,(int)semPoolCoef[i]);
|
printf("Coef %d : %d\n", i,
|
||||||
|
(int)semPoolCoef[i]);
|
||||||
if ((semPoolCoef[i] != -1)
|
if ((semPoolCoef[i] != -1)
|
||||||
&& (semPoolCoef[i] < minPoolCoef)) {
|
&& (semPoolCoef[i] < minPoolCoef)) {
|
||||||
minPoolCoef = semPoolCoef[i];
|
minPoolCoef = semPoolCoef[i];
|
||||||
|
|
@ -147,13 +156,14 @@ if (mSPoolDataTabAddr==NULL){
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!gotRessourceSem) {
|
if (!gotRessourceSem) {
|
||||||
msgPoolSemIdIntern(ressourceSemId,space->externId,selectedPoolIndex);
|
msgPoolSemIdIntern(ressourceSemId, space->externId,
|
||||||
ressourceSemFd=sem_open(ressourceSemId,O_CREAT,SEM_DEFAULT_MODE,0);
|
selectedPoolIndex);
|
||||||
|
ressourceSemFd =
|
||||||
|
sem_open(ressourceSemId, O_CREAT, SEM_DEFAULT_MODE, 0);
|
||||||
if (ressourceSemFd == SEM_FAILED) {
|
if (ressourceSemFd == SEM_FAILED) {
|
||||||
NZG_ERROR("sem_open", ressourceSemId);
|
NZG_ERROR("sem_open", ressourceSemId);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
//TODO:virer la ligne suivante:
|
//TODO:virer la ligne suivante:
|
||||||
sem_getvalue(ressourceSemFd, &ressourceSemVal);
|
sem_getvalue(ressourceSemFd, &ressourceSemVal);
|
||||||
|
|
||||||
|
|
@ -166,7 +176,6 @@ if (mSPoolDataTabAddr==NULL){
|
||||||
printf("Passed %s\n", ressourceSemId);
|
printf("Passed %s\n", ressourceSemId);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/* on a acqui un semaphore pour la ressouce */
|
/* on a acqui un semaphore pour la ressouce */
|
||||||
/* on acquiert le droit de modifier les infos sur la ressource */
|
/* on acquiert le droit de modifier les infos sur la ressource */
|
||||||
/* on protege le tableau des associations */
|
/* on protege le tableau des associations */
|
||||||
|
|
@ -174,7 +183,8 @@ if (mSPoolDataTabAddr==NULL){
|
||||||
|
|
||||||
/* on modifie maintenant les données */
|
/* on modifie maintenant les données */
|
||||||
/* - on récupere l'index du premier buffer libre */
|
/* - on récupere l'index du premier buffer libre */
|
||||||
bufferFreeIndex = msgBufferGetFreeIndex(mSPoolDataTabAddr,selectedPoolIndex);
|
bufferFreeIndex =
|
||||||
|
msgBufferGetFreeIndex(mSPoolDataTabAddr, selectedPoolIndex);
|
||||||
if (bufferFreeIndex < 0) {
|
if (bufferFreeIndex < 0) {
|
||||||
// aucun buffer libre ?
|
// aucun buffer libre ?
|
||||||
NZG_ERROR("msgBufferGetFreeIndex", "");
|
NZG_ERROR("msgBufferGetFreeIndex", "");
|
||||||
|
|
@ -187,25 +197,26 @@ if (mSPoolDataTabAddr==NULL){
|
||||||
bufferFreeSize = mSPoolDataTabAddr[selectedPoolIndex].bufferSize;
|
bufferFreeSize = mSPoolDataTabAddr[selectedPoolIndex].bufferSize;
|
||||||
printf("BufferSize : %d\n", bufferFreeSize);
|
printf("BufferSize : %d\n", bufferFreeSize);
|
||||||
|
|
||||||
resultAddr=msgBufferMap(mSPoolDataTabAddr,selectedPoolIndex,bufferFreeIndex);
|
resultAddr =
|
||||||
|
msgBufferMap(mSPoolDataTabAddr, selectedPoolIndex, bufferFreeIndex);
|
||||||
if (resultAddr == NULL) {
|
if (resultAddr == NULL) {
|
||||||
NZG_ERROR("msgBufferMap",mSPoolDataTabAddr[selectedPoolIndex].poolId);
|
NZG_ERROR("msgBufferMap",
|
||||||
|
mSPoolDataTabAddr[selectedPoolIndex].poolId);
|
||||||
goto ERROR;
|
goto ERROR;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* - on s'enregistre aupres de ce buffer */
|
/* - on s'enregistre aupres de ce buffer */
|
||||||
msgBufferAttachProc(mSPoolDataTabAddr,
|
msgBufferAttachProc(mSPoolDataTabAddr,
|
||||||
selectedPoolIndex,
|
selectedPoolIndex, bufferFreeIndex, resultAddr);
|
||||||
bufferFreeIndex,
|
|
||||||
resultAddr);
|
|
||||||
|
|
||||||
// munmap(mSPoolDataTabAddr,(space->poolNb) * sizeof( msgPoolData ));
|
// munmap(mSPoolDataTabAddr,(space->poolNb) * sizeof( msgPoolData ));
|
||||||
/* unmapper le msgPoolDataTab */
|
/* unmapper le msgPoolDataTab */
|
||||||
msgPoolDataTabClose(space, mSPoolDataTabAddr);
|
msgPoolDataTabClose(space, mSPoolDataTabAddr);
|
||||||
msgPoolDataTabUnlock(space);
|
msgPoolDataTabUnlock(space);
|
||||||
|
|
||||||
printf( "alloc de 0x%08x\n", (int)resultAddr);
|
printf("alloc de %p\n", (void *)resultAddr);
|
||||||
return resultAddr;
|
return resultAddr;
|
||||||
|
|
||||||
ERROR:
|
ERROR:
|
||||||
NZG_ERROR("msgAllocate", "error processing");
|
NZG_ERROR("msgAllocate", "error processing");
|
||||||
msgPoolDataTabUnlock(space);
|
msgPoolDataTabUnlock(space);
|
||||||
|
|
|
||||||
10
src/buffer.c
10
src/buffer.c
|
|
@ -1,15 +1,11 @@
|
||||||
#include "libnazgul.h"
|
#include "libnazgul.h"
|
||||||
|
|
||||||
int msgBufferGetAttachedProcIndex(
|
int msgBufferGetAttachedProcIndex(msgPoolData * poolDataTabAddr,
|
||||||
msgPoolData * poolDataTabAddr,
|
int poolIndex, void *addr)
|
||||||
int poolIndex,
|
{
|
||||||
void * addr
|
|
||||||
){
|
|
||||||
|
|
||||||
//TODO: parcourrir tous les index, et regarder s'il y
|
//TODO: parcourrir tous les index, et regarder s'il y
|
||||||
//a une addresse qui correspond avec le meme processus...
|
//a une addresse qui correspond avec le meme processus...
|
||||||
//et renvoyer l'index du buffer correspondant a l'addresse...
|
//et renvoyer l'index du buffer correspondant a l'addresse...
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,7 @@
|
||||||
#include "libnazgul.h"
|
#include "libnazgul.h"
|
||||||
|
|
||||||
int msgBufferAttachProc(
|
int msgBufferAttachProc(msgPoolData * poolDataTabAddr,
|
||||||
msgPoolData * poolDataTabAddr,
|
int poolIndex, int bufferIndex, void *addr)
|
||||||
int poolIndex,
|
|
||||||
int bufferIndex,
|
|
||||||
void * addr)
|
|
||||||
{
|
{
|
||||||
msgBufferInfoTabId bufferInfoTabId;
|
msgBufferInfoTabId bufferInfoTabId;
|
||||||
int bufferInfoTabFd;
|
int bufferInfoTabFd;
|
||||||
|
|
@ -14,7 +11,6 @@ int msgBufferAttachProc(
|
||||||
//récuperer l'ID du BufferInfoTab;
|
//récuperer l'ID du BufferInfoTab;
|
||||||
strcpy(bufferInfoTabId, poolDataTabAddr[poolIndex].bufferInfoTabId);
|
strcpy(bufferInfoTabId, poolDataTabAddr[poolIndex].bufferInfoTabId);
|
||||||
|
|
||||||
|
|
||||||
bufferInfoTabFd = shm_open(bufferInfoTabId, O_RDWR, SHM_DEFAULT_MODE);
|
bufferInfoTabFd = shm_open(bufferInfoTabId, O_RDWR, SHM_DEFAULT_MODE);
|
||||||
if (bufferInfoTabFd < 0) {
|
if (bufferInfoTabFd < 0) {
|
||||||
NZG_ERROR("sem_open", bufferInfoTabId);
|
NZG_ERROR("sem_open", bufferInfoTabId);
|
||||||
|
|
@ -24,18 +20,17 @@ int msgBufferAttachProc(
|
||||||
/** on regarde dans le tableau d'infos de buffer **/
|
/** on regarde dans le tableau d'infos de buffer **/
|
||||||
bufferInfoNb = poolDataTabAddr[poolIndex].bufferNb;
|
bufferInfoNb = poolDataTabAddr[poolIndex].bufferNb;
|
||||||
bufferInfoTabAddr = mmap(NULL, bufferInfoNb * sizeof(msgBufferInfo),
|
bufferInfoTabAddr = mmap(NULL, bufferInfoNb * sizeof(msgBufferInfo),
|
||||||
PROT_READ|PROT_WRITE,MAP_SHARED,bufferInfoTabFd,(off_t)0);
|
PROT_READ | PROT_WRITE, MAP_SHARED,
|
||||||
|
bufferInfoTabFd, (off_t) 0);
|
||||||
printf("atta gooo %s\n", bufferInfoTabId);
|
printf("atta gooo %s\n", bufferInfoTabId);
|
||||||
|
|
||||||
bufferInfoTabAddr[bufferIndex].ownerPid = getpid();
|
bufferInfoTabAddr[bufferIndex].ownerPid = getpid();
|
||||||
bufferInfoTabAddr[bufferIndex].addr = addr;
|
bufferInfoTabAddr[bufferIndex].addr = addr;
|
||||||
|
|
||||||
if (munmap(bufferInfoTabAddr,bufferInfoNb*sizeof(msgBufferInfo))< 0)
|
if (munmap(bufferInfoTabAddr, bufferInfoNb * sizeof(msgBufferInfo)) < 0) {
|
||||||
{
|
|
||||||
NZG_ERROR("munmap", bufferInfoTabId);
|
NZG_ERROR("munmap", bufferInfoTabId);
|
||||||
return -1; }
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,8 @@
|
||||||
#include "libnazgul.h"
|
#include "libnazgul.h"
|
||||||
|
|
||||||
int msgBufferDetachProc(
|
int msgBufferDetachProc(msgPoolData * poolDataTabAddr,
|
||||||
msgPoolData * poolDataTabAddr,
|
int poolIndex, int bufferIndex, void *addr)
|
||||||
int poolIndex,
|
{
|
||||||
int bufferIndex,
|
|
||||||
void * addr
|
|
||||||
){
|
|
||||||
msgBufferInfoTabId bufferInfoTabId;
|
msgBufferInfoTabId bufferInfoTabId;
|
||||||
int bufferInfoTabFd;
|
int bufferInfoTabFd;
|
||||||
msgBufferInfo *bufferInfoTabAddr;
|
msgBufferInfo *bufferInfoTabAddr;
|
||||||
|
|
@ -14,7 +11,6 @@ int msgBufferDetachProc(
|
||||||
printf("Detaching %d,%d\n", poolIndex, bufferIndex);
|
printf("Detaching %d,%d\n", poolIndex, bufferIndex);
|
||||||
//récuperer l'ID du BufferInfoTab;
|
//récuperer l'ID du BufferInfoTab;
|
||||||
|
|
||||||
|
|
||||||
strcpy(bufferInfoTabId, poolDataTabAddr[poolIndex].bufferInfoTabId);
|
strcpy(bufferInfoTabId, poolDataTabAddr[poolIndex].bufferInfoTabId);
|
||||||
|
|
||||||
bufferInfoTabFd = shm_open(bufferInfoTabId, O_RDWR, SHM_DEFAULT_MODE);
|
bufferInfoTabFd = shm_open(bufferInfoTabId, O_RDWR, SHM_DEFAULT_MODE);
|
||||||
|
|
@ -26,17 +22,16 @@ int msgBufferDetachProc(
|
||||||
/** on regarde dans le tableau d'infos de buffer **/
|
/** on regarde dans le tableau d'infos de buffer **/
|
||||||
bufferInfoNb = poolDataTabAddr[poolIndex].bufferNb;
|
bufferInfoNb = poolDataTabAddr[poolIndex].bufferNb;
|
||||||
bufferInfoTabAddr = mmap(NULL, bufferInfoNb * sizeof(msgBufferInfo),
|
bufferInfoTabAddr = mmap(NULL, bufferInfoNb * sizeof(msgBufferInfo),
|
||||||
PROT_READ|PROT_WRITE,MAP_SHARED,bufferInfoTabFd,(off_t)0);
|
PROT_READ | PROT_WRITE, MAP_SHARED,
|
||||||
|
bufferInfoTabFd, (off_t) 0);
|
||||||
|
|
||||||
bufferInfoTabAddr[bufferIndex].ownerPid = (pid_t) - 1;
|
bufferInfoTabAddr[bufferIndex].ownerPid = (pid_t) - 1;
|
||||||
bufferInfoTabAddr[bufferIndex].addr = NULL;
|
bufferInfoTabAddr[bufferIndex].addr = NULL;
|
||||||
|
|
||||||
if (munmap(bufferInfoTabAddr,bufferInfoNb*sizeof(msgBufferInfo))< 0)
|
if (munmap(bufferInfoTabAddr, bufferInfoNb * sizeof(msgBufferInfo)) < 0) {
|
||||||
{
|
|
||||||
NZG_ERROR("munmap", bufferInfoTabId);
|
NZG_ERROR("munmap", bufferInfoTabId);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
#include "libnazgul.h"
|
#include "libnazgul.h"
|
||||||
|
|
||||||
int msgBufferGetFreeIndex(msgPoolData * poolDataTabAddr,int poolIndex){
|
int msgBufferGetFreeIndex(msgPoolData * poolDataTabAddr, int poolIndex)
|
||||||
|
{
|
||||||
msgBufferInfoTabId bufferInfoTabId;
|
msgBufferInfoTabId bufferInfoTabId;
|
||||||
int bufferInfoTabFd;
|
int bufferInfoTabFd;
|
||||||
msgBufferInfo *bufferInfoTabAddr;
|
msgBufferInfo *bufferInfoTabAddr;
|
||||||
|
|
@ -20,20 +21,23 @@ int i;
|
||||||
/** on regarde dans le tableau d'infos de buffer **/
|
/** on regarde dans le tableau d'infos de buffer **/
|
||||||
bufferInfoNb = poolDataTabAddr[poolIndex].bufferNb;
|
bufferInfoNb = poolDataTabAddr[poolIndex].bufferNb;
|
||||||
bufferInfoTabAddr = mmap(NULL, bufferInfoNb * sizeof(msgBufferInfo),
|
bufferInfoTabAddr = mmap(NULL, bufferInfoNb * sizeof(msgBufferInfo),
|
||||||
PROT_READ,MAP_SHARED,bufferInfoTabFd,(off_t)0);
|
PROT_READ, MAP_SHARED, bufferInfoTabFd,
|
||||||
|
(off_t) 0);
|
||||||
|
|
||||||
i = 0;
|
i = 0;
|
||||||
while ((i < bufferInfoNb)
|
while ((i < bufferInfoNb)
|
||||||
&& (bufferInfoTabAddr[i].ownerPid != (pid_t)-1)){ i++; }
|
&& (bufferInfoTabAddr[i].ownerPid != (pid_t) - 1)) {
|
||||||
if (i == bufferInfoNb){ return -1; }
|
i++;
|
||||||
|
}
|
||||||
|
if (i == bufferInfoNb) {
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
bufferFreeIndex = i;
|
bufferFreeIndex = i;
|
||||||
|
|
||||||
if (munmap(bufferInfoTabAddr,bufferInfoNb*sizeof(msgBufferInfo))< 0)
|
if (munmap(bufferInfoTabAddr, bufferInfoNb * sizeof(msgBufferInfo)) < 0) {
|
||||||
{
|
|
||||||
NZG_ERROR("munmap", bufferInfoTabId);
|
NZG_ERROR("munmap", bufferInfoTabId);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
return bufferFreeIndex;
|
return bufferFreeIndex;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,9 @@
|
||||||
#include "libnazgul.h"
|
#include "libnazgul.h"
|
||||||
|
|
||||||
int msgBufferGetProcAttach(
|
int msgBufferGetProcAttach(msgPoolData * poolDataTabAddr,
|
||||||
msgPoolData * poolDataTabAddr,
|
|
||||||
int poolNb,
|
int poolNb,
|
||||||
int * poolIndex,
|
int *poolIndex, int *bufferIndex, void *addr)
|
||||||
int * bufferIndex,
|
{
|
||||||
void * addr
|
|
||||||
){
|
|
||||||
msgBufferInfoTabId bufferInfoTabId;
|
msgBufferInfoTabId bufferInfoTabId;
|
||||||
int bufferInfoTabFd;
|
int bufferInfoTabFd;
|
||||||
msgBufferInfo *bufferInfoTabAddr;
|
msgBufferInfo *bufferInfoTabAddr;
|
||||||
|
|
@ -21,13 +18,17 @@ int msgBufferGetProcAttach(
|
||||||
strcpy(bufferInfoTabId, poolDataTabAddr[pIdx].bufferInfoTabId);
|
strcpy(bufferInfoTabId, poolDataTabAddr[pIdx].bufferInfoTabId);
|
||||||
bufferInfoNb = poolDataTabAddr[pIdx].bufferNb;
|
bufferInfoNb = poolDataTabAddr[pIdx].bufferNb;
|
||||||
|
|
||||||
bufferInfoTabFd=shm_open(bufferInfoTabId,O_RDWR,SHM_DEFAULT_MODE);
|
bufferInfoTabFd =
|
||||||
if (bufferInfoTabFd<0)
|
shm_open(bufferInfoTabId, O_RDWR, SHM_DEFAULT_MODE);
|
||||||
{ NZG_ERROR("shm_open",bufferInfoTabId); return -1; }
|
if (bufferInfoTabFd < 0) {
|
||||||
|
NZG_ERROR("shm_open", bufferInfoTabId);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
/** on regarde dans le tableau d'infos de buffer **/
|
/** on regarde dans le tableau d'infos de buffer **/
|
||||||
bufferInfoTabAddr=mmap(NULL,bufferInfoNb*sizeof(msgBufferInfo),
|
bufferInfoTabAddr =
|
||||||
PROT_READ,MAP_SHARED,bufferInfoTabFd,(off_t)0);
|
mmap(NULL, bufferInfoNb * sizeof(msgBufferInfo), PROT_READ,
|
||||||
|
MAP_SHARED, bufferInfoTabFd, (off_t) 0);
|
||||||
|
|
||||||
/* on cherche dans chacun des buffers */
|
/* on cherche dans chacun des buffers */
|
||||||
bIdx = 0;
|
bIdx = 0;
|
||||||
|
|
@ -38,14 +39,23 @@ int msgBufferGetProcAttach(
|
||||||
};
|
};
|
||||||
bIdx++;
|
bIdx++;
|
||||||
}
|
}
|
||||||
if (found){ (*poolIndex)=pIdx; }
|
if (found) {
|
||||||
|
(*poolIndex) = pIdx;
|
||||||
|
}
|
||||||
/* on détache le morceau de mémoire */
|
/* on détache le morceau de mémoire */
|
||||||
if (munmap(bufferInfoTabAddr,bufferInfoNb*sizeof(msgBufferInfo))< 0)
|
if (munmap
|
||||||
{ NZG_ERROR("munmap",bufferInfoTabId); return -1; }
|
(bufferInfoTabAddr,
|
||||||
|
bufferInfoNb * sizeof(msgBufferInfo)) < 0) {
|
||||||
|
NZG_ERROR("munmap", bufferInfoTabId);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
close(bufferInfoTabFd);
|
close(bufferInfoTabFd);
|
||||||
pIdx++;
|
pIdx++;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (found){ return 0; } else {return -1;}
|
if (found) {
|
||||||
|
return 0;
|
||||||
|
} else {
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,10 @@
|
||||||
#include "libnazgul.h"
|
#include "libnazgul.h"
|
||||||
#include "ids.h"
|
#include "ids.h"
|
||||||
|
|
||||||
int msgBufferInfoTabCreate(
|
int msgBufferInfoTabCreate(msgSpaceId externId,
|
||||||
msgSpaceId externId,
|
|
||||||
msgPoolData * poolDataTabAddr,
|
msgPoolData * poolDataTabAddr,
|
||||||
int poolIdx,
|
int poolIdx, int bufferNb)
|
||||||
int bufferNb) {
|
{
|
||||||
|
|
||||||
int bufferInfoTabFd;
|
int bufferInfoTabFd;
|
||||||
msgBufferInfoTabId bufferInfoTabId;
|
msgBufferInfoTabId bufferInfoTabId;
|
||||||
|
|
@ -16,10 +15,12 @@ int msgBufferInfoTabCreate(
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
bufferInfoTabFd=shm_open(bufferInfoTabId,O_RDWR|O_CREAT|O_EXCL|O_TRUNC,MSGSPACE_DEFAULT_MODE);
|
bufferInfoTabFd =
|
||||||
|
shm_open(bufferInfoTabId, O_RDWR | O_CREAT | O_EXCL | O_TRUNC,
|
||||||
|
MSGSPACE_DEFAULT_MODE);
|
||||||
if (bufferInfoTabFd == -1) {
|
if (bufferInfoTabFd == -1) {
|
||||||
fprintf( stderr, "msgInfoTab : %s creation failed: %s\n",bufferInfoTabId,
|
fprintf(stderr, "msgInfoTab : %s creation failed: %s\n",
|
||||||
strerror( errno ) );
|
bufferInfoTabId, strerror(errno));
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
if (ftruncate(bufferInfoTabFd, bufferNb * sizeof(msgBufferInfo)) == -1) {
|
if (ftruncate(bufferInfoTabFd, bufferNb * sizeof(msgBufferInfo)) == -1) {
|
||||||
|
|
@ -32,6 +33,7 @@ int msgBufferInfoTabCreate(
|
||||||
|
|
||||||
msgBufferInfoTabInit(poolDataTabAddr, poolIdx);
|
msgBufferInfoTabInit(poolDataTabAddr, poolIdx);
|
||||||
|
|
||||||
return -1;NZG_ERROR("munmap",bufferInfoTabId);
|
return -1;
|
||||||
|
NZG_ERROR("munmap", bufferInfoTabId);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
#include "libnazgul.h"
|
#include "libnazgul.h"
|
||||||
|
|
||||||
int msgBufferInfoTabInit(msgPoolData * poolDataTabAddr,int poolIndex){
|
int msgBufferInfoTabInit(msgPoolData * poolDataTabAddr, int poolIndex)
|
||||||
|
{
|
||||||
msgBufferInfoTabId bufferInfoTabId;
|
msgBufferInfoTabId bufferInfoTabId;
|
||||||
int bufferInfoTabFd;
|
int bufferInfoTabFd;
|
||||||
msgBufferInfo *bufferInfoTabAddr;
|
msgBufferInfo *bufferInfoTabAddr;
|
||||||
|
|
@ -10,7 +11,8 @@ int i;
|
||||||
//récuperer l'ID du BufferInfoTab;
|
//récuperer l'ID du BufferInfoTab;
|
||||||
strcpy(bufferInfoTabId, poolDataTabAddr[poolIndex].bufferInfoTabId);
|
strcpy(bufferInfoTabId, poolDataTabAddr[poolIndex].bufferInfoTabId);
|
||||||
|
|
||||||
printf("msgBufferInfoTabId %d open >>%s<<\n",poolIndex,bufferInfoTabId);
|
printf("msgBufferInfoTabId %d open >>%s<<\n", poolIndex,
|
||||||
|
bufferInfoTabId);
|
||||||
bufferInfoTabFd = shm_open(bufferInfoTabId, O_RDWR, SHM_DEFAULT_MODE);
|
bufferInfoTabFd = shm_open(bufferInfoTabId, O_RDWR, SHM_DEFAULT_MODE);
|
||||||
if (bufferInfoTabFd < 0) {
|
if (bufferInfoTabFd < 0) {
|
||||||
NZG_ERROR("msgBufferInfoTabId open", bufferInfoTabId);
|
NZG_ERROR("msgBufferInfoTabId open", bufferInfoTabId);
|
||||||
|
|
@ -20,15 +22,17 @@ int i;
|
||||||
/** on regarde dans le tableau d'infos de buffer **/
|
/** on regarde dans le tableau d'infos de buffer **/
|
||||||
bufferInfoNb = poolDataTabAddr[poolIndex].bufferNb;
|
bufferInfoNb = poolDataTabAddr[poolIndex].bufferNb;
|
||||||
bufferInfoTabAddr = mmap(NULL, bufferInfoNb * sizeof(msgBufferInfo),
|
bufferInfoTabAddr = mmap(NULL, bufferInfoNb * sizeof(msgBufferInfo),
|
||||||
PROT_WRITE|PROT_READ,MAP_SHARED,bufferInfoTabFd,(off_t)0);
|
PROT_WRITE | PROT_READ, MAP_SHARED,
|
||||||
|
bufferInfoTabFd, (off_t) 0);
|
||||||
|
|
||||||
for (i = 0; i < bufferInfoNb; i++) {
|
for (i = 0; i < bufferInfoNb; i++) {
|
||||||
bufferInfoTabAddr[i].ownerPid = (pid_t) - 1;
|
bufferInfoTabAddr[i].ownerPid = (pid_t) - 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (munmap(bufferInfoTabAddr,bufferInfoNb*sizeof(msgBufferInfo))< 0)
|
if (munmap(bufferInfoTabAddr, bufferInfoNb * sizeof(msgBufferInfo)) < 0) {
|
||||||
{ perror("munmap"); return -1; }
|
perror("munmap");
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
#include "libnazgul.h"
|
#include "libnazgul.h"
|
||||||
|
|
||||||
|
void *msgBufferMap(msgPoolData * poolDataTab, int poolIndex, int bufferIndex)
|
||||||
void * msgBufferMap(msgPoolData * poolDataTab, int poolIndex, int bufferIndex) {
|
{
|
||||||
void *resultAddr;
|
void *resultAddr;
|
||||||
int bufferSize, bufferNb;
|
int bufferSize, bufferNb;
|
||||||
int poolBufferTabFd;
|
int poolBufferTabFd;
|
||||||
|
|
@ -11,32 +11,30 @@ void * msgBufferMap(msgPoolData * poolDataTab, int poolIndex, int bufferIndex) {
|
||||||
strcpy(poolBufferTabId, poolDataTab[poolIndex].poolId);
|
strcpy(poolBufferTabId, poolDataTab[poolIndex].poolId);
|
||||||
bufferSize = poolDataTab[poolIndex].bufferSize;
|
bufferSize = poolDataTab[poolIndex].bufferSize;
|
||||||
bufferNb = poolDataTab[poolIndex].bufferNb;
|
bufferNb = poolDataTab[poolIndex].bufferNb;
|
||||||
|
if (bufferNb < 0) {
|
||||||
|
// do something with bufferNb
|
||||||
|
}
|
||||||
|
|
||||||
poolBufferTabFd = shm_open(poolBufferTabId, O_RDWR, SHM_DEFAULT_MODE);
|
poolBufferTabFd = shm_open(poolBufferTabId, O_RDWR, SHM_DEFAULT_MODE);
|
||||||
if (poolBufferTabFd < 0) {
|
if (poolBufferTabFd < 0) {
|
||||||
NZG_ERROR("shm_open", poolBufferTabId);
|
NZG_ERROR("shm_open", poolBufferTabId);
|
||||||
goto ERROR;
|
goto ERROR;
|
||||||
}
|
}
|
||||||
|
|
||||||
// mapper le buffer dans l'espace mémoire du processus
|
// mapper le buffer dans l'espace mémoire du processus
|
||||||
/* on s'arrete juste derriere l'index qui nous intéresse */
|
/* on s'arrete juste derriere l'index qui nous intéresse */
|
||||||
resultAddr=mmap(NULL,
|
resultAddr = mmap(NULL, bufferSize * (bufferIndex + 1), PROT_READ | PROT_WRITE, //PROT_NONE
|
||||||
bufferSize*(bufferIndex+1),
|
MAP_SHARED, poolBufferTabFd, (off_t) 0);
|
||||||
PROT_READ|PROT_WRITE, //PROT_NONE
|
|
||||||
MAP_SHARED,
|
|
||||||
poolBufferTabFd,
|
|
||||||
(off_t)0);
|
|
||||||
if (resultAddr == MAP_FAILED) {
|
if (resultAddr == MAP_FAILED) {
|
||||||
NZG_ERROR("mmap", poolBufferTabId);
|
NZG_ERROR("mmap", poolBufferTabId);
|
||||||
goto ERROR;
|
goto ERROR;
|
||||||
}
|
}
|
||||||
printf( "Mapped from 0x%08x to 0x%08x\n",
|
printf("Mapped from %p to %p\n",
|
||||||
(int)resultAddr,
|
(void *)resultAddr,
|
||||||
(int)resultAddr+ bufferSize*(bufferIndex+1)
|
(void *)(resultAddr + bufferSize * (bufferIndex + 1))
|
||||||
);
|
);
|
||||||
|
|
||||||
resultAddr = resultAddr + (bufferSize * bufferIndex);
|
resultAddr = resultAddr + (bufferSize * bufferIndex);
|
||||||
printf( "Moved to 0x%08x\n",(int)resultAddr );
|
printf("Moved to %p\n", (void *)resultAddr);
|
||||||
|
|
||||||
/* mprotect(
|
/* mprotect(
|
||||||
resultAddr,
|
resultAddr,
|
||||||
|
|
|
||||||
17
src/free.c
17
src/free.c
|
|
@ -1,6 +1,7 @@
|
||||||
#include "libnazgul.h"
|
#include "libnazgul.h"
|
||||||
|
|
||||||
int msgFree(msgSpace * space, void * addr){
|
int msgFree(msgSpace * space, void *addr)
|
||||||
|
{
|
||||||
|
|
||||||
int poolIndex;
|
int poolIndex;
|
||||||
int bufferIndex;
|
int bufferIndex;
|
||||||
|
|
@ -11,7 +12,7 @@ int msgFree(msgSpace * space, void * addr){
|
||||||
int bufferNb;
|
int bufferNb;
|
||||||
int bufferSize;
|
int bufferSize;
|
||||||
void *realAddr;
|
void *realAddr;
|
||||||
printf("[ FREE 0x%08x ]\n",(int)addr);
|
printf("[ FREE %p ]\n", (void *)addr);
|
||||||
/* on acquiert le droit de modifier les infos sur la ressource */
|
/* on acquiert le droit de modifier les infos sur la ressource */
|
||||||
/* on protege le tableau des associations */
|
/* on protege le tableau des associations */
|
||||||
if (msgPoolDataTabLock(space) < 0) {
|
if (msgPoolDataTabLock(space) < 0) {
|
||||||
|
|
@ -25,14 +26,11 @@ int msgFree(msgSpace * space, void * addr){
|
||||||
|
|
||||||
// TODO: verouiller semaphore DataInfo ??
|
// TODO: verouiller semaphore DataInfo ??
|
||||||
|
|
||||||
poolIndex=-1; bufferIndex=-1;
|
poolIndex = -1;
|
||||||
err=msgBufferGetProcAttach(
|
bufferIndex = -1;
|
||||||
poolDataTabAddr,
|
err = msgBufferGetProcAttach(poolDataTabAddr,
|
||||||
space->poolNb,
|
space->poolNb,
|
||||||
&poolIndex,
|
&poolIndex, &bufferIndex, addr);
|
||||||
&bufferIndex,
|
|
||||||
addr
|
|
||||||
);
|
|
||||||
|
|
||||||
printf("Found : %d\n", err);
|
printf("Found : %d\n", err);
|
||||||
printf("Freing pool: %d, buffer: %d\n", poolIndex, bufferIndex);
|
printf("Freing pool: %d, buffer: %d\n", poolIndex, bufferIndex);
|
||||||
|
|
@ -63,4 +61,3 @@ int msgFree(msgSpace * space, void * addr){
|
||||||
ERROR:
|
ERROR:
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,8 @@
|
||||||
|
|
||||||
#define NONBLOCK -1
|
#define NONBLOCK -1
|
||||||
|
|
||||||
void * msgGet(msgSpace * space,int queueIndex,int option){
|
void *msgGet(msgSpace * space, int queueIndex, int option)
|
||||||
|
{
|
||||||
void *resultAddr;
|
void *resultAddr;
|
||||||
msgQueueId queueId;
|
msgQueueId queueId;
|
||||||
msgQueue *queue;
|
msgQueue *queue;
|
||||||
|
|
@ -42,12 +43,12 @@ void * msgGet(msgSpace * space,int queueIndex,int option){
|
||||||
/* on récupere la taille des buffer dans la pool du buffer */
|
/* on récupere la taille des buffer dans la pool du buffer */
|
||||||
poolDataTab = msgPoolDataTabOpen(space);
|
poolDataTab = msgPoolDataTabOpen(space);
|
||||||
// mapper le buffer dans l'espace mémoire du processus
|
// mapper le buffer dans l'espace mémoire du processus
|
||||||
resultAddr=msgBufferMap(poolDataTab,oldElem->poolIndex,oldElem->bufferIndex);
|
resultAddr =
|
||||||
|
msgBufferMap(poolDataTab, oldElem->poolIndex, oldElem->bufferIndex);
|
||||||
// attacher au buffer...
|
// attacher au buffer...
|
||||||
if (msgBufferAttachProc(poolDataTab,
|
if (msgBufferAttachProc(poolDataTab,
|
||||||
oldElem->poolIndex,
|
oldElem->poolIndex,
|
||||||
oldElem->bufferIndex,
|
oldElem->bufferIndex, resultAddr) < 0) {
|
||||||
resultAddr) <0){
|
|
||||||
NZG_ERROR("msgBufferAttachProc", oldElemId);
|
NZG_ERROR("msgBufferAttachProc", oldElemId);
|
||||||
goto ERROR;
|
goto ERROR;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -25,12 +25,10 @@
|
||||||
#define SEM_FAILED ((sem_t *)0)
|
#define SEM_FAILED ((sem_t *)0)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
#ifndef MAP_FAILED
|
#ifndef MAP_FAILED
|
||||||
#define MAP_FAILED ((void *)-1)
|
#define MAP_FAILED ((void *)-1)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
#ifdef _NZG_REALFILEID
|
#ifdef _NZG_REALFILEID
|
||||||
#define DEFAULT_MSGSPACELISTID "/tmp/nzgSpaceList"
|
#define DEFAULT_MSGSPACELISTID "/tmp/nzgSpaceList"
|
||||||
#else
|
#else
|
||||||
|
|
|
||||||
48
src/global.h~
Normal file
48
src/global.h~
Normal file
|
|
@ -0,0 +1,48 @@
|
||||||
|
#ifndef _NZG_GLOBAL
|
||||||
|
#define _NZG_GLOBAL 1
|
||||||
|
|
||||||
|
#include <unistd.h> /* POSIX et al */
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <fcntl.h> /* pour O_RDWR */
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <sys/mman.h> /* shm_open */
|
||||||
|
#include <errno.h>
|
||||||
|
#include <semaphore.h>
|
||||||
|
|
||||||
|
#define PAGESIZE sysconf(_SC_PAGESIZE)
|
||||||
|
#define MSGSPACE_DEFAULT_MODE 0600
|
||||||
|
#define SEM_DEFAULT_MODE 0600
|
||||||
|
#define SHM_DEFAULT_MODE 0600
|
||||||
|
#define MSGSPACE_ID_LEN 32
|
||||||
|
#define ERR_UNHANDLED "Gérer mieu les erreurs"
|
||||||
|
|
||||||
|
#define ANYPOOL -1
|
||||||
|
#define SPECIFICPOOL 0
|
||||||
|
|
||||||
|
#ifndef SEM_FAILED
|
||||||
|
#define SEM_FAILED ((sem_t *)0)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
#ifndef MAP_FAILED
|
||||||
|
#define MAP_FAILED ((void *)-1)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
#ifdef _NZG_REALFILEID
|
||||||
|
#define DEFAULT_MSGSPACELISTID "/tmp/nzgSpaceList"
|
||||||
|
#else
|
||||||
|
#define DEFAULT_MSGSPACELISTID "/nzgSpaceList"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef _NZG_REALFILEID
|
||||||
|
#define DEFAULT_MSGSPACELISTSEMID "/tmp/nzgSpaceListSem"
|
||||||
|
#else
|
||||||
|
#define DEFAULT_MSGSPACELISTSEMID "/nzgSpaceListSem"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#define NZG_ERROR(func,str) fprintf(stderr,"*** %s: %s***\n%s in %s:%d\n",func,strerror(errno),str,__FILE__,__LINE__);
|
||||||
|
|
||||||
|
#endif
|
||||||
62
src/ids.c
62
src/ids.c
|
|
@ -1,7 +1,8 @@
|
||||||
#include "libnazgul.h"
|
#include "libnazgul.h"
|
||||||
#include "ids.h"
|
#include "ids.h"
|
||||||
|
|
||||||
int msgSpaceIdIntern(msgSpaceId dest,const msgSpaceId src ){
|
int msgSpaceIdIntern(msgSpaceId dest, const msgSpaceId src)
|
||||||
|
{
|
||||||
if (strlen(src) > MSGSPACE_ID_LEN) {
|
if (strlen(src) > MSGSPACE_ID_LEN) {
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
@ -13,9 +14,9 @@ int msgSpaceIdIntern(msgSpaceId dest,const msgSpaceId src ){
|
||||||
#endif
|
#endif
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
int msgPoolDataTabSemIdIntern(
|
|
||||||
msgPoolSemId destSemId,
|
int msgPoolDataTabSemIdIntern(msgPoolSemId destSemId, const msgSpaceId externId)
|
||||||
const msgSpaceId externId){
|
{
|
||||||
if (strlen(externId) > MSGSPACE_ID_LEN * 4) {
|
if (strlen(externId) > MSGSPACE_ID_LEN * 4) {
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
@ -27,10 +28,10 @@ int msgPoolDataTabSemIdIntern(
|
||||||
#endif
|
#endif
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
int msgPoolSemIdIntern(
|
|
||||||
msgPoolSemId destSemId,
|
int msgPoolSemIdIntern(msgPoolSemId destSemId,
|
||||||
const msgSpaceId srcPoolId,
|
const msgSpaceId srcPoolId, int poolIdx)
|
||||||
int poolIdx){
|
{
|
||||||
if (strlen(srcPoolId) > MSGSPACE_ID_LEN * 4) {
|
if (strlen(srcPoolId) > MSGSPACE_ID_LEN * 4) {
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
@ -43,7 +44,8 @@ int msgPoolSemIdIntern(
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int msgPoolDataIdIntern(msgPoolDataTabId dest,const msgSpaceId src ){
|
int msgPoolDataIdIntern(msgPoolDataTabId dest, const msgSpaceId src)
|
||||||
|
{
|
||||||
if (strlen(src) > MSGSPACE_ID_LEN) {
|
if (strlen(src) > MSGSPACE_ID_LEN) {
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
@ -56,8 +58,8 @@ int msgPoolDataIdIntern(msgPoolDataTabId dest,const msgSpaceId src ){
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int msgPoolIdIntern(msgPoolId dest, msgPoolId src, int num)
|
||||||
int msgPoolIdIntern(msgPoolId dest,msgPoolId src, int num){
|
{
|
||||||
if (strlen(src) > MSGSPACE_ID_LEN) {
|
if (strlen(src) > MSGSPACE_ID_LEN) {
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
@ -69,10 +71,8 @@ int msgPoolIdIntern(msgPoolId dest,msgPoolId src, int num){
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int msgBufferInfoTabIdIntern(
|
int msgBufferInfoTabIdIntern(msgBufferInfoTabId dest, msgSpaceId src, int num)
|
||||||
msgBufferInfoTabId dest,
|
{
|
||||||
msgSpaceId src,
|
|
||||||
int num){
|
|
||||||
if (strlen(src) > MSGSPACE_ID_LEN) {
|
if (strlen(src) > MSGSPACE_ID_LEN) {
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
@ -84,10 +84,9 @@ int msgBufferInfoTabIdIntern(
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int msgQueueProtSemIdIntern(
|
int msgQueueProtSemIdIntern(msgQueueSemId dest,
|
||||||
msgQueueSemId dest,
|
msgSpaceId externId, int queueIdx)
|
||||||
msgSpaceId externId,
|
{
|
||||||
int queueIdx){
|
|
||||||
if (strlen(externId) > MSGSPACE_ID_LEN) {
|
if (strlen(externId) > MSGSPACE_ID_LEN) {
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
@ -99,10 +98,9 @@ int msgQueueProtSemIdIntern(
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int msgQueueReadSemIdIntern(
|
int msgQueueReadSemIdIntern(msgQueueSemId dest,
|
||||||
msgQueueSemId dest,
|
msgSpaceId externId, int queueIdx)
|
||||||
msgSpaceId externId,
|
{
|
||||||
int queueIdx){
|
|
||||||
if (strlen(externId) > MSGSPACE_ID_LEN) {
|
if (strlen(externId) > MSGSPACE_ID_LEN) {
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
@ -114,10 +112,8 @@ int msgQueueReadSemIdIntern(
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int msgQueueIdIntern(
|
int msgQueueIdIntern(msgQueueId dest, msgSpaceId externId, int queueIdx)
|
||||||
msgQueueId dest,
|
{
|
||||||
msgSpaceId externId,
|
|
||||||
int queueIdx){
|
|
||||||
if (strlen(externId) > MSGSPACE_ID_LEN) {
|
if (strlen(externId) > MSGSPACE_ID_LEN) {
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
@ -129,10 +125,8 @@ int msgQueueIdIntern(
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int msgQueueElemIdIntern(
|
int msgQueueElemIdIntern(msgQueueElemId dest, msgQueueId src, int counter)
|
||||||
msgQueueElemId dest,
|
{
|
||||||
msgQueueId src,
|
|
||||||
int counter){
|
|
||||||
if (strlen(src) > MSGSPACE_ID_LEN) {
|
if (strlen(src) > MSGSPACE_ID_LEN) {
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
@ -140,7 +134,8 @@ int msgQueueElemIdIntern(
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int msgSpaceListElemIdIntern(msgSpaceListElemId elemListId,msgSpaceId externId){
|
int msgSpaceListElemIdIntern(msgSpaceListElemId elemListId, msgSpaceId externId)
|
||||||
|
{
|
||||||
if (strlen(externId) > MSGSPACE_ID_LEN) {
|
if (strlen(externId) > MSGSPACE_ID_LEN) {
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
@ -153,6 +148,3 @@ int msgSpaceListElemIdIntern(msgSpaceListElemId elemListId,msgSpaceId externId){
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
16
src/ids.h
16
src/ids.h
|
|
@ -2,21 +2,13 @@
|
||||||
#define _NZG_IDS 1
|
#define _NZG_IDS 1
|
||||||
#include "libnazgul.h"
|
#include "libnazgul.h"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/* nzg_ids.c */
|
/* nzg_ids.c */
|
||||||
int msgSpaceIdIntern(msgSpaceId dest, const msgSpaceId src);
|
int msgSpaceIdIntern(msgSpaceId dest, const msgSpaceId src);
|
||||||
int msgPoolSemIdIntern(msgPoolSemId destSemId, const msgSpaceId srcPoolId, int poolIdx);
|
int msgPoolSemIdIntern(msgPoolSemId destSemId, const msgSpaceId srcPoolId,
|
||||||
|
int poolIdx);
|
||||||
int msgPoolDataIdIntern(msgPoolDataTabId dest, const msgSpaceId src);
|
int msgPoolDataIdIntern(msgPoolDataTabId dest, const msgSpaceId src);
|
||||||
int msgPoolIdIntern(msgPoolId dest, msgPoolId src, int num);
|
int msgPoolIdIntern(msgPoolId dest, msgPoolId src, int num);
|
||||||
int msgQueueSemIdIntern(
|
int msgQueueSemIdIntern(msgQueueSemId dest, msgSpaceId externId, int queueIdx);
|
||||||
msgQueueSemId dest,
|
int msgQueueIdIntern(msgQueueId dest, msgSpaceId externId, int queueIdx);
|
||||||
msgSpaceId externId,
|
|
||||||
int queueIdx);
|
|
||||||
int msgQueueIdIntern(
|
|
||||||
msgQueueId dest,
|
|
||||||
msgSpaceId externId,
|
|
||||||
int queueIdx);
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
22
src/ids.h~
Normal file
22
src/ids.h~
Normal file
|
|
@ -0,0 +1,22 @@
|
||||||
|
#ifndef _NZG_IDS
|
||||||
|
#define _NZG_IDS 1
|
||||||
|
#include "libnazgul.h"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/* nzg_ids.c */
|
||||||
|
int msgSpaceIdIntern(msgSpaceId dest, const msgSpaceId src);
|
||||||
|
int msgPoolSemIdIntern(msgPoolSemId destSemId, const msgSpaceId srcPoolId, int poolIdx);
|
||||||
|
int msgPoolDataIdIntern(msgPoolDataTabId dest, const msgSpaceId src);
|
||||||
|
int msgPoolIdIntern(msgPoolId dest,msgPoolId src, int num);
|
||||||
|
int msgQueueSemIdIntern(
|
||||||
|
msgQueueSemId dest,
|
||||||
|
msgSpaceId externId,
|
||||||
|
int queueIdx);
|
||||||
|
int msgQueueIdIntern(
|
||||||
|
msgQueueId dest,
|
||||||
|
msgSpaceId externId,
|
||||||
|
int queueIdx);
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
@ -46,7 +46,6 @@ typedef struct MsgPoolData {
|
||||||
|
|
||||||
/* TODO: queueId */
|
/* TODO: queueId */
|
||||||
|
|
||||||
|
|
||||||
typedef struct MsgSpace {
|
typedef struct MsgSpace {
|
||||||
msgSpaceId id;
|
msgSpaceId id;
|
||||||
msgSpaceId externId;
|
msgSpaceId externId;
|
||||||
|
|
@ -57,7 +56,6 @@ typedef struct MsgSpace {
|
||||||
msgPoolDataTabSemId poolDataTabSemId;
|
msgPoolDataTabSemId poolDataTabSemId;
|
||||||
} msgSpace;
|
} msgSpace;
|
||||||
|
|
||||||
|
|
||||||
typedef struct MsgSpaceListElem {
|
typedef struct MsgSpaceListElem {
|
||||||
msgSpaceListElemId id;
|
msgSpaceListElemId id;
|
||||||
|
|
||||||
|
|
|
||||||
91
src/iface.h~
Normal file
91
src/iface.h~
Normal file
|
|
@ -0,0 +1,91 @@
|
||||||
|
#ifndef _NZG_IFACE
|
||||||
|
#define _NZG_IFACE 1
|
||||||
|
|
||||||
|
#include "global.h"
|
||||||
|
|
||||||
|
typedef enum { true=1, false=0} bool;
|
||||||
|
|
||||||
|
typedef char msgSpaceId[MSGSPACE_ID_LEN];
|
||||||
|
|
||||||
|
typedef char msgSpaceListId[4*MSGSPACE_ID_LEN];
|
||||||
|
typedef char msgSpaceListSemId[4*MSGSPACE_ID_LEN];
|
||||||
|
typedef char msgSpaceListElemId[4*MSGSPACE_ID_LEN];
|
||||||
|
|
||||||
|
typedef char msgPoolDataTabId[4*MSGSPACE_ID_LEN];
|
||||||
|
typedef char msgPoolDataTabSemId[4*MSGSPACE_ID_LEN];
|
||||||
|
|
||||||
|
typedef char msgBufferInfoTabId[4*MSGSPACE_ID_LEN];
|
||||||
|
|
||||||
|
typedef char msgPoolId[4*MSGSPACE_ID_LEN];
|
||||||
|
typedef char msgPoolSemId[4*MSGSPACE_ID_LEN];
|
||||||
|
|
||||||
|
typedef char msgQueueDataId[4*MSGSPACE_ID_LEN];
|
||||||
|
typedef char msgQueueId[4*MSGSPACE_ID_LEN];
|
||||||
|
typedef char msgQueueElemId[4*MSGSPACE_ID_LEN];
|
||||||
|
typedef char msgQueueSemId[4*MSGSPACE_ID_LEN];
|
||||||
|
|
||||||
|
/* pid[] */
|
||||||
|
/* liste des processus demandeurs */
|
||||||
|
typedef struct MsgPool {
|
||||||
|
int bufferSize;
|
||||||
|
int bufferNb;
|
||||||
|
} msgPool;
|
||||||
|
|
||||||
|
typedef struct MsgBufferInfo {
|
||||||
|
pid_t ownerPid;
|
||||||
|
void * addr;
|
||||||
|
} msgBufferInfo;
|
||||||
|
|
||||||
|
typedef struct MsgPoolData {
|
||||||
|
msgPoolId poolId;
|
||||||
|
msgBufferInfoTabId bufferInfoTabId;
|
||||||
|
int bufferNb;
|
||||||
|
int bufferSize;
|
||||||
|
int allocDispBuffer;
|
||||||
|
} msgPoolData;
|
||||||
|
|
||||||
|
/* TODO: queueId */
|
||||||
|
|
||||||
|
|
||||||
|
typedef struct MsgSpace {
|
||||||
|
msgSpaceId id;
|
||||||
|
msgSpaceId externId;
|
||||||
|
int poolNb;
|
||||||
|
int queueNb;
|
||||||
|
int pid;
|
||||||
|
msgPoolDataTabId poolDataTabId;
|
||||||
|
msgPoolDataTabSemId poolDataTabSemId;
|
||||||
|
} msgSpace;
|
||||||
|
|
||||||
|
|
||||||
|
typedef struct MsgSpaceListElem {
|
||||||
|
msgSpaceListElemId id;
|
||||||
|
|
||||||
|
msgSpaceId spaceId;
|
||||||
|
msgSpaceListElemId next;
|
||||||
|
} msgSpaceListElem;
|
||||||
|
|
||||||
|
typedef struct MsgSpaceList {
|
||||||
|
msgSpaceListId id;
|
||||||
|
|
||||||
|
int elemCounter;
|
||||||
|
msgSpaceListElemId headId;
|
||||||
|
msgSpaceListElemId tailId;
|
||||||
|
} msgSpaceList;
|
||||||
|
|
||||||
|
typedef struct MsgQueueElem {
|
||||||
|
msgQueueElemId id;
|
||||||
|
int poolIndex;
|
||||||
|
int bufferIndex;
|
||||||
|
msgQueueElemId next;
|
||||||
|
} msgQueueElem;
|
||||||
|
|
||||||
|
typedef struct MsgQueue {
|
||||||
|
msgQueueId id;
|
||||||
|
int elemCounter;
|
||||||
|
msgQueueElemId headId;
|
||||||
|
msgQueueElemId tailId;
|
||||||
|
} msgQueue;
|
||||||
|
|
||||||
|
#endif
|
||||||
|
/* */
|
||||||
8
src/libnazgul.h~
Normal file
8
src/libnazgul.h~
Normal file
|
|
@ -0,0 +1,8 @@
|
||||||
|
#ifndef _LIBNAZGUL
|
||||||
|
#define _LIBNAZGUL 1
|
||||||
|
|
||||||
|
#include "global.h"
|
||||||
|
#include "iface.h"
|
||||||
|
#include "proto.h"
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
@ -1,12 +1,8 @@
|
||||||
#include "libnazgul.h"
|
#include "libnazgul.h"
|
||||||
#include "ids.h"
|
#include "ids.h"
|
||||||
|
|
||||||
int msgPoolCreate(
|
int msgPoolCreate(msgSpaceId externId, int poolIdx, int buffNb, int buffSize)
|
||||||
msgSpaceId externId,
|
{
|
||||||
int poolIdx,
|
|
||||||
int buffNb,
|
|
||||||
int buffSize
|
|
||||||
) {
|
|
||||||
|
|
||||||
int poolFd;
|
int poolFd;
|
||||||
sem_t *ressourceSemFd;
|
sem_t *ressourceSemFd;
|
||||||
|
|
@ -15,10 +11,13 @@ int msgPoolCreate(
|
||||||
|
|
||||||
/* creation des buffers DEBUT */
|
/* creation des buffers DEBUT */
|
||||||
if (msgPoolIdIntern(poolId, externId, poolIdx) == -1) {
|
if (msgPoolIdIntern(poolId, externId, poolIdx) == -1) {
|
||||||
fprintf( stderr, "msgPoolId creation failed for id %s\n", (char*)poolId );
|
fprintf(stderr, "msgPoolId creation failed for id %s\n",
|
||||||
|
(char *)poolId);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
poolFd=shm_open(poolId,O_RDWR|O_CREAT|O_EXCL|O_TRUNC,MSGSPACE_DEFAULT_MODE);
|
poolFd =
|
||||||
|
shm_open(poolId, O_RDWR | O_CREAT | O_EXCL | O_TRUNC,
|
||||||
|
MSGSPACE_DEFAULT_MODE);
|
||||||
if (poolFd == -1) {
|
if (poolFd == -1) {
|
||||||
fprintf(stderr, "msgPool : %s creation failed: %s\n", poolId,
|
fprintf(stderr, "msgPool : %s creation failed: %s\n", poolId,
|
||||||
strerror(errno));
|
strerror(errno));
|
||||||
|
|
@ -36,14 +35,17 @@ int msgPoolCreate(
|
||||||
(char *)poolRessourceSemId);
|
(char *)poolRessourceSemId);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
// on met un semaphore sur le pool
|
// on met un semaphore sur le pool
|
||||||
ressourceSemFd = sem_open(poolRessourceSemId, O_CREAT|O_EXCL,SEM_DEFAULT_MODE, buffNb);
|
ressourceSemFd =
|
||||||
|
sem_open(poolRessourceSemId, O_CREAT | O_EXCL, SEM_DEFAULT_MODE,
|
||||||
|
buffNb);
|
||||||
if (ressourceSemFd == SEM_FAILED) {
|
if (ressourceSemFd == SEM_FAILED) {
|
||||||
NZG_ERROR("sem_open : creation de la ressource",poolRessourceSemId);
|
NZG_ERROR("sem_open : creation de la ressource",
|
||||||
|
poolRessourceSemId);
|
||||||
goto ERROR;
|
goto ERROR;
|
||||||
} else {
|
} else {
|
||||||
printf("[ Created %s with %d ressources ]\n",poolRessourceSemId,buffNb);
|
printf("[ Created %s with %d ressources ]\n",
|
||||||
|
poolRessourceSemId, buffNb);
|
||||||
}
|
}
|
||||||
|
|
||||||
//TODO: verrifier les erreurs sur l'ouverture de la sem
|
//TODO: verrifier les erreurs sur l'ouverture de la sem
|
||||||
|
|
@ -58,4 +60,3 @@ int msgPoolCreate(
|
||||||
ERROR:
|
ERROR:
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
#include "libnazgul.h"
|
#include "libnazgul.h"
|
||||||
|
|
||||||
int msgPoolDataTabClose(msgSpace * space,void * addr){
|
int msgPoolDataTabClose(msgSpace * space, void *addr)
|
||||||
|
{
|
||||||
/* unmapper le msgPoolDataTab */
|
/* unmapper le msgPoolDataTab */
|
||||||
|
|
||||||
if (munmap(addr, (space->poolNb) * sizeof(msgPoolData)) < 0) {
|
if (munmap(addr, (space->poolNb) * sizeof(msgPoolData)) < 0) {
|
||||||
|
|
|
||||||
|
|
@ -1,14 +1,13 @@
|
||||||
#include "libnazgul.h"
|
#include "libnazgul.h"
|
||||||
#include "ids.h"
|
#include "ids.h"
|
||||||
|
|
||||||
void * msgPoolDataTabCreate(msgSpace * space){
|
void *msgPoolDataTabCreate(msgSpace * space)
|
||||||
|
{
|
||||||
int poolDataFd; // shm file descriptor
|
int poolDataFd; // shm file descriptor
|
||||||
msgPoolData *poolDataTabAddr;
|
msgPoolData *poolDataTabAddr;
|
||||||
poolDataFd=shm_open(
|
poolDataFd = shm_open(space->poolDataTabId,
|
||||||
space->poolDataTabId,
|
|
||||||
O_RDWR | O_CREAT | O_EXCL | O_TRUNC,
|
O_RDWR | O_CREAT | O_EXCL | O_TRUNC,
|
||||||
MSGSPACE_DEFAULT_MODE
|
MSGSPACE_DEFAULT_MODE);
|
||||||
);
|
|
||||||
if (poolDataFd == -1) {
|
if (poolDataFd == -1) {
|
||||||
NZG_ERROR("shm_open :create", space->poolDataTabId);
|
NZG_ERROR("shm_open :create", space->poolDataTabId);
|
||||||
goto ERROR;
|
goto ERROR;
|
||||||
|
|
@ -38,5 +37,3 @@ void * msgPoolDataTabCreate(msgSpace * space){
|
||||||
ERROR:
|
ERROR:
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -3,17 +3,17 @@
|
||||||
|
|
||||||
#define DEBUG 0
|
#define DEBUG 0
|
||||||
|
|
||||||
int msgPoolDataTabLock(msgSpace * space){
|
int msgPoolDataTabLock(msgSpace * space)
|
||||||
|
{
|
||||||
int semval;
|
int semval;
|
||||||
sem_t *poolDataTabSemFd;
|
sem_t *poolDataTabSemFd;
|
||||||
semval = 0;
|
semval = 0;
|
||||||
if (DEBUG) {printf("Locking %s\n",space->poolDataTabSemId);}
|
if (DEBUG) {
|
||||||
|
printf("Locking %s\n", space->poolDataTabSemId);
|
||||||
|
}
|
||||||
|
|
||||||
poolDataTabSemFd=sem_open(
|
poolDataTabSemFd = sem_open(space->poolDataTabSemId, O_CREAT,
|
||||||
space->poolDataTabSemId
|
SEM_DEFAULT_MODE, 1);
|
||||||
,O_CREAT,
|
|
||||||
SEM_DEFAULT_MODE,
|
|
||||||
1);
|
|
||||||
if (poolDataTabSemFd == SEM_FAILED) {
|
if (poolDataTabSemFd == SEM_FAILED) {
|
||||||
NZG_ERROR("sem_open", space->poolDataTabSemId);
|
NZG_ERROR("sem_open", space->poolDataTabSemId);
|
||||||
goto ERROR;
|
goto ERROR;
|
||||||
|
|
@ -25,7 +25,9 @@ int msgPoolDataTabLock(msgSpace * space){
|
||||||
}
|
}
|
||||||
|
|
||||||
sem_getvalue(poolDataTabSemFd, &semval);
|
sem_getvalue(poolDataTabSemFd, &semval);
|
||||||
if (DEBUG) { printf("(AfternValue:%d)\n",semval);}
|
if (DEBUG) {
|
||||||
|
printf("(AfternValue:%d)\n", semval);
|
||||||
|
}
|
||||||
|
|
||||||
sem_close(poolDataTabSemFd);
|
sem_close(poolDataTabSemFd);
|
||||||
|
|
||||||
|
|
@ -33,4 +35,3 @@ int msgPoolDataTabLock(msgSpace * space){
|
||||||
ERROR:
|
ERROR:
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,19 +1,18 @@
|
||||||
#include "libnazgul.h"
|
#include "libnazgul.h"
|
||||||
#include "ids.h"
|
#include "ids.h"
|
||||||
|
|
||||||
void * msgPoolDataTabOpen(msgSpace * space){
|
void *msgPoolDataTabOpen(msgSpace * space)
|
||||||
|
{
|
||||||
int poolDataTabFd;
|
int poolDataTabFd;
|
||||||
void *poolDataTabAddr;
|
void *poolDataTabAddr;
|
||||||
|
|
||||||
poolDataTabFd = shm_open(space->poolDataTabId,
|
poolDataTabFd = shm_open(space->poolDataTabId,
|
||||||
O_RDWR,
|
O_RDWR, MSGSPACE_DEFAULT_MODE);
|
||||||
MSGSPACE_DEFAULT_MODE);
|
|
||||||
if (poolDataTabFd == -1) {
|
if (poolDataTabFd == -1) {
|
||||||
NZG_ERROR("shm_open", space->poolDataTabId);
|
NZG_ERROR("shm_open", space->poolDataTabId);
|
||||||
goto ERROR;
|
goto ERROR;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
poolDataTabAddr = mmap(NULL, (space->poolNb) * sizeof(msgPoolData),
|
poolDataTabAddr = mmap(NULL, (space->poolNb) * sizeof(msgPoolData),
|
||||||
PROT_READ | PROT_WRITE,
|
PROT_READ | PROT_WRITE,
|
||||||
MAP_SHARED, poolDataTabFd, 0);
|
MAP_SHARED, poolDataTabFd, 0);
|
||||||
|
|
|
||||||
|
|
@ -3,15 +3,15 @@
|
||||||
|
|
||||||
#define DEBUG 0
|
#define DEBUG 0
|
||||||
|
|
||||||
int msgPoolDataTabUnlock(msgSpace * space){
|
int msgPoolDataTabUnlock(msgSpace * space)
|
||||||
|
{
|
||||||
int semval;
|
int semval;
|
||||||
sem_t *poolDataTabSemFd;
|
sem_t *poolDataTabSemFd;
|
||||||
if (DEBUG) { printf("Unlocking %s\n",space->poolDataTabSemId); }
|
if (DEBUG) {
|
||||||
poolDataTabSemFd=sem_open(
|
printf("Unlocking %s\n", space->poolDataTabSemId);
|
||||||
space->poolDataTabSemId
|
}
|
||||||
,O_CREAT,
|
poolDataTabSemFd = sem_open(space->poolDataTabSemId, O_CREAT,
|
||||||
SEM_DEFAULT_MODE,
|
SEM_DEFAULT_MODE, 1);
|
||||||
1);
|
|
||||||
if (poolDataTabSemFd == SEM_FAILED) {
|
if (poolDataTabSemFd == SEM_FAILED) {
|
||||||
NZG_ERROR("sem_open", space->poolDataTabSemId);
|
NZG_ERROR("sem_open", space->poolDataTabSemId);
|
||||||
goto ERROR;
|
goto ERROR;
|
||||||
|
|
@ -24,7 +24,9 @@ int msgPoolDataTabUnlock(msgSpace * space){
|
||||||
|
|
||||||
semval = 0;
|
semval = 0;
|
||||||
sem_getvalue(poolDataTabSemFd, &semval);
|
sem_getvalue(poolDataTabSemFd, &semval);
|
||||||
if (DEBUG) { printf("(AfternValue:%d)\n",semval); }
|
if (DEBUG) {
|
||||||
|
printf("(AfternValue:%d)\n", semval);
|
||||||
|
}
|
||||||
|
|
||||||
sem_close(poolDataTabSemFd);
|
sem_close(poolDataTabSemFd);
|
||||||
|
|
||||||
|
|
@ -32,4 +34,3 @@ int msgPoolDataTabUnlock(msgSpace * space){
|
||||||
ERROR:
|
ERROR:
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,32 +1,31 @@
|
||||||
#include "libnazgul.h"
|
#include "libnazgul.h"
|
||||||
#include "ids.h"
|
#include "ids.h"
|
||||||
|
|
||||||
int msgPoolDelete(
|
int msgPoolDelete(msgSpaceId spaceId, int poolIdx)
|
||||||
msgSpaceId spaceId,
|
{
|
||||||
int poolIdx
|
|
||||||
) {
|
|
||||||
|
|
||||||
msgPoolId poolId;
|
msgPoolId poolId;
|
||||||
msgBufferInfoTabId bufferInfoTabId;
|
msgBufferInfoTabId bufferInfoTabId;
|
||||||
msgPoolSemId poolRessourceSemId;
|
msgPoolSemId poolRessourceSemId;
|
||||||
|
|
||||||
|
|
||||||
/* suppression des infos sur buffers DEBUT */
|
/* suppression des infos sur buffers DEBUT */
|
||||||
if (msgBufferInfoTabIdIntern(bufferInfoTabId, spaceId, poolIdx) == -1) {
|
if (msgBufferInfoTabIdIntern(bufferInfoTabId, spaceId, poolIdx) == -1) {
|
||||||
fprintf( stderr, "msgPoolId creation failed for id %s\n", (char*)poolId );
|
fprintf(stderr, "msgPoolId creation failed for id %s\n",
|
||||||
|
(char *)poolId);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (shm_unlink(bufferInfoTabId) < 0) {
|
if (shm_unlink(bufferInfoTabId) < 0) {
|
||||||
fprintf( stderr, "msgInfoTab : %s deletion failed: %s\n",bufferInfoTabId,
|
fprintf(stderr, "msgInfoTab : %s deletion failed: %s\n",
|
||||||
strerror( errno ) );
|
bufferInfoTabId, strerror(errno));
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
/* suppression des infos sur buffers FIN */
|
/* suppression des infos sur buffers FIN */
|
||||||
|
|
||||||
/* suppression des buffers DEBUT */
|
/* suppression des buffers DEBUT */
|
||||||
if (msgPoolIdIntern(poolId, spaceId, poolIdx) == -1) {
|
if (msgPoolIdIntern(poolId, spaceId, poolIdx) == -1) {
|
||||||
fprintf( stderr, "msgPoolId creation failed for id %s\n", (char*)poolId );
|
fprintf(stderr, "msgPoolId creation failed for id %s\n",
|
||||||
|
(char *)poolId);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
if (shm_unlink(poolId) < 0) {
|
if (shm_unlink(poolId) < 0) {
|
||||||
|
|
|
||||||
36
src/proto.h
36
src/proto.h
|
|
@ -4,17 +4,22 @@
|
||||||
/* allocate.c */
|
/* allocate.c */
|
||||||
void *msgAllocate(msgSpace * space, int pool, int taille, int option);
|
void *msgAllocate(msgSpace * space, int pool, int taille, int option);
|
||||||
/* bufferAttachProc.c */
|
/* bufferAttachProc.c */
|
||||||
int msgBufferAttachProc(msgPoolData *poolDataTabAddr, int poolIndex, int bufferIndex, void *addr);
|
int msgBufferAttachProc(msgPoolData * poolDataTabAddr, int poolIndex,
|
||||||
|
int bufferIndex, void *addr);
|
||||||
/* buffer.c */
|
/* buffer.c */
|
||||||
int msgBufferGetAttachedProcIndex(msgPoolData *poolDataTabAddr, int poolIndex, void *addr);
|
int msgBufferGetAttachedProcIndex(msgPoolData * poolDataTabAddr, int poolIndex,
|
||||||
|
void *addr);
|
||||||
/* bufferDetachProc.c */
|
/* bufferDetachProc.c */
|
||||||
int msgBufferDetachProc(msgPoolData *poolDataTabAddr, int poolIndex, int bufferIndex, void *addr);
|
int msgBufferDetachProc(msgPoolData * poolDataTabAddr, int poolIndex,
|
||||||
|
int bufferIndex, void *addr);
|
||||||
/* bufferGetFreeIndex.c */
|
/* bufferGetFreeIndex.c */
|
||||||
int msgBufferGetFreeIndex(msgPoolData * poolDataTabAddr, int poolIndex);
|
int msgBufferGetFreeIndex(msgPoolData * poolDataTabAddr, int poolIndex);
|
||||||
/* bufferGetProcAttach.c */
|
/* bufferGetProcAttach.c */
|
||||||
int msgBufferGetProcAttach(msgPoolData *poolDataTabAddr, int poolNb, int *poolIndex, int *bufferIndex, void *addr);
|
int msgBufferGetProcAttach(msgPoolData * poolDataTabAddr, int poolNb,
|
||||||
|
int *poolIndex, int *bufferIndex, void *addr);
|
||||||
/* bufferInfoTabCreate.c */
|
/* bufferInfoTabCreate.c */
|
||||||
int msgBufferInfoTabCreate(msgSpaceId externId, msgPoolData *poolDataTabAddr, int poolIdx, int bufferNb);
|
int msgBufferInfoTabCreate(msgSpaceId externId, msgPoolData * poolDataTabAddr,
|
||||||
|
int poolIdx, int bufferNb);
|
||||||
/* bufferInfoTabInit.c */
|
/* bufferInfoTabInit.c */
|
||||||
int msgBufferInfoTabInit(msgPoolData * poolDataTabAddr, int poolIndex);
|
int msgBufferInfoTabInit(msgPoolData * poolDataTabAddr, int poolIndex);
|
||||||
/* bufferMap.c */
|
/* bufferMap.c */
|
||||||
|
|
@ -25,16 +30,21 @@ int msgFree(msgSpace *space, void *addr);
|
||||||
void *msgGet(msgSpace * space, int queueIndex, int option);
|
void *msgGet(msgSpace * space, int queueIndex, int option);
|
||||||
/* ids.c */
|
/* ids.c */
|
||||||
int msgSpaceIdIntern(msgSpaceId dest, const msgSpaceId src);
|
int msgSpaceIdIntern(msgSpaceId dest, const msgSpaceId src);
|
||||||
int msgPoolDataTabSemIdIntern(msgPoolSemId destSemId, const msgSpaceId externId);
|
int msgPoolDataTabSemIdIntern(msgPoolSemId destSemId,
|
||||||
int msgPoolSemIdIntern(msgPoolSemId destSemId, const msgSpaceId srcPoolId, int poolIdx);
|
const msgSpaceId externId);
|
||||||
|
int msgPoolSemIdIntern(msgPoolSemId destSemId, const msgSpaceId srcPoolId,
|
||||||
|
int poolIdx);
|
||||||
int msgPoolDataIdIntern(msgPoolDataTabId dest, const msgSpaceId src);
|
int msgPoolDataIdIntern(msgPoolDataTabId dest, const msgSpaceId src);
|
||||||
int msgPoolIdIntern(msgPoolId dest, msgPoolId src, int num);
|
int msgPoolIdIntern(msgPoolId dest, msgPoolId src, int num);
|
||||||
int msgBufferInfoTabIdIntern(msgBufferInfoTabId dest, msgSpaceId src, int num);
|
int msgBufferInfoTabIdIntern(msgBufferInfoTabId dest, msgSpaceId src, int num);
|
||||||
int msgQueueProtSemIdIntern(msgQueueSemId dest, msgSpaceId externId, int queueIdx);
|
int msgQueueProtSemIdIntern(msgQueueSemId dest, msgSpaceId externId,
|
||||||
int msgQueueReadSemIdIntern(msgQueueSemId dest, msgSpaceId externId, int queueIdx);
|
int queueIdx);
|
||||||
|
int msgQueueReadSemIdIntern(msgQueueSemId dest, msgSpaceId externId,
|
||||||
|
int queueIdx);
|
||||||
int msgQueueIdIntern(msgQueueId dest, msgSpaceId externId, int queueIdx);
|
int msgQueueIdIntern(msgQueueId dest, msgSpaceId externId, int queueIdx);
|
||||||
int msgQueueElemIdIntern(msgQueueElemId dest, msgQueueId src, int counter);
|
int msgQueueElemIdIntern(msgQueueElemId dest, msgQueueId src, int counter);
|
||||||
int msgSpaceListElemIdIntern(msgSpaceListElemId elemListId, msgSpaceId externId);
|
int msgSpaceListElemIdIntern(msgSpaceListElemId elemListId,
|
||||||
|
msgSpaceId externId);
|
||||||
/* list.c */
|
/* list.c */
|
||||||
/* poolCreate.c */
|
/* poolCreate.c */
|
||||||
int msgPoolCreate(msgSpaceId externId, int poolIdx, int buffNb, int buffSize);
|
int msgPoolCreate(msgSpaceId externId, int poolIdx, int buffNb, int buffSize);
|
||||||
|
|
@ -61,7 +71,8 @@ int msgQueueDelete(msgQueueId externId, int queueIdx);
|
||||||
/* queueElemClose.c */
|
/* queueElemClose.c */
|
||||||
int msgQueueElemClose(msgQueueElem * queueElem);
|
int msgQueueElemClose(msgQueueElem * queueElem);
|
||||||
/* queueElemCreate.c */
|
/* queueElemCreate.c */
|
||||||
int msgQueueElemCreate(msgQueueElemId finalQueueElemId, msgQueueId queueId, int counter);
|
int msgQueueElemCreate(msgQueueElemId finalQueueElemId, msgQueueId queueId,
|
||||||
|
int counter);
|
||||||
/* queueElemDelete.c */
|
/* queueElemDelete.c */
|
||||||
int msgQueueElemDelete(msgQueueElemId queueElemId);
|
int msgQueueElemDelete(msgQueueElemId queueElemId);
|
||||||
/* queueElemOpen.c */
|
/* queueElemOpen.c */
|
||||||
|
|
@ -85,7 +96,8 @@ int msgQueueRem(msgQueue *queue, msgQueueElemId oldElemId);
|
||||||
/* spaceClose.c */
|
/* spaceClose.c */
|
||||||
int msgSpaceClose(msgSpace * space);
|
int msgSpaceClose(msgSpace * space);
|
||||||
/* spaceCreate.c */
|
/* spaceCreate.c */
|
||||||
msgSpace *msgSpaceCreate(msgSpaceId externId, int queueNb, int poolNb, msgPool *poolInfos);
|
msgSpace *msgSpaceCreate(msgSpaceId externId, int queueNb, int poolNb,
|
||||||
|
msgPool * poolInfos);
|
||||||
/* spaceDelete.c */
|
/* spaceDelete.c */
|
||||||
int msgSpaceDelete(msgSpaceId externId);
|
int msgSpaceDelete(msgSpaceId externId);
|
||||||
/* spaceListAdd.c */
|
/* spaceListAdd.c */
|
||||||
|
|
|
||||||
118
src/proto.h~
Normal file
118
src/proto.h~
Normal file
|
|
@ -0,0 +1,118 @@
|
||||||
|
#ifndef _NZG_PROTO
|
||||||
|
#define _NZG_PROTO 1
|
||||||
|
|
||||||
|
/* allocate.c */
|
||||||
|
void *msgAllocate(msgSpace *space, int pool, int taille, int option);
|
||||||
|
/* bufferAttachProc.c */
|
||||||
|
int msgBufferAttachProc(msgPoolData *poolDataTabAddr, int poolIndex, int bufferIndex, void *addr);
|
||||||
|
/* buffer.c */
|
||||||
|
int msgBufferGetAttachedProcIndex(msgPoolData *poolDataTabAddr, int poolIndex, void *addr);
|
||||||
|
/* bufferDetachProc.c */
|
||||||
|
int msgBufferDetachProc(msgPoolData *poolDataTabAddr, int poolIndex, int bufferIndex, void *addr);
|
||||||
|
/* bufferGetFreeIndex.c */
|
||||||
|
int msgBufferGetFreeIndex(msgPoolData *poolDataTabAddr, int poolIndex);
|
||||||
|
/* bufferGetProcAttach.c */
|
||||||
|
int msgBufferGetProcAttach(msgPoolData *poolDataTabAddr, int poolNb, int *poolIndex, int *bufferIndex, void *addr);
|
||||||
|
/* bufferInfoTabCreate.c */
|
||||||
|
int msgBufferInfoTabCreate(msgSpaceId externId, msgPoolData *poolDataTabAddr, int poolIdx, int bufferNb);
|
||||||
|
/* bufferInfoTabInit.c */
|
||||||
|
int msgBufferInfoTabInit(msgPoolData *poolDataTabAddr, int poolIndex);
|
||||||
|
/* bufferMap.c */
|
||||||
|
void *msgBufferMap(msgPoolData *poolDataTab, int poolIndex, int bufferIndex);
|
||||||
|
/* free.c */
|
||||||
|
int msgFree(msgSpace *space, void *addr);
|
||||||
|
/* get.c */
|
||||||
|
void *msgGet(msgSpace *space, int queueIndex, int option);
|
||||||
|
/* ids.c */
|
||||||
|
int msgSpaceIdIntern(msgSpaceId dest, const msgSpaceId src);
|
||||||
|
int msgPoolDataTabSemIdIntern(msgPoolSemId destSemId, const msgSpaceId externId);
|
||||||
|
int msgPoolSemIdIntern(msgPoolSemId destSemId, const msgSpaceId srcPoolId, int poolIdx);
|
||||||
|
int msgPoolDataIdIntern(msgPoolDataTabId dest, const msgSpaceId src);
|
||||||
|
int msgPoolIdIntern(msgPoolId dest, msgPoolId src, int num);
|
||||||
|
int msgBufferInfoTabIdIntern(msgBufferInfoTabId dest, msgSpaceId src, int num);
|
||||||
|
int msgQueueProtSemIdIntern(msgQueueSemId dest, msgSpaceId externId, int queueIdx);
|
||||||
|
int msgQueueReadSemIdIntern(msgQueueSemId dest, msgSpaceId externId, int queueIdx);
|
||||||
|
int msgQueueIdIntern(msgQueueId dest, msgSpaceId externId, int queueIdx);
|
||||||
|
int msgQueueElemIdIntern(msgQueueElemId dest, msgQueueId src, int counter);
|
||||||
|
int msgSpaceListElemIdIntern(msgSpaceListElemId elemListId, msgSpaceId externId);
|
||||||
|
/* list.c */
|
||||||
|
/* poolCreate.c */
|
||||||
|
int msgPoolCreate(msgSpaceId externId, int poolIdx, int buffNb, int buffSize);
|
||||||
|
/* poolDataTabClose.c */
|
||||||
|
int msgPoolDataTabClose(msgSpace *space, void *addr);
|
||||||
|
/* poolDataTabCreate.c */
|
||||||
|
void *msgPoolDataTabCreate(msgSpace *space);
|
||||||
|
/* poolDataTabLock.c */
|
||||||
|
int msgPoolDataTabLock(msgSpace *space);
|
||||||
|
/* poolDataTabOpen.c */
|
||||||
|
void *msgPoolDataTabOpen(msgSpace *space);
|
||||||
|
/* poolDataTabUnlock.c */
|
||||||
|
int msgPoolDataTabUnlock(msgSpace *space);
|
||||||
|
/* poolDelete.c */
|
||||||
|
int msgPoolDelete(msgSpaceId spaceId, int poolIdx);
|
||||||
|
/* put.c */
|
||||||
|
int msgPut(msgSpace *space, int queueIndex, void *addr);
|
||||||
|
/* queueAdd.c */
|
||||||
|
int msgQueueAdd(msgQueue *queue, msgQueueElemId newElemId);
|
||||||
|
/* queueClose.c */
|
||||||
|
int msgQueueClose(msgQueue *queue);
|
||||||
|
/* queueDelete.c */
|
||||||
|
int msgQueueDelete(msgQueueId externId, int queueIdx);
|
||||||
|
/* queueElemClose.c */
|
||||||
|
int msgQueueElemClose(msgQueueElem *queueElem);
|
||||||
|
/* queueElemCreate.c */
|
||||||
|
int msgQueueElemCreate(msgQueueElemId finalQueueElemId, msgQueueId queueId, int counter);
|
||||||
|
/* queueElemDelete.c */
|
||||||
|
int msgQueueElemDelete(msgQueueElemId queueElemId);
|
||||||
|
/* queueElemOpen.c */
|
||||||
|
void *msgQueueElemOpen(msgQueueElemId queueElemId);
|
||||||
|
/* queueInit.c */
|
||||||
|
msgQueue *msgQueueInit(msgSpaceId externId, int queueIdx);
|
||||||
|
/* queueOpen.c */
|
||||||
|
void *msgQueueOpen(msgQueueId queueId);
|
||||||
|
/* queueProtLock.c */
|
||||||
|
int msgQueueProtLock(msgSpaceId externId, int queueIdx);
|
||||||
|
/* queueProtUnlock.c */
|
||||||
|
int msgQueueProtUnlock(msgSpaceId externId, int queueIdx);
|
||||||
|
/* queueReadLock.c */
|
||||||
|
int msgQueueReadLock(msgSpaceId externId, int queueIdx);
|
||||||
|
/* queueReadTryLock.c */
|
||||||
|
int msgQueueReadTryLock(msgSpaceId externId, int queueIdx);
|
||||||
|
/* queueReadUnlock.c */
|
||||||
|
int msgQueueReadUnlock(msgSpaceId externId, int queueIdx);
|
||||||
|
/* queueRem.c */
|
||||||
|
int msgQueueRem(msgQueue *queue, msgQueueElemId oldElemId);
|
||||||
|
/* spaceClose.c */
|
||||||
|
int msgSpaceClose(msgSpace *space);
|
||||||
|
/* spaceCreate.c */
|
||||||
|
msgSpace *msgSpaceCreate(msgSpaceId externId, int queueNb, int poolNb, msgPool *poolInfos);
|
||||||
|
/* spaceDelete.c */
|
||||||
|
int msgSpaceDelete(msgSpaceId externId);
|
||||||
|
/* spaceListAdd.c */
|
||||||
|
int msgSpaceListAdd(msgSpaceListElemId newElemId);
|
||||||
|
/* spaceListClose.c */
|
||||||
|
int msgSpaceListClose(msgSpaceList *list);
|
||||||
|
/* spaceListElemClose.c */
|
||||||
|
int msgSpaceListElemClose(msgSpaceListElem *listElem);
|
||||||
|
/* spaceListElemCreate.c */
|
||||||
|
int msgSpaceListElemCreate(msgSpaceListElemId listElemId, msgSpace *space);
|
||||||
|
/* spaceListElemLink.c */
|
||||||
|
/* spaceListElemOpen.c */
|
||||||
|
void *msgSpaceListElemOpen(msgSpaceListElemId listElemId);
|
||||||
|
/* spaceListFindId.c */
|
||||||
|
int msgSpaceListFindId(msgSpaceId externId);
|
||||||
|
int msgSpaceListElemFindId(msgSpaceListElemId elemId, msgSpaceId spaceId);
|
||||||
|
/* spaceListInit.c */
|
||||||
|
int msgSpaceListInit(void);
|
||||||
|
/* spaceListLocking.c */
|
||||||
|
int msgSpaceListLock(void);
|
||||||
|
int msgSpaceListUnlock(void);
|
||||||
|
/* spaceListOpen.c */
|
||||||
|
void *msgSpaceListOpen(void);
|
||||||
|
/* spaceListRem.c */
|
||||||
|
int msgSpaceListRem(msgSpaceId spaceId);
|
||||||
|
/* spaceOpen.c */
|
||||||
|
msgSpace *msgSpaceOpen(msgSpaceId externId);
|
||||||
|
/* spaceState.c */
|
||||||
|
|
||||||
|
#endif
|
||||||
20
src/put.c
20
src/put.c
|
|
@ -1,6 +1,7 @@
|
||||||
#include "libnazgul.h"
|
#include "libnazgul.h"
|
||||||
|
|
||||||
int msgPut(msgSpace * space,int queueIndex, void * addr){
|
int msgPut(msgSpace * space, int queueIndex, void *addr)
|
||||||
|
{
|
||||||
// retrouver le pool, buffer qui correspondent à l'addresse...
|
// retrouver le pool, buffer qui correspondent à l'addresse...
|
||||||
msgPoolData *poolDataTabAddr;
|
msgPoolData *poolDataTabAddr;
|
||||||
int poolIndex;
|
int poolIndex;
|
||||||
|
|
@ -17,14 +18,12 @@ int msgPut(msgSpace * space,int queueIndex, void * addr){
|
||||||
NZG_ERROR("msgPoolDataTabOpen", space->poolDataTabId);
|
NZG_ERROR("msgPoolDataTabOpen", space->poolDataTabId);
|
||||||
goto ERROR;
|
goto ERROR;
|
||||||
}
|
}
|
||||||
err=msgBufferGetProcAttach(
|
err = msgBufferGetProcAttach(poolDataTabAddr,
|
||||||
poolDataTabAddr,
|
|
||||||
space->poolNb,
|
space->poolNb,
|
||||||
&poolIndex,
|
&poolIndex, &bufferIndex, addr);
|
||||||
&bufferIndex,
|
if (err) {
|
||||||
addr
|
//FIXME
|
||||||
);
|
}
|
||||||
|
|
||||||
// ouvrir la queue avec le bon index
|
// ouvrir la queue avec le bon index
|
||||||
msgQueueIdIntern(queueId, space->externId, queueIndex);
|
msgQueueIdIntern(queueId, space->externId, queueIndex);
|
||||||
|
|
||||||
|
|
@ -46,13 +45,11 @@ int msgPut(msgSpace * space,int queueIndex, void * addr){
|
||||||
NZG_ERROR("msgQueueElemClose", "");
|
NZG_ERROR("msgQueueElemClose", "");
|
||||||
goto ERROR;
|
goto ERROR;
|
||||||
}
|
}
|
||||||
|
|
||||||
//ajouter le message a la bonne file...
|
//ajouter le message a la bonne file...
|
||||||
if (msgQueueAdd(queue, newElemId) < 0) {
|
if (msgQueueAdd(queue, newElemId) < 0) {
|
||||||
NZG_ERROR("msgQueueAdd", newElemId);
|
NZG_ERROR("msgQueueAdd", newElemId);
|
||||||
goto ERROR;
|
goto ERROR;
|
||||||
}
|
}
|
||||||
|
|
||||||
// fermer la file
|
// fermer la file
|
||||||
msgQueueClose(queue);
|
msgQueueClose(queue);
|
||||||
msgQueueProtUnlock(space->externId, queueIndex);
|
msgQueueProtUnlock(space->externId, queueIndex);
|
||||||
|
|
@ -63,8 +60,7 @@ int msgPut(msgSpace * space,int queueIndex, void * addr){
|
||||||
// on laisse une nouvelle ressource de la liste au get
|
// on laisse une nouvelle ressource de la liste au get
|
||||||
msgQueueReadUnlock(space->externId, queueIndex);
|
msgQueueReadUnlock(space->externId, queueIndex);
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
ERROR:
|
ERROR:
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,8 @@
|
||||||
|
|
||||||
// on ajoute en fin de queue...
|
// on ajoute en fin de queue...
|
||||||
|
|
||||||
int msgQueueAdd(msgQueue * queue, msgQueueElemId newElemId){
|
int msgQueueAdd(msgQueue * queue, msgQueueElemId newElemId)
|
||||||
|
{
|
||||||
msgQueueElem *queueOldTailElem;
|
msgQueueElem *queueOldTailElem;
|
||||||
msgQueueElem *queueNewTailElem;
|
msgQueueElem *queueNewTailElem;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,8 @@
|
||||||
#include "libnazgul.h"
|
#include "libnazgul.h"
|
||||||
#include "ids.h"
|
#include "ids.h"
|
||||||
|
|
||||||
int msgQueueClose(msgQueue * queue){
|
int msgQueueClose(msgQueue * queue)
|
||||||
|
{
|
||||||
msgQueueId qId;
|
msgQueueId qId;
|
||||||
strcpy(qId, queue->id);
|
strcpy(qId, queue->id);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
#include "libnazgul.h"
|
#include "libnazgul.h"
|
||||||
|
|
||||||
int msgQueueDelete(msgQueueId externId,int queueIdx){
|
int msgQueueDelete(msgQueueId externId, int queueIdx)
|
||||||
|
{
|
||||||
msgQueue *queue;
|
msgQueue *queue;
|
||||||
msgQueueId queueId;
|
msgQueueId queueId;
|
||||||
msgQueueSemId queueProtLockSemId;
|
msgQueueSemId queueProtLockSemId;
|
||||||
|
|
@ -31,5 +32,3 @@ int msgQueueDelete(msgQueueId externId,int queueIdx){
|
||||||
ERROR:
|
ERROR:
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
#include "libnazgul.h"
|
#include "libnazgul.h"
|
||||||
|
|
||||||
int msgQueueElemClose(msgQueueElem * queueElem){
|
int msgQueueElemClose(msgQueueElem * queueElem)
|
||||||
|
{
|
||||||
msgQueueElemId qId;
|
msgQueueElemId qId;
|
||||||
strcpy(qId, queueElem->id);
|
strcpy(qId, queueElem->id);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,9 @@
|
||||||
#include "libnazgul.h"
|
#include "libnazgul.h"
|
||||||
#include "ids.h"
|
#include "ids.h"
|
||||||
|
|
||||||
int msgQueueElemCreate(
|
int msgQueueElemCreate(msgQueueElemId finalQueueElemId,
|
||||||
msgQueueElemId finalQueueElemId ,
|
msgQueueId queueId, int counter)
|
||||||
msgQueueId queueId,
|
{
|
||||||
int counter){
|
|
||||||
msgQueueElemId queueElemId;
|
msgQueueElemId queueElemId;
|
||||||
int queueElemFd;
|
int queueElemFd;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
#include "libnazgul.h"
|
#include "libnazgul.h"
|
||||||
|
|
||||||
int msgQueueElemDelete(msgQueueElemId queueElemId){
|
int msgQueueElemDelete(msgQueueElemId queueElemId)
|
||||||
|
{
|
||||||
msgQueueElem *queueElem;
|
msgQueueElem *queueElem;
|
||||||
msgQueueElemId nextIdToDie;
|
msgQueueElemId nextIdToDie;
|
||||||
|
|
||||||
|
|
@ -16,7 +17,6 @@ int msgQueueElemDelete(msgQueueElemId queueElemId){
|
||||||
NZG_ERROR("msgQueueElemClose", queueElemId);
|
NZG_ERROR("msgQueueElemClose", queueElemId);
|
||||||
goto ERROR;
|
goto ERROR;
|
||||||
}
|
}
|
||||||
|
|
||||||
// on détruit l'élément
|
// on détruit l'élément
|
||||||
shm_unlink(queueElemId);
|
shm_unlink(queueElemId);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,8 @@
|
||||||
#include "libnazgul.h"
|
#include "libnazgul.h"
|
||||||
#include "ids.h"
|
#include "ids.h"
|
||||||
|
|
||||||
void * msgQueueElemOpen(msgQueueElemId queueElemId){
|
void *msgQueueElemOpen(msgQueueElemId queueElemId)
|
||||||
|
{
|
||||||
int queueElemFd;
|
int queueElemFd;
|
||||||
void *queueElemAddr;
|
void *queueElemAddr;
|
||||||
|
|
||||||
|
|
@ -14,9 +15,7 @@ void * msgQueueElemOpen(msgQueueElemId queueElemId){
|
||||||
queueElemAddr = mmap(NULL,
|
queueElemAddr = mmap(NULL,
|
||||||
sizeof(msgQueueElem),
|
sizeof(msgQueueElem),
|
||||||
PROT_READ | PROT_WRITE,
|
PROT_READ | PROT_WRITE,
|
||||||
MAP_SHARED,
|
MAP_SHARED, queueElemFd, 0);
|
||||||
queueElemFd,
|
|
||||||
0);
|
|
||||||
if (queueElemAddr == MAP_FAILED) {
|
if (queueElemAddr == MAP_FAILED) {
|
||||||
NZG_ERROR("mmap", queueElemId);
|
NZG_ERROR("mmap", queueElemId);
|
||||||
goto ERROR;
|
goto ERROR;
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,8 @@
|
||||||
#include "libnazgul.h"
|
#include "libnazgul.h"
|
||||||
#include "ids.h"
|
#include "ids.h"
|
||||||
|
|
||||||
msgQueue * msgQueueInit(msgSpaceId externId, int queueIdx) {
|
msgQueue *msgQueueInit(msgSpaceId externId, int queueIdx)
|
||||||
|
{
|
||||||
int queueFd;
|
int queueFd;
|
||||||
msgQueue *queue;
|
msgQueue *queue;
|
||||||
sem_t *semProtectFd;
|
sem_t *semProtectFd;
|
||||||
|
|
@ -12,7 +13,6 @@ msgQueue * msgQueueInit(msgSpaceId externId, int queueIdx) {
|
||||||
|
|
||||||
queue = NULL;
|
queue = NULL;
|
||||||
|
|
||||||
|
|
||||||
msgQueueProtSemIdIntern(queueSemProtectId, externId, queueIdx);
|
msgQueueProtSemIdIntern(queueSemProtectId, externId, queueIdx);
|
||||||
msgQueueReadSemIdIntern(queueSemReadableId, externId, queueIdx);
|
msgQueueReadSemIdIntern(queueSemReadableId, externId, queueIdx);
|
||||||
|
|
||||||
|
|
@ -23,7 +23,6 @@ msgQueue * msgQueueInit(msgSpaceId externId, int queueIdx) {
|
||||||
NZG_ERROR("sem_open", queueSemReadableId);
|
NZG_ERROR("sem_open", queueSemReadableId);
|
||||||
goto ERROR;
|
goto ERROR;
|
||||||
}
|
}
|
||||||
|
|
||||||
// creation du semaphore de protection
|
// creation du semaphore de protection
|
||||||
semProtectFd = sem_open(queueSemProtectId,
|
semProtectFd = sem_open(queueSemProtectId,
|
||||||
O_CREAT | O_EXCL, SEM_DEFAULT_MODE, 0);
|
O_CREAT | O_EXCL, SEM_DEFAULT_MODE, 0);
|
||||||
|
|
@ -41,15 +40,16 @@ msgQueue * msgQueueInit(msgSpaceId externId, int queueIdx) {
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
queueFd = shm_open(queueId, O_RDWR|O_CREAT|O_EXCL|O_TRUNC, MSGSPACE_DEFAULT_MODE);
|
queueFd =
|
||||||
|
shm_open(queueId, O_RDWR | O_CREAT | O_EXCL | O_TRUNC,
|
||||||
|
MSGSPACE_DEFAULT_MODE);
|
||||||
if (queueFd == -1) {
|
if (queueFd == -1) {
|
||||||
NZG_ERROR("shm_open : queueInit", queueId);
|
NZG_ERROR("shm_open : queueInit", queueId);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ftruncate(queueFd, sizeof(msgQueue)) == -1) {
|
if (ftruncate(queueFd, sizeof(msgQueue)) == -1) {
|
||||||
fprintf( stderr, "Queue resizing failed: %s\n",
|
fprintf(stderr, "Queue resizing failed: %s\n", strerror(errno));
|
||||||
strerror( errno ) );
|
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,8 @@
|
||||||
#include "libnazgul.h"
|
#include "libnazgul.h"
|
||||||
#include "ids.h"
|
#include "ids.h"
|
||||||
|
|
||||||
void * msgQueueOpen(msgQueueId queueId){
|
void *msgQueueOpen(msgQueueId queueId)
|
||||||
|
{
|
||||||
int queueFd;
|
int queueFd;
|
||||||
void *queueAddr;
|
void *queueAddr;
|
||||||
|
|
||||||
|
|
@ -13,10 +14,7 @@ void * msgQueueOpen(msgQueueId queueId){
|
||||||
|
|
||||||
queueAddr = mmap(NULL,
|
queueAddr = mmap(NULL,
|
||||||
sizeof(msgQueue),
|
sizeof(msgQueue),
|
||||||
PROT_READ|PROT_WRITE,
|
PROT_READ | PROT_WRITE, MAP_SHARED, queueFd, 0);
|
||||||
MAP_SHARED,
|
|
||||||
queueFd,
|
|
||||||
0);
|
|
||||||
if (queueAddr == MAP_FAILED) {
|
if (queueAddr == MAP_FAILED) {
|
||||||
NZG_ERROR("mmap", queueId);
|
NZG_ERROR("mmap", queueId);
|
||||||
goto ERROR;
|
goto ERROR;
|
||||||
|
|
|
||||||
|
|
@ -2,13 +2,16 @@
|
||||||
#include "ids.h"
|
#include "ids.h"
|
||||||
|
|
||||||
#define DEBUG 0
|
#define DEBUG 0
|
||||||
int msgQueueProtLock(msgSpaceId externId,int queueIdx){
|
int msgQueueProtLock(msgSpaceId externId, int queueIdx)
|
||||||
|
{
|
||||||
int semval;
|
int semval;
|
||||||
sem_t *queueSemFd;
|
sem_t *queueSemFd;
|
||||||
msgQueueSemId queueSemId;
|
msgQueueSemId queueSemId;
|
||||||
|
|
||||||
msgQueueProtSemIdIntern(queueSemId, externId, queueIdx);
|
msgQueueProtSemIdIntern(queueSemId, externId, queueIdx);
|
||||||
if (DEBUG) { printf("Locking %s\n",queueSemId);}
|
if (DEBUG) {
|
||||||
|
printf("Locking %s\n", queueSemId);
|
||||||
|
}
|
||||||
queueSemFd = sem_open(queueSemId, O_CREAT, SEM_DEFAULT_MODE, 1);
|
queueSemFd = sem_open(queueSemId, O_CREAT, SEM_DEFAULT_MODE, 1);
|
||||||
if (queueSemFd == SEM_FAILED) {
|
if (queueSemFd == SEM_FAILED) {
|
||||||
NZG_ERROR("sem_open", queueSemId);
|
NZG_ERROR("sem_open", queueSemId);
|
||||||
|
|
@ -21,7 +24,9 @@ int msgQueueProtLock(msgSpaceId externId,int queueIdx){
|
||||||
}
|
}
|
||||||
semval = 0;
|
semval = 0;
|
||||||
sem_getvalue(queueSemFd, &semval);
|
sem_getvalue(queueSemFd, &semval);
|
||||||
if (DEBUG) { printf("(AfterValue:%d)\n",semval); }
|
if (DEBUG) {
|
||||||
|
printf("(AfterValue:%d)\n", semval);
|
||||||
|
}
|
||||||
|
|
||||||
sem_close(queueSemFd);
|
sem_close(queueSemFd);
|
||||||
sem_close(queueSemFd);
|
sem_close(queueSemFd);
|
||||||
|
|
@ -30,4 +35,3 @@ int msgQueueProtLock(msgSpaceId externId,int queueIdx){
|
||||||
ERROR:
|
ERROR:
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -3,13 +3,16 @@
|
||||||
|
|
||||||
#define DEBUG 0
|
#define DEBUG 0
|
||||||
|
|
||||||
int msgQueueProtUnlock(msgSpaceId externId,int queueIdx){
|
int msgQueueProtUnlock(msgSpaceId externId, int queueIdx)
|
||||||
|
{
|
||||||
int semval;
|
int semval;
|
||||||
sem_t *queueSemFd;
|
sem_t *queueSemFd;
|
||||||
msgQueueSemId queueSemId;
|
msgQueueSemId queueSemId;
|
||||||
|
|
||||||
msgQueueProtSemIdIntern(queueSemId, externId, queueIdx);
|
msgQueueProtSemIdIntern(queueSemId, externId, queueIdx);
|
||||||
if (DEBUG) { printf("Unlocking %s\n",queueSemId); }
|
if (DEBUG) {
|
||||||
|
printf("Unlocking %s\n", queueSemId);
|
||||||
|
}
|
||||||
|
|
||||||
queueSemFd = sem_open(queueSemId, O_CREAT, SEM_DEFAULT_MODE, 1);
|
queueSemFd = sem_open(queueSemId, O_CREAT, SEM_DEFAULT_MODE, 1);
|
||||||
if (queueSemFd == SEM_FAILED) {
|
if (queueSemFd == SEM_FAILED) {
|
||||||
|
|
@ -23,7 +26,9 @@ int msgQueueProtUnlock(msgSpaceId externId,int queueIdx){
|
||||||
}
|
}
|
||||||
semval = 0;
|
semval = 0;
|
||||||
sem_getvalue(queueSemFd, &semval);
|
sem_getvalue(queueSemFd, &semval);
|
||||||
if (DEBUG) { printf("(AfterValue:%d)\n",semval); }
|
if (DEBUG) {
|
||||||
|
printf("(AfterValue:%d)\n", semval);
|
||||||
|
}
|
||||||
|
|
||||||
sem_close(queueSemFd);
|
sem_close(queueSemFd);
|
||||||
|
|
||||||
|
|
@ -31,4 +36,3 @@ int msgQueueProtUnlock(msgSpaceId externId,int queueIdx){
|
||||||
ERROR:
|
ERROR:
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -3,13 +3,16 @@
|
||||||
|
|
||||||
#define DEBUG 0
|
#define DEBUG 0
|
||||||
|
|
||||||
int msgQueueReadLock(msgSpaceId externId,int queueIdx){
|
int msgQueueReadLock(msgSpaceId externId, int queueIdx)
|
||||||
|
{
|
||||||
int semval;
|
int semval;
|
||||||
sem_t *queueSemFd;
|
sem_t *queueSemFd;
|
||||||
msgQueueSemId queueSemId;
|
msgQueueSemId queueSemId;
|
||||||
|
|
||||||
msgQueueReadSemIdIntern(queueSemId, externId, queueIdx);
|
msgQueueReadSemIdIntern(queueSemId, externId, queueIdx);
|
||||||
if (DEBUG) { printf("Locking %s\n",queueSemId); }
|
if (DEBUG) {
|
||||||
|
printf("Locking %s\n", queueSemId);
|
||||||
|
}
|
||||||
queueSemFd = sem_open(queueSemId, O_CREAT, SEM_DEFAULT_MODE, 1);
|
queueSemFd = sem_open(queueSemId, O_CREAT, SEM_DEFAULT_MODE, 1);
|
||||||
if (queueSemFd == SEM_FAILED) {
|
if (queueSemFd == SEM_FAILED) {
|
||||||
NZG_ERROR("sem_open", queueSemId);
|
NZG_ERROR("sem_open", queueSemId);
|
||||||
|
|
@ -22,7 +25,9 @@ int msgQueueReadLock(msgSpaceId externId,int queueIdx){
|
||||||
}
|
}
|
||||||
semval = 0;
|
semval = 0;
|
||||||
sem_getvalue(queueSemFd, &semval);
|
sem_getvalue(queueSemFd, &semval);
|
||||||
if (DEBUG) { printf("(AfterValue:%d)\n",semval); }
|
if (DEBUG) {
|
||||||
|
printf("(AfterValue:%d)\n", semval);
|
||||||
|
}
|
||||||
|
|
||||||
sem_close(queueSemFd);
|
sem_close(queueSemFd);
|
||||||
|
|
||||||
|
|
@ -30,4 +35,3 @@ int msgQueueReadLock(msgSpaceId externId,int queueIdx){
|
||||||
ERROR:
|
ERROR:
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,8 @@
|
||||||
|
|
||||||
#define DEBUG 0
|
#define DEBUG 0
|
||||||
|
|
||||||
int msgQueueReadTryLock(msgSpaceId externId,int queueIdx){
|
int msgQueueReadTryLock(msgSpaceId externId, int queueIdx)
|
||||||
|
{
|
||||||
int semval;
|
int semval;
|
||||||
sem_t *queueSemFd;
|
sem_t *queueSemFd;
|
||||||
msgQueueSemId queueSemId;
|
msgQueueSemId queueSemId;
|
||||||
|
|
@ -19,10 +20,14 @@ int msgQueueReadTryLock(msgSpaceId externId,int queueIdx){
|
||||||
NZG_ERROR("sem_wait", queueSemId);
|
NZG_ERROR("sem_wait", queueSemId);
|
||||||
goto ERROR;
|
goto ERROR;
|
||||||
}
|
}
|
||||||
if (DEBUG) { printf("Locking %s\n",queueSemId); }
|
if (DEBUG) {
|
||||||
|
printf("Locking %s\n", queueSemId);
|
||||||
|
}
|
||||||
semval = 0;
|
semval = 0;
|
||||||
sem_getvalue(queueSemFd, &semval);
|
sem_getvalue(queueSemFd, &semval);
|
||||||
if (DEBUG) { printf("(AfterValue:%d)\n",semval); }
|
if (DEBUG) {
|
||||||
|
printf("(AfterValue:%d)\n", semval);
|
||||||
|
}
|
||||||
|
|
||||||
sem_close(queueSemFd);
|
sem_close(queueSemFd);
|
||||||
|
|
||||||
|
|
@ -30,4 +35,3 @@ int msgQueueReadTryLock(msgSpaceId externId,int queueIdx){
|
||||||
ERROR:
|
ERROR:
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -3,13 +3,16 @@
|
||||||
|
|
||||||
#define DEBUG 0
|
#define DEBUG 0
|
||||||
|
|
||||||
int msgQueueReadUnlock(msgSpaceId externId,int queueIdx){
|
int msgQueueReadUnlock(msgSpaceId externId, int queueIdx)
|
||||||
|
{
|
||||||
int semval;
|
int semval;
|
||||||
sem_t *queueSemFd;
|
sem_t *queueSemFd;
|
||||||
msgQueueSemId queueSemId;
|
msgQueueSemId queueSemId;
|
||||||
|
|
||||||
msgQueueReadSemIdIntern(queueSemId, externId, queueIdx);
|
msgQueueReadSemIdIntern(queueSemId, externId, queueIdx);
|
||||||
if (DEBUG) { printf("Unlocking %s\n",queueSemId); }
|
if (DEBUG) {
|
||||||
|
printf("Unlocking %s\n", queueSemId);
|
||||||
|
}
|
||||||
queueSemFd = sem_open(queueSemId, O_CREAT, SEM_DEFAULT_MODE, 1);
|
queueSemFd = sem_open(queueSemId, O_CREAT, SEM_DEFAULT_MODE, 1);
|
||||||
if (queueSemFd == SEM_FAILED) {
|
if (queueSemFd == SEM_FAILED) {
|
||||||
NZG_ERROR("sem_open", queueSemId);
|
NZG_ERROR("sem_open", queueSemId);
|
||||||
|
|
@ -22,8 +25,9 @@ int msgQueueReadUnlock(msgSpaceId externId,int queueIdx){
|
||||||
}
|
}
|
||||||
semval = 0;
|
semval = 0;
|
||||||
sem_getvalue(queueSemFd, &semval);
|
sem_getvalue(queueSemFd, &semval);
|
||||||
if (DEBUG) { printf("(AfterValue:%d)\n",semval); }
|
if (DEBUG) {
|
||||||
|
printf("(AfterValue:%d)\n", semval);
|
||||||
|
}
|
||||||
|
|
||||||
sem_close(queueSemFd);
|
sem_close(queueSemFd);
|
||||||
|
|
||||||
|
|
@ -31,4 +35,3 @@ int msgQueueReadUnlock(msgSpaceId externId,int queueIdx){
|
||||||
ERROR:
|
ERROR:
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,10 +2,10 @@
|
||||||
|
|
||||||
// l'id de l'element enlevé vas dans oldElemId
|
// l'id de l'element enlevé vas dans oldElemId
|
||||||
|
|
||||||
int msgQueueRem(msgQueue * queue, msgQueueElemId oldElemId){
|
int msgQueueRem(msgQueue * queue, msgQueueElemId oldElemId)
|
||||||
|
{
|
||||||
msgQueueElem *queueOldHeadElem;
|
msgQueueElem *queueOldHeadElem;
|
||||||
|
|
||||||
|
|
||||||
if (strcmp(queue->headId, queue->id) == 0) {
|
if (strcmp(queue->headId, queue->id) == 0) {
|
||||||
NZG_ERROR("msgQueueElemRem : Empty queue", queue->id);
|
NZG_ERROR("msgQueueElemRem : Empty queue", queue->id);
|
||||||
goto ERROR;
|
goto ERROR;
|
||||||
|
|
@ -17,7 +17,6 @@ int msgQueueRem(msgQueue * queue, msgQueueElemId oldElemId){
|
||||||
NZG_ERROR("msgQueueElemOpen", oldElemId);
|
NZG_ERROR("msgQueueElemOpen", oldElemId);
|
||||||
goto ERROR;
|
goto ERROR;
|
||||||
}
|
}
|
||||||
|
|
||||||
// on indique à la queue le nouveau premier element
|
// on indique à la queue le nouveau premier element
|
||||||
strcpy(queue->headId, queueOldHeadElem->next);
|
strcpy(queue->headId, queueOldHeadElem->next);
|
||||||
if (strcmp(queueOldHeadElem->next, oldElemId) == 0) {
|
if (strcmp(queueOldHeadElem->next, oldElemId) == 0) {
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
#include "libnazgul.h"
|
#include "libnazgul.h"
|
||||||
|
|
||||||
int msgSpaceClose(msgSpace * space){
|
int msgSpaceClose(msgSpace * space)
|
||||||
|
{
|
||||||
msgSpaceId spaceId;
|
msgSpaceId spaceId;
|
||||||
strcpy(spaceId, space->id);
|
strcpy(spaceId, space->id);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -4,8 +4,8 @@
|
||||||
/* prototypes des fonctions annexes à ne pas exporter */
|
/* prototypes des fonctions annexes à ne pas exporter */
|
||||||
int msgSpaceIdIntern(msgSpaceId dest, const msgSpaceId src);
|
int msgSpaceIdIntern(msgSpaceId dest, const msgSpaceId src);
|
||||||
int msgPoolDataIdIntern(msgSpaceId dest, const msgSpaceId src);
|
int msgPoolDataIdIntern(msgSpaceId dest, const msgSpaceId src);
|
||||||
int msgPoolDataTabSemIdIntern(
|
int msgPoolDataTabSemIdIntern(msgPoolSemId destSemId,
|
||||||
msgPoolSemId destSemId,const msgSpaceId externId);
|
const msgSpaceId externId);
|
||||||
/*
|
/*
|
||||||
* spaceId : identifiant externe de l'espace de msg
|
* spaceId : identifiant externe de l'espace de msg
|
||||||
* queueNb : nombre de files de messages
|
* queueNb : nombre de files de messages
|
||||||
|
|
@ -13,11 +13,9 @@ int msgPoolDataTabSemIdIntern(
|
||||||
* queueNbCar : tableau de caracteristiques des different pool
|
* queueNbCar : tableau de caracteristiques des different pool
|
||||||
*/
|
*/
|
||||||
|
|
||||||
msgSpace * msgSpaceCreate(
|
msgSpace *msgSpaceCreate(msgSpaceId externId,
|
||||||
msgSpaceId externId,
|
int queueNb, int poolNb, msgPool * poolInfos)
|
||||||
int queueNb,
|
{
|
||||||
int poolNb,
|
|
||||||
msgPool * poolInfos ){
|
|
||||||
msgSpaceId nzgId;
|
msgSpaceId nzgId;
|
||||||
/* msgSpaceList mSList; */
|
/* msgSpaceList mSList; */
|
||||||
int mSFd; // shm file descriptor
|
int mSFd; // shm file descriptor
|
||||||
|
|
@ -72,11 +70,9 @@ msgSpace * msgSpaceCreate(
|
||||||
printf("spaceListUnlock ok\n");
|
printf("spaceListUnlock ok\n");
|
||||||
|
|
||||||
fprintf(stderr, "Creating msgSpace with id : %s\n", nzgId);
|
fprintf(stderr, "Creating msgSpace with id : %s\n", nzgId);
|
||||||
mSFd=shm_open(
|
mSFd = shm_open(nzgId,
|
||||||
nzgId,
|
|
||||||
O_RDWR | O_CREAT | O_EXCL | O_TRUNC,
|
O_RDWR | O_CREAT | O_EXCL | O_TRUNC,
|
||||||
MSGSPACE_DEFAULT_MODE
|
MSGSPACE_DEFAULT_MODE);
|
||||||
);
|
|
||||||
if (mSFd == -1) {
|
if (mSFd == -1) {
|
||||||
NZG_ERROR("shm_open : msgSpace creation", nzgId);
|
NZG_ERROR("shm_open : msgSpace creation", nzgId);
|
||||||
goto ERROR;
|
goto ERROR;
|
||||||
|
|
@ -90,14 +86,14 @@ msgSpace * msgSpaceCreate(
|
||||||
|
|
||||||
/* Map the memory object */
|
/* Map the memory object */
|
||||||
space = mmap(0, sizeof(*space),
|
space = mmap(0, sizeof(*space),
|
||||||
PROT_READ | PROT_WRITE,
|
PROT_READ | PROT_WRITE, MAP_SHARED, mSFd, 0);
|
||||||
MAP_SHARED, mSFd, 0 );
|
|
||||||
if (space == MAP_FAILED) {
|
if (space == MAP_FAILED) {
|
||||||
NZG_ERROR("mmap", nzgId);
|
NZG_ERROR("mmap", nzgId);
|
||||||
goto ERROR;
|
goto ERROR;
|
||||||
}
|
}
|
||||||
|
|
||||||
printf( "CREAT: msgSpace mapped to 0x%08x in %d\n", (int)space,(int)getpid());
|
printf("CREAT: msgSpace mapped to 0x%08lx in %d\n", (long)space,
|
||||||
|
(int)getpid());
|
||||||
|
|
||||||
/* on ferme le descripteur du fichier */
|
/* on ferme le descripteur du fichier */
|
||||||
close(mSFd);
|
close(mSFd);
|
||||||
|
|
@ -142,14 +138,18 @@ msgSpace * msgSpaceCreate(
|
||||||
poolDataTabAddr[i].bufferSize = poolInfos[i].bufferSize;
|
poolDataTabAddr[i].bufferSize = poolInfos[i].bufferSize;
|
||||||
poolDataTabAddr[i].allocDispBuffer = 0;
|
poolDataTabAddr[i].allocDispBuffer = 0;
|
||||||
|
|
||||||
if (msgBufferInfoTabIdIntern(bufferInfoTabId,externId,i) == -1){
|
if (msgBufferInfoTabIdIntern(bufferInfoTabId, externId, i) ==
|
||||||
fprintf( stderr, "msgBufferInfoTabId creation failed for id %s\n",
|
-1) {
|
||||||
|
fprintf(stderr,
|
||||||
|
"msgBufferInfoTabId creation failed for id %s\n",
|
||||||
(char *)poolId);
|
(char *)poolId);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
strcpy(poolDataTabAddr[i].bufferInfoTabId, bufferInfoTabId);
|
strcpy(poolDataTabAddr[i].bufferInfoTabId, bufferInfoTabId);
|
||||||
printf("buffIfoTab %d name : %s\n",i,poolDataTabAddr[i].bufferInfoTabId);
|
printf("buffIfoTab %d name : %s\n", i,
|
||||||
msgBufferInfoTabCreate(externId,poolDataTabAddr,i,poolInfos[i].bufferNb);
|
poolDataTabAddr[i].bufferInfoTabId);
|
||||||
|
msgBufferInfoTabCreate(externId, poolDataTabAddr, i,
|
||||||
|
poolInfos[i].bufferNb);
|
||||||
|
|
||||||
if (msgPoolIdIntern(poolId, externId, i) == -1) {
|
if (msgPoolIdIntern(poolId, externId, i) == -1) {
|
||||||
fprintf(stderr, "msgPoolId creation failed for id %s\n",
|
fprintf(stderr, "msgPoolId creation failed for id %s\n",
|
||||||
|
|
@ -157,17 +157,20 @@ msgSpace * msgSpaceCreate(
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
strcpy(poolDataTabAddr[i].poolId, poolId);
|
strcpy(poolDataTabAddr[i].poolId, poolId);
|
||||||
msgPoolCreate(externId,i,poolInfos[i].bufferNb,poolInfos[i].bufferSize);
|
msgPoolCreate(externId, i, poolInfos[i].bufferNb,
|
||||||
|
poolInfos[i].bufferSize);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* on crée queueNb files de messages */
|
/* on crée queueNb files de messages */
|
||||||
printf("Creating queues:\n");
|
printf("Creating queues:\n");
|
||||||
for (i = 0; i < queueNb; i++) {
|
for (i = 0; i < queueNb; i++) {
|
||||||
printf("- queue %i...",i); fflush(stdout);
|
printf("- queue %i...", i);
|
||||||
|
fflush(stdout);
|
||||||
if (msgQueueInit(space->externId, i) < 0) {
|
if (msgQueueInit(space->externId, i) < 0) {
|
||||||
printf("fail.\n");
|
printf("fail.\n");
|
||||||
NZG_ERROR("msgQueueInit : queue ?? for",space->externId);
|
NZG_ERROR("msgQueueInit : queue ?? for",
|
||||||
|
space->externId);
|
||||||
goto ERROR;
|
goto ERROR;
|
||||||
}
|
}
|
||||||
printf("ok.\n");
|
printf("ok.\n");
|
||||||
|
|
@ -192,6 +195,3 @@ msgSpace * msgSpaceCreate(
|
||||||
ERROR:
|
ERROR:
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -4,10 +4,11 @@
|
||||||
/* prototypes des fonctions annexes à ne pas exporter */
|
/* prototypes des fonctions annexes à ne pas exporter */
|
||||||
int msgSpaceIdIntern(msgSpaceId dest, const msgSpaceId src);
|
int msgSpaceIdIntern(msgSpaceId dest, const msgSpaceId src);
|
||||||
int msgPoolDataIdIntern(msgSpaceId dest, const msgSpaceId src);
|
int msgPoolDataIdIntern(msgSpaceId dest, const msgSpaceId src);
|
||||||
int msgPoolDataTabSemIdIntern(
|
int msgPoolDataTabSemIdIntern(msgPoolSemId destSemId,
|
||||||
msgPoolSemId destSemId,const msgSpaceId externId);
|
const msgSpaceId externId);
|
||||||
|
|
||||||
int msgSpaceDelete(msgSpaceId externId){
|
int msgSpaceDelete(msgSpaceId externId)
|
||||||
|
{
|
||||||
//int shmId;
|
//int shmId;
|
||||||
msgSpaceId nzgId;
|
msgSpaceId nzgId;
|
||||||
msgSpace *space;
|
msgSpace *space;
|
||||||
|
|
@ -64,4 +65,3 @@ int msgSpaceDelete(msgSpaceId externId){
|
||||||
ERROR:
|
ERROR:
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,8 @@
|
||||||
// ajoute un element en début de liste.
|
// ajoute un element en début de liste.
|
||||||
// fait pointer l'ancien dernier vers lui
|
// fait pointer l'ancien dernier vers lui
|
||||||
// il s'enregistre en tant que dernier chez la liste
|
// il s'enregistre en tant que dernier chez la liste
|
||||||
int msgSpaceListAdd(msgSpaceListElemId newElemId){
|
int msgSpaceListAdd(msgSpaceListElemId newElemId)
|
||||||
|
{
|
||||||
msgSpaceListElem *listOldTailElem;
|
msgSpaceListElem *listOldTailElem;
|
||||||
msgSpaceListElem *listNewTailElem;
|
msgSpaceListElem *listNewTailElem;
|
||||||
msgSpaceList *list;
|
msgSpaceList *list;
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,8 @@
|
||||||
#include "libnazgul.h"
|
#include "libnazgul.h"
|
||||||
#include "ids.h"
|
#include "ids.h"
|
||||||
|
|
||||||
int msgSpaceListClose(msgSpaceList * list){
|
int msgSpaceListClose(msgSpaceList * list)
|
||||||
|
{
|
||||||
|
|
||||||
msgSpaceListId spaceListId;
|
msgSpaceListId spaceListId;
|
||||||
strcpy(spaceListId, DEFAULT_MSGSPACELISTID);
|
strcpy(spaceListId, DEFAULT_MSGSPACELISTID);
|
||||||
|
|
|
||||||
|
|
@ -2,9 +2,7 @@
|
||||||
#include "ids.h"
|
#include "ids.h"
|
||||||
|
|
||||||
// cree un nouvel elemen
|
// cree un nouvel elemen
|
||||||
int msgSpaceListElemCreate(
|
int msgSpaceListElemCreate(msgSpaceListElemId listElemId, msgSpace * space)
|
||||||
msgSpaceListElemId listElemId,
|
|
||||||
msgSpace * space)
|
|
||||||
{
|
{
|
||||||
|
|
||||||
int listElemFd;
|
int listElemFd;
|
||||||
|
|
@ -35,9 +33,7 @@ int msgSpaceListElemCreate(
|
||||||
strcpy(listElem->next, listElemId);
|
strcpy(listElem->next, listElemId);
|
||||||
strcpy(listElem->spaceId, space->id);
|
strcpy(listElem->spaceId, space->id);
|
||||||
printf("[ ListElem : id %s,next: %s, Sid: %s ]\n",
|
printf("[ ListElem : id %s,next: %s, Sid: %s ]\n",
|
||||||
listElem->id,
|
listElem->id, listElem->next, listElem->spaceId);
|
||||||
listElem->next,
|
|
||||||
listElem->spaceId);
|
|
||||||
if (msgSpaceListElemClose(listElem) < 0) {
|
if (msgSpaceListElemClose(listElem) < 0) {
|
||||||
NZG_ERROR("msgSpaceListElemClose", listElemId);
|
NZG_ERROR("msgSpaceListElemClose", listElemId);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,5 @@
|
||||||
|
|
||||||
// modifie l'element suivant de l'element choisi
|
// modifie l'element suivant de l'element choisi
|
||||||
// et le fait pointer sur un nouvel ID
|
// et le fait pointer sur un nouvel ID
|
||||||
int msgSpaceListElemLinkNext(msgSpaceListElemId current,msgSpaceListElemId next);
|
int msgSpaceListElemLinkNext(msgSpaceListElemId current,
|
||||||
|
msgSpaceListElemId next);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,8 @@
|
||||||
#include "ids.h"
|
#include "ids.h"
|
||||||
|
|
||||||
// cree un nouvel elemen
|
// cree un nouvel elemen
|
||||||
void * msgSpaceListElemOpen(msgSpaceListElemId listElemId){
|
void *msgSpaceListElemOpen(msgSpaceListElemId listElemId)
|
||||||
|
{
|
||||||
int listElemFd;
|
int listElemFd;
|
||||||
void *listElemAddr;
|
void *listElemAddr;
|
||||||
|
|
||||||
|
|
@ -14,10 +15,7 @@ void * msgSpaceListElemOpen(msgSpaceListElemId listElemId){
|
||||||
|
|
||||||
listElemAddr = mmap(NULL,
|
listElemAddr = mmap(NULL,
|
||||||
sizeof(msgQueueElem),
|
sizeof(msgQueueElem),
|
||||||
PROT_READ|PROT_WRITE,
|
PROT_READ | PROT_WRITE, MAP_SHARED, listElemFd, 0);
|
||||||
MAP_SHARED,
|
|
||||||
listElemFd,
|
|
||||||
0);
|
|
||||||
|
|
||||||
if (listElemAddr == MAP_FAILED) {
|
if (listElemAddr == MAP_FAILED) {
|
||||||
NZG_ERROR("mmap", listElemId);
|
NZG_ERROR("mmap", listElemId);
|
||||||
|
|
@ -29,5 +27,4 @@ void * msgSpaceListElemOpen(msgSpaceListElemId listElemId){
|
||||||
ERROR:
|
ERROR:
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,8 @@
|
||||||
|
|
||||||
#define DEBUG 1
|
#define DEBUG 1
|
||||||
|
|
||||||
int msgSpaceListFindId(msgSpaceId externId){
|
int msgSpaceListFindId(msgSpaceId externId)
|
||||||
|
{
|
||||||
msgSpaceList *list;
|
msgSpaceList *list;
|
||||||
msgSpaceId spaceId;
|
msgSpaceId spaceId;
|
||||||
msgSpaceListElemId listHeadElemId;
|
msgSpaceListElemId listHeadElemId;
|
||||||
|
|
@ -15,15 +16,21 @@ int msgSpaceListFindId(msgSpaceId externId){
|
||||||
NZG_ERROR("msgSpaceListOpen", "");
|
NZG_ERROR("msgSpaceListOpen", "");
|
||||||
goto ERROR;
|
goto ERROR;
|
||||||
}
|
}
|
||||||
if (DEBUG) { printf("Before ListStrCpy\n"); }
|
if (DEBUG) {
|
||||||
|
printf("Before ListStrCpy\n");
|
||||||
|
}
|
||||||
strcpy(listHeadElemId, list->headId);
|
strcpy(listHeadElemId, list->headId);
|
||||||
strcpy(listTailElemId, list->tailId);
|
strcpy(listTailElemId, list->tailId);
|
||||||
strcpy(listId, list->id);
|
strcpy(listId, list->id);
|
||||||
if (DEBUG) { printf("After ListStrCpy\n"); }
|
if (DEBUG) {
|
||||||
|
printf("After ListStrCpy\n");
|
||||||
|
}
|
||||||
if ((strcmp(listHeadElemId, listId) == 0)
|
if ((strcmp(listHeadElemId, listId) == 0)
|
||||||
&& strcmp(listTailElemId, listId) == 0) {
|
&& strcmp(listTailElemId, listId) == 0) {
|
||||||
// si la liste est vide
|
// si la liste est vide
|
||||||
if (DEBUG) { printf("SpaceList : vide\n"); }
|
if (DEBUG) {
|
||||||
|
printf("SpaceList : vide\n");
|
||||||
|
}
|
||||||
return 1;
|
return 1;
|
||||||
} else {
|
} else {
|
||||||
return msgSpaceListElemFindId(listHeadElemId, spaceId);
|
return msgSpaceListElemFindId(listHeadElemId, spaceId);
|
||||||
|
|
@ -37,7 +44,8 @@ ERROR:
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
int msgSpaceListElemFindId(msgSpaceListElemId elemId,msgSpaceId spaceId){
|
int msgSpaceListElemFindId(msgSpaceListElemId elemId, msgSpaceId spaceId)
|
||||||
|
{
|
||||||
msgSpaceListElem *listElem;
|
msgSpaceListElem *listElem;
|
||||||
msgSpaceListElemId listElemIdNext;
|
msgSpaceListElemId listElemIdNext;
|
||||||
msgSpaceId currentElemSpaceId;
|
msgSpaceId currentElemSpaceId;
|
||||||
|
|
@ -75,5 +83,3 @@ int msgSpaceListElemFindId(msgSpaceListElemId elemId,msgSpaceId spaceId){
|
||||||
ERROR:
|
ERROR:
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,8 @@
|
||||||
#include "libnazgul.h"
|
#include "libnazgul.h"
|
||||||
#include "ids.h"
|
#include "ids.h"
|
||||||
|
|
||||||
int msgSpaceListInit(){
|
int msgSpaceListInit()
|
||||||
|
{
|
||||||
int spaceListFd;
|
int spaceListFd;
|
||||||
sem_t *spaceListSemFd;
|
sem_t *spaceListSemFd;
|
||||||
msgSpaceList *list;
|
msgSpaceList *list;
|
||||||
|
|
@ -22,12 +23,9 @@ int msgSpaceListInit(){
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/*Fait un segment de memoir partager sur espace de listelement */
|
/*Fait un segment de memoir partager sur espace de listelement */
|
||||||
spaceListFd = shm_open(spaceListId,
|
spaceListFd = shm_open(spaceListId,
|
||||||
O_RDWR|O_CREAT|O_EXCL|O_TRUNC,
|
O_RDWR | O_CREAT | O_EXCL | O_TRUNC, 0666);
|
||||||
0666);
|
|
||||||
if (spaceListFd == -1) {
|
if (spaceListFd == -1) {
|
||||||
spaceListFd = shm_open(spaceListId, O_RDWR, 0666);
|
spaceListFd = shm_open(spaceListId, O_RDWR, 0666);
|
||||||
if (spaceListFd == -1) {
|
if (spaceListFd == -1) {
|
||||||
|
|
@ -73,4 +71,3 @@ EXISTING:
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,9 @@
|
||||||
#include "libnazgul.h"
|
#include "libnazgul.h"
|
||||||
|
|
||||||
|
|
||||||
// verouille le semaphore de la liste
|
// verouille le semaphore de la liste
|
||||||
|
|
||||||
int msgSpaceListLock(){
|
int msgSpaceListLock()
|
||||||
|
{
|
||||||
sem_t *msgSpaceListSemFd;
|
sem_t *msgSpaceListSemFd;
|
||||||
msgSpaceListSemId spaceListSemId;
|
msgSpaceListSemId spaceListSemId;
|
||||||
strcpy(spaceListSemId, DEFAULT_MSGSPACELISTSEMID);
|
strcpy(spaceListSemId, DEFAULT_MSGSPACELISTSEMID);
|
||||||
|
|
@ -33,14 +33,13 @@ ERROR:
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// deverouille le semaphore de la liste
|
// deverouille le semaphore de la liste
|
||||||
int msgSpaceListUnlock(){
|
int msgSpaceListUnlock()
|
||||||
|
{
|
||||||
sem_t *msgSpaceListSemFd;
|
sem_t *msgSpaceListSemFd;
|
||||||
msgSpaceListSemId spaceListSemId;
|
msgSpaceListSemId spaceListSemId;
|
||||||
strcpy(spaceListSemId, DEFAULT_MSGSPACELISTSEMID);
|
strcpy(spaceListSemId, DEFAULT_MSGSPACELISTSEMID);
|
||||||
|
|
||||||
|
|
||||||
/*Ouverture dun semaphore */
|
/*Ouverture dun semaphore */
|
||||||
msgSpaceListSemFd = sem_open(spaceListSemId, O_CREAT, 0666, 0);
|
msgSpaceListSemFd = sem_open(spaceListSemId, O_CREAT, 0666, 0);
|
||||||
if (msgSpaceListSemFd == SEM_FAILED) {
|
if (msgSpaceListSemFd == SEM_FAILED) {
|
||||||
|
|
@ -48,14 +47,12 @@ int msgSpaceListUnlock(){
|
||||||
goto ERROR;
|
goto ERROR;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/*Relachement du semaphore */
|
/*Relachement du semaphore */
|
||||||
if (sem_post(msgSpaceListSemFd) == -1) {
|
if (sem_post(msgSpaceListSemFd) == -1) {
|
||||||
NZG_ERROR("sem_relache", spaceListSemId);
|
NZG_ERROR("sem_relache", spaceListSemId);
|
||||||
goto ERROR;
|
goto ERROR;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/* Ferme le semaphore */
|
/* Ferme le semaphore */
|
||||||
if (sem_close(msgSpaceListSemFd) == -1) {
|
if (sem_close(msgSpaceListSemFd) == -1) {
|
||||||
NZG_ERROR("sem_close", spaceListSemId);
|
NZG_ERROR("sem_close", spaceListSemId);
|
||||||
|
|
@ -66,4 +63,3 @@ int msgSpaceListUnlock(){
|
||||||
ERROR:
|
ERROR:
|
||||||
return -1;
|
return -1;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,8 @@
|
||||||
#include "libnazgul.h"
|
#include "libnazgul.h"
|
||||||
#include "ids.h"
|
#include "ids.h"
|
||||||
|
|
||||||
void * msgSpaceListOpen(){
|
void *msgSpaceListOpen()
|
||||||
|
{
|
||||||
int listFd;
|
int listFd;
|
||||||
void *listAddr;
|
void *listAddr;
|
||||||
|
|
||||||
|
|
@ -16,10 +17,7 @@ void * msgSpaceListOpen(){
|
||||||
|
|
||||||
listAddr = mmap(NULL,
|
listAddr = mmap(NULL,
|
||||||
sizeof(msgSpaceList),
|
sizeof(msgSpaceList),
|
||||||
PROT_READ|PROT_WRITE,
|
PROT_READ | PROT_WRITE, MAP_SHARED, listFd, 0);
|
||||||
MAP_SHARED,
|
|
||||||
listFd,
|
|
||||||
0);
|
|
||||||
if (listAddr == MAP_FAILED) {
|
if (listAddr == MAP_FAILED) {
|
||||||
NZG_ERROR("mmap", spaceListId);
|
NZG_ERROR("mmap", spaceListId);
|
||||||
goto ERROR;
|
goto ERROR;
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,8 @@
|
||||||
|
|
||||||
#define DEBUG 1
|
#define DEBUG 1
|
||||||
|
|
||||||
int msgSpaceListRem(msgSpaceId spaceId){
|
int msgSpaceListRem(msgSpaceId spaceId)
|
||||||
|
{
|
||||||
msgSpaceList *list;
|
msgSpaceList *list;
|
||||||
msgSpaceListElemId listHeadElemId;
|
msgSpaceListElemId listHeadElemId;
|
||||||
msgSpaceListElemId listTailElemId;
|
msgSpaceListElemId listTailElemId;
|
||||||
|
|
@ -21,14 +22,20 @@ int msgSpaceListRem(msgSpaceId spaceId){
|
||||||
NZG_ERROR("msgSpaceListOpen", "");
|
NZG_ERROR("msgSpaceListOpen", "");
|
||||||
goto ERROR;
|
goto ERROR;
|
||||||
}
|
}
|
||||||
if (DEBUG) { printf("Before ListStrCpy\n"); }
|
if (DEBUG) {
|
||||||
|
printf("Before ListStrCpy\n");
|
||||||
|
}
|
||||||
strcpy(listHeadElemId, list->headId);
|
strcpy(listHeadElemId, list->headId);
|
||||||
strcpy(listTailElemId, list->tailId);
|
strcpy(listTailElemId, list->tailId);
|
||||||
strcpy(listId, list->id);
|
strcpy(listId, list->id);
|
||||||
if (DEBUG) { printf("After ListStrCpy\n"); }
|
if (DEBUG) {
|
||||||
|
printf("After ListStrCpy\n");
|
||||||
|
}
|
||||||
if ((strcmp(listHeadElemId, listId) == 0)
|
if ((strcmp(listHeadElemId, listId) == 0)
|
||||||
&& strcmp(listTailElemId, listId) == 0) {
|
&& strcmp(listTailElemId, listId) == 0) {
|
||||||
if (DEBUG) { printf("SpaceList : vide\n"); }
|
if (DEBUG) {
|
||||||
|
printf("SpaceList : vide\n");
|
||||||
|
}
|
||||||
return 1;
|
return 1;
|
||||||
} else {
|
} else {
|
||||||
bool found = false;
|
bool found = false;
|
||||||
|
|
@ -67,22 +74,34 @@ int msgSpaceListRem(msgSpaceId spaceId){
|
||||||
if (strcmp(prevElemId, currElemId) == 0) {
|
if (strcmp(prevElemId, currElemId) == 0) {
|
||||||
// si on est en début de liste (prev=current)
|
// si on est en début de liste (prev=current)
|
||||||
// - la tete de liste pointe sur le suivant
|
// - la tete de liste pointe sur le suivant
|
||||||
strcpy(list->headId,nextElemId);
|
strcpy(list->headId,
|
||||||
|
nextElemId);
|
||||||
} else {
|
} else {
|
||||||
if (strcmp(currElemId,nextElemId)==0){
|
if (strcmp
|
||||||
|
(currElemId,
|
||||||
|
nextElemId) == 0) {
|
||||||
// si on est en find de liste (current=next)
|
// si on est en find de liste (current=next)
|
||||||
// - on fait pointer la queue de liste sur le précédent
|
// - on fait pointer la queue de liste sur le précédent
|
||||||
strcpy(list->tailId,prevElemId);
|
strcpy(list->tailId,
|
||||||
|
prevElemId);
|
||||||
// - on fait pointer le précédent sur lui-meme
|
// - on fait pointer le précédent sur lui-meme
|
||||||
prevElem=msgSpaceListElemOpen(prevElemId);
|
prevElem =
|
||||||
strcpy(prevElem->next,prevElemId);
|
msgSpaceListElemOpen
|
||||||
msgSpaceListElemClose(prevElem);
|
(prevElemId);
|
||||||
|
strcpy(prevElem->next,
|
||||||
|
prevElemId);
|
||||||
|
msgSpaceListElemClose
|
||||||
|
(prevElem);
|
||||||
} else {
|
} else {
|
||||||
// on est en milieu de liste
|
// on est en milieu de liste
|
||||||
// - on fait pointer le précédent sur le suivant
|
// - on fait pointer le précédent sur le suivant
|
||||||
prevElem=msgSpaceListElemOpen(prevElemId);
|
prevElem =
|
||||||
strcpy(prevElem->next,nextElemId);
|
msgSpaceListElemOpen
|
||||||
msgSpaceListElemClose(prevElem);
|
(prevElemId);
|
||||||
|
strcpy(prevElem->next,
|
||||||
|
nextElemId);
|
||||||
|
msgSpaceListElemClose
|
||||||
|
(prevElem);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// - on détruit l'actuel
|
// - on détruit l'actuel
|
||||||
|
|
@ -107,4 +126,3 @@ int msgSpaceListRem(msgSpaceId spaceId){
|
||||||
ERROR:
|
ERROR:
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -5,8 +5,8 @@
|
||||||
int msgSpaceIdIntern(msgSpaceId dest, const msgSpaceId src);
|
int msgSpaceIdIntern(msgSpaceId dest, const msgSpaceId src);
|
||||||
int msgPoolDataIdIntern(msgSpaceId dest, const msgSpaceId src);
|
int msgPoolDataIdIntern(msgSpaceId dest, const msgSpaceId src);
|
||||||
|
|
||||||
|
msgSpace *msgSpaceOpen(msgSpaceId externId)
|
||||||
msgSpace * msgSpaceOpen(msgSpaceId externId){
|
{
|
||||||
int shmFd;
|
int shmFd;
|
||||||
msgSpaceId nzgId;
|
msgSpaceId nzgId;
|
||||||
msgSpace *mSAddr;
|
msgSpace *mSAddr;
|
||||||
|
|
@ -17,10 +17,11 @@ msgSpace * msgSpaceOpen(msgSpaceId externId){
|
||||||
perror("shm_open");
|
perror("shm_open");
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
mSAddr=mmap(NULL,sizeof(msgSpace),PROT_READ|PROT_WRITE,MAP_SHARED,shmFd,(off_t)0);
|
mSAddr =
|
||||||
|
mmap(NULL, sizeof(msgSpace), PROT_READ | PROT_WRITE, MAP_SHARED,
|
||||||
|
shmFd, (off_t) 0);
|
||||||
|
|
||||||
printf( "OPEN: msgSpace mapped to 0x%08x in %d\n", (int)mSAddr,(int)getpid());
|
printf("OPEN: msgSpace mapped to %p in %d\n", (void *)mSAddr,
|
||||||
|
(int)getpid());
|
||||||
return mSAddr;
|
return mSAddr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,2 +1 @@
|
||||||
#include "libnazgul.h"
|
#include "libnazgul.h"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -68,5 +68,3 @@ clean:
|
||||||
% : %.c
|
% : %.c
|
||||||
$(CC) -o $* $< $(INCLUDES) $(LIBINC) $(LIBS) $(CFLAGS) $(DEFS)
|
$(CC) -o $* $< $(INCLUDES) $(LIBINC) $(LIBS) $(CFLAGS) $(DEFS)
|
||||||
|
|
||||||
edit:
|
|
||||||
gvim *.h *.c
|
|
||||||
|
|
|
||||||
|
|
@ -1,67 +0,0 @@
|
||||||
#ifdef _NZG_HPUX
|
|
||||||
#include <sys/wait.h>
|
|
||||||
#else
|
|
||||||
#include <wait.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "libnazgul.h"
|
|
||||||
|
|
||||||
int main(void) {
|
|
||||||
// msgSpace mS=0;
|
|
||||||
|
|
||||||
pid_t pid;
|
|
||||||
msgSpaceId testId;
|
|
||||||
msgSpace * mSPAC;
|
|
||||||
msgPool poolInfos[3];
|
|
||||||
char * montext;
|
|
||||||
|
|
||||||
poolInfos[0].bufferNb=4;
|
|
||||||
poolInfos[0].bufferSize=200;
|
|
||||||
|
|
||||||
poolInfos[1].bufferNb=5;
|
|
||||||
poolInfos[1].bufferSize=250;
|
|
||||||
|
|
||||||
poolInfos[2].bufferNb=5;
|
|
||||||
poolInfos[2].bufferSize=280;
|
|
||||||
|
|
||||||
sprintf(testId,"test%d",(int)getuid());
|
|
||||||
printf("RequestedId: %s\n",testId);
|
|
||||||
printf("Void size: %d\n",(int)sizeof(void));
|
|
||||||
mSPAC=msgSpaceCreate(testId,0,3,poolInfos);
|
|
||||||
if (mSPAC ==NULL) {
|
|
||||||
NZG_ERROR("msgSpaceCreate",testId);
|
|
||||||
exit(0);
|
|
||||||
}
|
|
||||||
|
|
||||||
pid=fork();
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if (pid ==0){
|
|
||||||
mSPAC=msgSpaceOpen(testId);
|
|
||||||
sleep(5);
|
|
||||||
montext=msgAllocate(mSPAC,2,180,0);
|
|
||||||
sleep(5);
|
|
||||||
montext=msgAllocate(mSPAC,2,170,0);
|
|
||||||
sleep(5);
|
|
||||||
montext=msgAllocate(mSPAC,2,270,0);
|
|
||||||
|
|
||||||
} else {
|
|
||||||
mSPAC=msgSpaceOpen(testId);
|
|
||||||
montext=msgAllocate(mSPAC,2,280,0);
|
|
||||||
*montext=42;
|
|
||||||
printf("### test Valeur0 %d ###\n",(int)*montext);
|
|
||||||
//sleep(2);
|
|
||||||
montext=msgAllocate(mSPAC,2,270,0);
|
|
||||||
*montext=17;
|
|
||||||
printf("### test Valeur1 %d ###\n",(int)*montext);
|
|
||||||
sleep(5);
|
|
||||||
montext=msgAllocate(mSPAC,2,270,0);
|
|
||||||
msgFree(mSPAC,(void *)montext);
|
|
||||||
//msgFree(mSPAC,(void *)montext);
|
|
||||||
//msgFree(mSPAC,(void *)montext);
|
|
||||||
wait(NULL);
|
|
||||||
msgSpaceDelete(testId);
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
@ -1,100 +0,0 @@
|
||||||
#ifdef _NZG_HPUX
|
|
||||||
#include <sys/wait.h>
|
|
||||||
#else
|
|
||||||
#include <wait.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "libnazgul.h"
|
|
||||||
|
|
||||||
void usage(char * myname){
|
|
||||||
printf("Usage: %s [--all | msgSpaceId1 msgSpaceId2 ... ]\n",myname);
|
|
||||||
}
|
|
||||||
|
|
||||||
int about(char * spaceId){
|
|
||||||
msgPoolDataTabSemId ressourceSemId;
|
|
||||||
sem_t * ressourceSemFd;
|
|
||||||
int i;
|
|
||||||
msgPoolData * poolDataTab;
|
|
||||||
msgSpace * space;
|
|
||||||
int ressourceSemVal;
|
|
||||||
if (strlen(spaceId)> MSGSPACE_ID_LEN){
|
|
||||||
//verif de la longueur
|
|
||||||
fprintf(stderr,"Too long ident : %s\n",spaceId);
|
|
||||||
goto ERROR;
|
|
||||||
} else {
|
|
||||||
int err;
|
|
||||||
msgSpaceListLock();
|
|
||||||
err=msgSpaceListFindId(spaceId);
|
|
||||||
msgSpaceListUnlock();
|
|
||||||
if (err < 1){
|
|
||||||
if (err==0){
|
|
||||||
// le msgSpace existe
|
|
||||||
space=msgSpaceOpen(spaceId);
|
|
||||||
// on lit les informations sur le msgSpace
|
|
||||||
// les pool
|
|
||||||
for (i=0;i<space->poolNb;i++){
|
|
||||||
msgPoolSemIdIntern(ressourceSemId,space->externId,i);
|
|
||||||
ressourceSemFd = sem_open(ressourceSemId,O_CREAT,SEM_DEFAULT_MODE,0);
|
|
||||||
if (ressourceSemFd == SEM_FAILED){
|
|
||||||
NZG_ERROR("sem_open",ressourceSemId);
|
|
||||||
goto ERROR;
|
|
||||||
}
|
|
||||||
if (sem_getvalue(ressourceSemFd, &ressourceSemVal) < 0){
|
|
||||||
NZG_ERROR("sem_getvalue",ressourceSemId);
|
|
||||||
goto ERROR;
|
|
||||||
}
|
|
||||||
msgPoolDataTabLock(space);
|
|
||||||
poolDataTab= msgPoolDataTabOpen(space);
|
|
||||||
// donner le nombre de buffer disponibles
|
|
||||||
printf("- %d/%d free buffers in pool #%d\n",
|
|
||||||
ressourceSemVal,
|
|
||||||
poolDataTab[i].bufferNb,
|
|
||||||
i);
|
|
||||||
msgPoolDataTabClose(space,poolDataTab);
|
|
||||||
msgPoolDataTabUnlock(space);
|
|
||||||
if(sem_close(ressourceSemFd) <0){
|
|
||||||
NZG_ERROR("sem_getvalue",ressourceSemId);
|
|
||||||
goto ERROR;
|
|
||||||
}
|
|
||||||
// pour chaque buffer, dire s'il est libre ou pas
|
|
||||||
// et le processus/addresse associé
|
|
||||||
}
|
|
||||||
msgSpaceClose(space);
|
|
||||||
} else {
|
|
||||||
// zut, il y a soit une erreur
|
|
||||||
NZG_ERROR("spaceListFindId : error ",spaceId);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
// on quitte : l'element n'existe
|
|
||||||
fprintf(stderr,"Ident %s does not exist.\n",spaceId);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
ERROR:
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
int main(int argc,char **argv){
|
|
||||||
printf("Args %d\n",argc);
|
|
||||||
if (argc<2){
|
|
||||||
usage(argv[0]);
|
|
||||||
}else {
|
|
||||||
if (argc==2){
|
|
||||||
if (strcmp("--all",argv[1])==0){
|
|
||||||
// listing
|
|
||||||
printf("[ Listing of msgSpaces ]\n");
|
|
||||||
} else {
|
|
||||||
// only one msgSpaceId
|
|
||||||
printf("[ About %s ]\n",argv[1]);
|
|
||||||
about(argv[1]);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
int i;
|
|
||||||
for (i=1;i<argc;i++){
|
|
||||||
printf("[ About %s ]\n",argv[i]);
|
|
||||||
about(argv[i]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
@ -1,54 +0,0 @@
|
||||||
#ifdef _NZG_HPUX
|
|
||||||
#include <sys/wait.h>
|
|
||||||
#else
|
|
||||||
#include <wait.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "libnazgul.h"
|
|
||||||
|
|
||||||
int main(void) {
|
|
||||||
// msgSpace mS=0;
|
|
||||||
|
|
||||||
msgSpaceId testId;
|
|
||||||
msgSpace * mSPAC;
|
|
||||||
msgPool poolInfos[3];
|
|
||||||
char * montext;
|
|
||||||
|
|
||||||
poolInfos[0].bufferNb=4;
|
|
||||||
poolInfos[0].bufferSize=200;
|
|
||||||
|
|
||||||
poolInfos[1].bufferNb=5;
|
|
||||||
poolInfos[1].bufferSize=250;
|
|
||||||
|
|
||||||
sprintf(testId,"test%d",(int)getuid());
|
|
||||||
printf("RequestedId: %s\n",testId);
|
|
||||||
printf("Void size: %d\n",(int)sizeof(void));
|
|
||||||
//creation de l'espace de messages
|
|
||||||
mSPAC=msgSpaceCreate(testId,1,2,poolInfos);
|
|
||||||
if (mSPAC ==NULL) {
|
|
||||||
NZG_ERROR("msgSpaceCreate",testId);
|
|
||||||
exit(0);
|
|
||||||
}
|
|
||||||
|
|
||||||
printf("CREATION ------------------ ok\n");
|
|
||||||
|
|
||||||
mSPAC=msgSpaceOpen(testId);
|
|
||||||
|
|
||||||
/***** TEST 1 *****/
|
|
||||||
montext=msgAllocate(mSPAC,1,280,0);
|
|
||||||
*montext=42;
|
|
||||||
printf("### test Valeur0 %d ###\n",(int)*montext);
|
|
||||||
printf("Put..."); fflush(stdout);
|
|
||||||
msgPut(mSPAC,0,montext);
|
|
||||||
printf("put-ok\n");
|
|
||||||
|
|
||||||
|
|
||||||
printf("Get..."); fflush(stdout);
|
|
||||||
montext=msgGet(mSPAC,0,0);
|
|
||||||
printf("get-ok\n");
|
|
||||||
printf("### test Reception %d ###\n",(int)*montext);
|
|
||||||
msgFree(mSPAC,montext);
|
|
||||||
/***** TEST 1 *****/
|
|
||||||
msgSpaceDelete(testId);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
@ -1,55 +0,0 @@
|
||||||
#ifdef _NZG_HPUX
|
|
||||||
#include <sys/wait.h>
|
|
||||||
#else
|
|
||||||
#include <wait.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "libnazgul.h"
|
|
||||||
|
|
||||||
int main(void) {
|
|
||||||
// msgSpace mS=0;
|
|
||||||
|
|
||||||
msgSpaceId testId;
|
|
||||||
msgSpace * mSPAC;
|
|
||||||
msgPool poolInfos[3];
|
|
||||||
char * montext;
|
|
||||||
|
|
||||||
poolInfos[0].bufferNb=4;
|
|
||||||
poolInfos[0].bufferSize=200;
|
|
||||||
|
|
||||||
poolInfos[1].bufferNb=5;
|
|
||||||
poolInfos[1].bufferSize=250;
|
|
||||||
|
|
||||||
sprintf(testId,"test%d",(int)getuid());
|
|
||||||
printf("RequestedId: %s\n",testId);
|
|
||||||
printf("Void size: %d\n",(int)sizeof(void));
|
|
||||||
//creation de l'espace de messages
|
|
||||||
mSPAC=msgSpaceCreate(testId,1,2,poolInfos);
|
|
||||||
if (mSPAC ==NULL) {
|
|
||||||
NZG_ERROR("msgSpaceCreate",testId);
|
|
||||||
exit(0);
|
|
||||||
}
|
|
||||||
|
|
||||||
printf("CREATION ------------------ ok\n");
|
|
||||||
pid_t pid=fork();
|
|
||||||
if (pid==0){
|
|
||||||
sleep(2);
|
|
||||||
mSPAC=msgSpaceOpen(testId);
|
|
||||||
montext=msgAllocate(mSPAC,1,280,0);
|
|
||||||
*montext=42;
|
|
||||||
printf("### test Valeur0 %d ###\n",(int)*montext);
|
|
||||||
printf("Put1..."); fflush(stdout);
|
|
||||||
msgPut(mSPAC,0,montext);
|
|
||||||
printf("put1-ok\n");
|
|
||||||
} else {
|
|
||||||
mSPAC=msgSpaceOpen(testId);
|
|
||||||
printf("Get..."); fflush(stdout);
|
|
||||||
montext=msgGet(mSPAC,0,0);
|
|
||||||
printf("get-ok\n");
|
|
||||||
printf("### test Reception %d ###\n",(int)*montext);
|
|
||||||
msgFree(mSPAC,montext);
|
|
||||||
wait(NULL);
|
|
||||||
msgSpaceDelete(testId);
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
66
test/test_create_delete.c
Normal file
66
test/test_create_delete.c
Normal file
|
|
@ -0,0 +1,66 @@
|
||||||
|
#ifdef _NZG_HPUX
|
||||||
|
#include <sys/wait.h>
|
||||||
|
#else
|
||||||
|
#include <wait.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#include "libnazgul.h"
|
||||||
|
|
||||||
|
int main(void)
|
||||||
|
{
|
||||||
|
// msgSpace mS=0;
|
||||||
|
|
||||||
|
pid_t pid;
|
||||||
|
msgSpaceId testId;
|
||||||
|
msgSpace *mSPAC;
|
||||||
|
msgPool poolInfos[3];
|
||||||
|
char *montext;
|
||||||
|
|
||||||
|
poolInfos[0].bufferNb = 4;
|
||||||
|
poolInfos[0].bufferSize = 200;
|
||||||
|
|
||||||
|
poolInfos[1].bufferNb = 5;
|
||||||
|
poolInfos[1].bufferSize = 250;
|
||||||
|
|
||||||
|
poolInfos[2].bufferNb = 5;
|
||||||
|
poolInfos[2].bufferSize = 280;
|
||||||
|
|
||||||
|
sprintf(testId, "test%d", (int)getuid());
|
||||||
|
printf("RequestedId: %s\n", testId);
|
||||||
|
printf("Void size: %d\n", (int)sizeof(void));
|
||||||
|
mSPAC = msgSpaceCreate(testId, 0, 3, poolInfos);
|
||||||
|
if (mSPAC == NULL) {
|
||||||
|
NZG_ERROR("msgSpaceCreate", testId);
|
||||||
|
exit(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
pid = fork();
|
||||||
|
|
||||||
|
if (pid == 0) {
|
||||||
|
mSPAC = msgSpaceOpen(testId);
|
||||||
|
sleep(5);
|
||||||
|
montext = msgAllocate(mSPAC, 2, 180, 0);
|
||||||
|
sleep(5);
|
||||||
|
montext = msgAllocate(mSPAC, 2, 170, 0);
|
||||||
|
sleep(5);
|
||||||
|
montext = msgAllocate(mSPAC, 2, 270, 0);
|
||||||
|
|
||||||
|
} else {
|
||||||
|
mSPAC = msgSpaceOpen(testId);
|
||||||
|
montext = msgAllocate(mSPAC, 2, 280, 0);
|
||||||
|
*montext = 42;
|
||||||
|
printf("### test Valeur0 %d ###\n", (int)*montext);
|
||||||
|
//sleep(2);
|
||||||
|
montext = msgAllocate(mSPAC, 2, 270, 0);
|
||||||
|
*montext = 17;
|
||||||
|
printf("### test Valeur1 %d ###\n", (int)*montext);
|
||||||
|
sleep(5);
|
||||||
|
montext = msgAllocate(mSPAC, 2, 270, 0);
|
||||||
|
msgFree(mSPAC, (void *)montext);
|
||||||
|
//msgFree(mSPAC,(void *)montext);
|
||||||
|
//msgFree(mSPAC,(void *)montext);
|
||||||
|
wait(NULL);
|
||||||
|
msgSpaceDelete(testId);
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
111
test/test_msgSpaceState.c
Normal file
111
test/test_msgSpaceState.c
Normal file
|
|
@ -0,0 +1,111 @@
|
||||||
|
#ifdef _NZG_HPUX
|
||||||
|
#include <sys/wait.h>
|
||||||
|
#else
|
||||||
|
#include <wait.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#include "libnazgul.h"
|
||||||
|
|
||||||
|
void usage(char *myname)
|
||||||
|
{
|
||||||
|
printf("Usage: %s [--all | msgSpaceId1 msgSpaceId2 ... ]\n", myname);
|
||||||
|
}
|
||||||
|
|
||||||
|
int about(char *spaceId)
|
||||||
|
{
|
||||||
|
msgPoolDataTabSemId ressourceSemId;
|
||||||
|
sem_t *ressourceSemFd;
|
||||||
|
int i;
|
||||||
|
msgPoolData *poolDataTab;
|
||||||
|
msgSpace *space;
|
||||||
|
int ressourceSemVal;
|
||||||
|
if (strlen(spaceId) > MSGSPACE_ID_LEN) {
|
||||||
|
//verif de la longueur
|
||||||
|
fprintf(stderr, "Too long ident : %s\n", spaceId);
|
||||||
|
goto ERROR;
|
||||||
|
} else {
|
||||||
|
int err;
|
||||||
|
msgSpaceListLock();
|
||||||
|
err = msgSpaceListFindId(spaceId);
|
||||||
|
msgSpaceListUnlock();
|
||||||
|
if (err < 1) {
|
||||||
|
if (err == 0) {
|
||||||
|
// le msgSpace existe
|
||||||
|
space = msgSpaceOpen(spaceId);
|
||||||
|
// on lit les informations sur le msgSpace
|
||||||
|
// les pool
|
||||||
|
for (i = 0; i < space->poolNb; i++) {
|
||||||
|
msgPoolSemIdIntern(ressourceSemId,
|
||||||
|
space->externId, i);
|
||||||
|
ressourceSemFd =
|
||||||
|
sem_open(ressourceSemId, O_CREAT,
|
||||||
|
SEM_DEFAULT_MODE, 0);
|
||||||
|
if (ressourceSemFd == SEM_FAILED) {
|
||||||
|
NZG_ERROR("sem_open",
|
||||||
|
ressourceSemId);
|
||||||
|
goto ERROR;
|
||||||
|
}
|
||||||
|
if (sem_getvalue
|
||||||
|
(ressourceSemFd,
|
||||||
|
&ressourceSemVal) < 0) {
|
||||||
|
NZG_ERROR("sem_getvalue",
|
||||||
|
ressourceSemId);
|
||||||
|
goto ERROR;
|
||||||
|
}
|
||||||
|
msgPoolDataTabLock(space);
|
||||||
|
poolDataTab = msgPoolDataTabOpen(space);
|
||||||
|
// donner le nombre de buffer disponibles
|
||||||
|
printf
|
||||||
|
("- %d/%d free buffers in pool #%d\n",
|
||||||
|
ressourceSemVal,
|
||||||
|
poolDataTab[i].bufferNb, i);
|
||||||
|
msgPoolDataTabClose(space, poolDataTab);
|
||||||
|
msgPoolDataTabUnlock(space);
|
||||||
|
if (sem_close(ressourceSemFd) < 0) {
|
||||||
|
NZG_ERROR("sem_getvalue",
|
||||||
|
ressourceSemId);
|
||||||
|
goto ERROR;
|
||||||
|
}
|
||||||
|
// pour chaque buffer, dire s'il est libre ou pas
|
||||||
|
// et le processus/addresse associé
|
||||||
|
}
|
||||||
|
msgSpaceClose(space);
|
||||||
|
} else {
|
||||||
|
// zut, il y a soit une erreur
|
||||||
|
NZG_ERROR("spaceListFindId : error ", spaceId);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// on quitte : l'element n'existe
|
||||||
|
fprintf(stderr, "Ident %s does not exist.\n", spaceId);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
ERROR:
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
int main(int argc, char **argv)
|
||||||
|
{
|
||||||
|
printf("Args %d\n", argc);
|
||||||
|
if (argc < 2) {
|
||||||
|
usage(argv[0]);
|
||||||
|
} else {
|
||||||
|
if (argc == 2) {
|
||||||
|
if (strcmp("--all", argv[1]) == 0) {
|
||||||
|
// listing
|
||||||
|
printf("[ Listing of msgSpaces ]\n");
|
||||||
|
} else {
|
||||||
|
// only one msgSpaceId
|
||||||
|
printf("[ About %s ]\n", argv[1]);
|
||||||
|
about(argv[1]);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
int i;
|
||||||
|
for (i = 1; i < argc; i++) {
|
||||||
|
printf("[ About %s ]\n", argv[i]);
|
||||||
|
about(argv[i]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
56
test/test_put_get_mono.c
Normal file
56
test/test_put_get_mono.c
Normal file
|
|
@ -0,0 +1,56 @@
|
||||||
|
#ifdef _NZG_HPUX
|
||||||
|
#include <sys/wait.h>
|
||||||
|
#else
|
||||||
|
#include <wait.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#include "libnazgul.h"
|
||||||
|
|
||||||
|
int main(void)
|
||||||
|
{
|
||||||
|
// msgSpace mS=0;
|
||||||
|
|
||||||
|
msgSpaceId testId;
|
||||||
|
msgSpace *mSPAC;
|
||||||
|
msgPool poolInfos[3];
|
||||||
|
char *montext;
|
||||||
|
|
||||||
|
poolInfos[0].bufferNb = 4;
|
||||||
|
poolInfos[0].bufferSize = 200;
|
||||||
|
|
||||||
|
poolInfos[1].bufferNb = 5;
|
||||||
|
poolInfos[1].bufferSize = 250;
|
||||||
|
|
||||||
|
sprintf(testId, "test%d", (int)getuid());
|
||||||
|
printf("RequestedId: %s\n", testId);
|
||||||
|
printf("Void size: %d\n", (int)sizeof(void));
|
||||||
|
//creation de l'espace de messages
|
||||||
|
mSPAC = msgSpaceCreate(testId, 1, 2, poolInfos);
|
||||||
|
if (mSPAC == NULL) {
|
||||||
|
NZG_ERROR("msgSpaceCreate", testId);
|
||||||
|
exit(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
printf("CREATION ------------------ ok\n");
|
||||||
|
|
||||||
|
mSPAC = msgSpaceOpen(testId);
|
||||||
|
|
||||||
|
/***** TEST 1 *****/
|
||||||
|
montext = msgAllocate(mSPAC, 1, 280, 0);
|
||||||
|
*montext = 42;
|
||||||
|
printf("### test Valeur0 %d ###\n", (int)*montext);
|
||||||
|
printf("Put...");
|
||||||
|
fflush(stdout);
|
||||||
|
msgPut(mSPAC, 0, montext);
|
||||||
|
printf("put-ok\n");
|
||||||
|
|
||||||
|
printf("Get...");
|
||||||
|
fflush(stdout);
|
||||||
|
montext = msgGet(mSPAC, 0, 0);
|
||||||
|
printf("get-ok\n");
|
||||||
|
printf("### test Reception %d ###\n", (int)*montext);
|
||||||
|
msgFree(mSPAC, montext);
|
||||||
|
/***** TEST 1 *****/
|
||||||
|
msgSpaceDelete(testId);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
58
test/test_put_get_multi.c
Normal file
58
test/test_put_get_multi.c
Normal file
|
|
@ -0,0 +1,58 @@
|
||||||
|
#ifdef _NZG_HPUX
|
||||||
|
#include <sys/wait.h>
|
||||||
|
#else
|
||||||
|
#include <wait.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#include "libnazgul.h"
|
||||||
|
|
||||||
|
int main(void)
|
||||||
|
{
|
||||||
|
// msgSpace mS=0;
|
||||||
|
|
||||||
|
msgSpaceId testId;
|
||||||
|
msgSpace *mSPAC;
|
||||||
|
msgPool poolInfos[3];
|
||||||
|
char *montext;
|
||||||
|
|
||||||
|
poolInfos[0].bufferNb = 4;
|
||||||
|
poolInfos[0].bufferSize = 200;
|
||||||
|
|
||||||
|
poolInfos[1].bufferNb = 5;
|
||||||
|
poolInfos[1].bufferSize = 250;
|
||||||
|
|
||||||
|
sprintf(testId, "test%d", (int)getuid());
|
||||||
|
printf("RequestedId: %s\n", testId);
|
||||||
|
printf("Void size: %d\n", (int)sizeof(void));
|
||||||
|
//creation de l'espace de messages
|
||||||
|
mSPAC = msgSpaceCreate(testId, 1, 2, poolInfos);
|
||||||
|
if (mSPAC == NULL) {
|
||||||
|
NZG_ERROR("msgSpaceCreate", testId);
|
||||||
|
exit(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
printf("CREATION ------------------ ok\n");
|
||||||
|
pid_t pid = fork();
|
||||||
|
if (pid == 0) {
|
||||||
|
sleep(2);
|
||||||
|
mSPAC = msgSpaceOpen(testId);
|
||||||
|
montext = msgAllocate(mSPAC, 1, 280, 0);
|
||||||
|
*montext = 42;
|
||||||
|
printf("### test Valeur0 %d ###\n", (int)*montext);
|
||||||
|
printf("Put1...");
|
||||||
|
fflush(stdout);
|
||||||
|
msgPut(mSPAC, 0, montext);
|
||||||
|
printf("put1-ok\n");
|
||||||
|
} else {
|
||||||
|
mSPAC = msgSpaceOpen(testId);
|
||||||
|
printf("Get...");
|
||||||
|
fflush(stdout);
|
||||||
|
montext = msgGet(mSPAC, 0, 0);
|
||||||
|
printf("get-ok\n");
|
||||||
|
printf("### test Reception %d ###\n", (int)*montext);
|
||||||
|
msgFree(mSPAC, montext);
|
||||||
|
wait(NULL);
|
||||||
|
msgSpaceDelete(testId);
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
Loading…
Add table
Reference in a new issue