Compare commits
No commits in common. "master" and "glenux" have entirely different histories.
6
.gitignore
vendored
6
.gitignore
vendored
|
|
@ -1,6 +0,0 @@
|
|||
*.a
|
||||
*.c~
|
||||
*.h~
|
||||
*.log
|
||||
*.o
|
||||
test/test_*
|
||||
3
.ssh-agent
Normal file
3
.ssh-agent
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
SSH_AUTH_SOCK=/tmp/ssh-QHib2992/agent.2992; export SSH_AUTH_SOCK;
|
||||
SSH_AGENT_PID=2993; export SSH_AGENT_PID;
|
||||
echo Agent pid 2993;
|
||||
23
HEADER
Normal file
23
HEADER
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
#-------------------------------------------------------------------%
|
||||
#
|
||||
# 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
|
||||
#
|
||||
# pour la compilation et execution du projet, veuillez
|
||||
# vous référer au fichier INSTALL
|
||||
#
|
||||
#-------------------------------------------------------------------%
|
||||
17
INSTALL
Normal file
17
INSTALL
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
|
||||
1) Compilation du projet
|
||||
|
||||
Pour compiler le projet, taper
|
||||
|
||||
make
|
||||
|
||||
2) Execution
|
||||
|
||||
Pour l'executer
|
||||
|
||||
cd src
|
||||
make run
|
||||
|
||||
ATTENTION: Il faut que java et javac soient installés sur votre
|
||||
machine, et que toutes les librairies (SWING, AWT, etc..) dont
|
||||
dépend le programme soient présentes.
|
||||
607
LICENSE
607
LICENSE
|
|
@ -1,25 +1,23 @@
|
|||
GNU LIBRARY GENERAL PUBLIC LICENSE
|
||||
Version 2, June 1991
|
||||
|
||||
Copyright (C) 1991 Free Software Foundation, Inc.
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
GNU GENERAL PUBLIC LICENSE
|
||||
Version 2, June 1991
|
||||
|
||||
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
|
||||
675 Mass Ave, Cambridge, MA 02139, USA
|
||||
Everyone is permitted to copy and distribute verbatim copies
|
||||
of this license document, but changing it is not allowed.
|
||||
|
||||
[This is the first released version of the 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
|
||||
freedom to share and change it. By contrast, the GNU General Public
|
||||
Licenses are intended to guarantee your freedom to share and change
|
||||
free software--to make sure the software is free for all its users.
|
||||
|
||||
This license, the Library General Public License, applies to some
|
||||
specially designated Free Software Foundation software, and to any
|
||||
other libraries whose authors decide to use it. You can use it for
|
||||
your libraries, too.
|
||||
License is intended to guarantee your freedom to share and change free
|
||||
software--to make sure the software is free for all its users. This
|
||||
General Public License applies to most of the Free Software
|
||||
Foundation's software and to any other program whose authors commit to
|
||||
using it. (Some other Free Software Foundation software is covered by
|
||||
the GNU Library General Public License instead.) You can apply it to
|
||||
your programs, too.
|
||||
|
||||
When we speak of free software, we are referring to freedom, not
|
||||
price. Our General Public Licenses are designed to make sure that you
|
||||
|
|
@ -30,347 +28,195 @@ in new free programs; and that you know you can do these things.
|
|||
|
||||
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.
|
||||
These restrictions translate to certain responsibilities for you if
|
||||
you distribute copies of the library, or if you modify it.
|
||||
These restrictions translate to certain responsibilities for you if you
|
||||
distribute copies of the software, or if you modify it.
|
||||
|
||||
For example, if you distribute copies of the library, whether gratis
|
||||
or for a fee, you must give the recipients all the rights that we gave
|
||||
you. You must make sure that they, too, receive or can get the source
|
||||
code. If you link a program with the library, you must provide
|
||||
complete object files to the recipients so that they can relink them
|
||||
with the library, after making changes to the library and recompiling
|
||||
it. And you must show them these terms so they know their rights.
|
||||
For example, if you distribute copies of such a program, whether
|
||||
gratis or for a fee, you must give the recipients all the rights that
|
||||
you have. You must make sure that they, too, receive or can get the
|
||||
source code. And you must show them these terms so they know their
|
||||
rights.
|
||||
|
||||
Our method of protecting your rights has two steps: (1) copyright
|
||||
the library, and (2) offer you this license which gives you legal
|
||||
permission to copy, distribute and/or modify the library.
|
||||
We protect your rights with two steps: (1) copyright the software, and
|
||||
(2) offer you this license which gives you legal permission to copy,
|
||||
distribute and/or modify the software.
|
||||
|
||||
Also, for each distributor's protection, we want to make certain
|
||||
Also, for each author's protection and ours, we want to make certain
|
||||
that everyone understands that there is no warranty for this free
|
||||
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
|
||||
version, so that any problems introduced by others will not reflect on
|
||||
the original authors' reputations.
|
||||
|
||||
software. If the software is modified by someone else and passed on, we
|
||||
want its recipients to know that what they have is not the original, so
|
||||
that any problems introduced by others will not reflect on the original
|
||||
authors' reputations.
|
||||
|
||||
Finally, any free program is threatened constantly by software
|
||||
patents. We wish to avoid the danger that companies distributing free
|
||||
software will individually obtain patent licenses, thus in effect
|
||||
transforming the program into proprietary software. To prevent this,
|
||||
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.
|
||||
patents. We wish to avoid the danger that redistributors of a free
|
||||
program will individually obtain patent licenses, in effect making the
|
||||
program proprietary. To prevent this, we have made it clear that any
|
||||
patent must be licensed for everyone's free use or not licensed at all.
|
||||
|
||||
The precise terms and conditions for copying, distribution and
|
||||
modification follow. Pay close attention to the difference between a
|
||||
"work based on the library" and a "work that uses the library". The
|
||||
former contains code derived from the library, 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.
|
||||
modification follow.
|
||||
|
||||
GNU LIBRARY GENERAL PUBLIC LICENSE
|
||||
GNU GENERAL PUBLIC LICENSE
|
||||
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
|
||||
|
||||
0. This License Agreement applies to any software library which
|
||||
contains a notice placed by the copyright holder or other authorized
|
||||
party saying it may be distributed under the terms of this Library
|
||||
General Public License (also called "this License"). Each licensee is
|
||||
addressed as "you".
|
||||
0. This License applies to any program or other work which contains
|
||||
a notice placed by the copyright holder saying it may be distributed
|
||||
under the terms of this General Public License. The "Program", below,
|
||||
refers to any such program or work, and a "work based on the Program"
|
||||
means either the Program or any derivative work under copyright law:
|
||||
that is to say, a work containing the Program or a portion of it,
|
||||
either verbatim or with modifications and/or translated into another
|
||||
language. (Hereinafter, translation is included without limitation in
|
||||
the term "modification".) Each licensee is addressed as "you".
|
||||
|
||||
A "library" means a collection of software functions and/or data
|
||||
prepared so as to be conveniently linked with application programs
|
||||
(which use some of those functions and data) to form executables.
|
||||
|
||||
The "Library", below, refers to any such software library or work
|
||||
which has been distributed under these terms. A "work based on the
|
||||
Library" means either the Library or any derivative work under
|
||||
copyright law: that is to say, a work containing the Library or a
|
||||
portion of it, either verbatim or with modifications and/or translated
|
||||
straightforwardly into another language. (Hereinafter, translation is
|
||||
included without limitation in the term "modification".)
|
||||
|
||||
"Source code" for a work means the preferred form of the work for
|
||||
making modifications to it. For a library, complete source code means
|
||||
all the source code for all modules it contains, plus any associated
|
||||
interface definition files, plus the scripts used to control compilation
|
||||
and installation of the library.
|
||||
|
||||
Activities other than copying, distribution and modification are not
|
||||
Activities other than copying, distribution and modification are not
|
||||
covered by this License; they are outside its scope. The act of
|
||||
running a program using the Library is not restricted, and output from
|
||||
such a program is covered only if its contents constitute a work based
|
||||
on the Library (independent of the use of the Library in a tool for
|
||||
writing it). Whether that is true depends on what the Library does
|
||||
and what the program that uses the Library does.
|
||||
|
||||
1. You may copy and distribute verbatim copies of the Library's
|
||||
complete source code as you receive it, in any medium, provided that
|
||||
you conspicuously and appropriately publish on each copy an
|
||||
appropriate copyright notice and disclaimer of warranty; keep intact
|
||||
all the notices that refer to this License and to the absence of any
|
||||
warranty; and distribute a copy of this License along with the
|
||||
Library.
|
||||
running the Program is not restricted, and the output from the Program
|
||||
is covered only if its contents constitute a work based on the
|
||||
Program (independent of having been made by running the Program).
|
||||
Whether that is true depends on what the Program does.
|
||||
|
||||
You may charge a fee for the physical act of transferring a copy,
|
||||
and you may at your option offer warranty protection in exchange for a
|
||||
fee.
|
||||
|
||||
2. You may modify your copy or copies of the Library or any portion
|
||||
of it, thus forming a work based on the Library, and copy and
|
||||
1. You may copy and distribute verbatim copies of the Program's
|
||||
source code as you receive it, in any medium, provided that you
|
||||
conspicuously and appropriately publish on each copy an appropriate
|
||||
copyright notice and disclaimer of warranty; keep intact all the
|
||||
notices that refer to this License and to the absence of any warranty;
|
||||
and give any other recipients of the Program a copy of this License
|
||||
along with the Program.
|
||||
|
||||
You may charge a fee for the physical act of transferring a copy, and
|
||||
you may at your option offer warranty protection in exchange for a fee.
|
||||
|
||||
2. You may modify your copy or copies of the Program or any portion
|
||||
of it, thus forming a work based on the Program, and copy and
|
||||
distribute such modifications or work under the terms of Section 1
|
||||
above, provided that you also meet all of these conditions:
|
||||
|
||||
a) The modified work must itself be a software library.
|
||||
|
||||
b) You must cause the files modified to carry prominent notices
|
||||
a) You must cause the modified files to carry prominent notices
|
||||
stating that you changed the files and the date of any change.
|
||||
|
||||
c) You must cause the whole of the work to be licensed at no
|
||||
charge to all third parties under the terms of this License.
|
||||
|
||||
d) If a facility in the modified Library refers to a function or a
|
||||
table of data to be supplied by an application program that uses
|
||||
the facility, other than as an argument passed when the facility
|
||||
is invoked, then you must make a good faith effort to ensure that,
|
||||
in the event an application does not supply such function or
|
||||
table, the facility still operates, and performs whatever part of
|
||||
its purpose remains meaningful.
|
||||
|
||||
(For example, a function in a library to compute square roots has
|
||||
a purpose that is entirely well-defined independent of the
|
||||
application. Therefore, Subsection 2d requires that any
|
||||
application-supplied function or table used by this function must
|
||||
be optional: if the application does not supply it, the square
|
||||
root function must still compute square roots.)
|
||||
b) You must cause any work that you distribute or publish, that in
|
||||
whole or in part contains or is derived from the Program or any
|
||||
part thereof, to be licensed as a whole at no charge to all third
|
||||
parties under the terms of this License.
|
||||
|
||||
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
|
||||
identifiable sections of that work are not derived from the Library,
|
||||
identifiable sections of that work are not derived from the Program,
|
||||
and can be reasonably considered independent and separate works in
|
||||
themselves, then this License, and its terms, do not apply to those
|
||||
sections when you distribute them as separate works. But when you
|
||||
distribute the same sections as part of a whole which is a work based
|
||||
on the Library, the distribution of the whole must be on the terms of
|
||||
on the Program, the distribution of the whole must be on the terms of
|
||||
this License, whose permissions for other licensees extend to the
|
||||
entire whole, and thus to each and every part regardless of who wrote
|
||||
it.
|
||||
entire whole, and thus to each and every part regardless of who wrote it.
|
||||
|
||||
Thus, it is not the intent of this section to claim rights or contest
|
||||
your rights to work written entirely by you; rather, the intent is to
|
||||
exercise the right to control the distribution of derivative or
|
||||
collective works based on the Library.
|
||||
collective works based on the Program.
|
||||
|
||||
In addition, mere aggregation of another work not based on the Library
|
||||
with the Library (or with a work based on the Library) on a volume of
|
||||
In addition, mere aggregation of another work not based on the Program
|
||||
with the Program (or with a work based on the Program) on a volume of
|
||||
a storage or distribution medium does not bring the other work under
|
||||
the scope of this License.
|
||||
|
||||
3. You may opt to apply the terms of the ordinary GNU General Public
|
||||
License instead of this License to a given copy of the Library. To do
|
||||
this, you must alter all the notices that refer to this License, so
|
||||
that they refer to the ordinary GNU General Public License, version 2,
|
||||
instead of to this License. (If a newer version than version 2 of the
|
||||
ordinary GNU General Public License has appeared, then you can specify
|
||||
that version instead if you wish.) Do not make any other change in
|
||||
these notices.
|
||||
|
||||
Once this change is made in a given copy, it is irreversible for
|
||||
that copy, so the ordinary GNU General Public License applies to all
|
||||
subsequent copies and derivative works made from that copy.
|
||||
3. You may copy and distribute the Program (or a work based on it,
|
||||
under Section 2) in object code or executable form under the terms of
|
||||
Sections 1 and 2 above provided that you also do one of the following:
|
||||
|
||||
This option is useful when you wish to copy part of the code of
|
||||
the Library into a program that is not a library.
|
||||
a) 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; or,
|
||||
|
||||
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.
|
||||
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,
|
||||
|
||||
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
|
||||
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.
|
||||
|
||||
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.
|
||||
4. You may not copy, modify, sublicense, or distribute the Program
|
||||
except as expressly provided under this License. Any attempt
|
||||
otherwise to copy, modify, sublicense or distribute the Program 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.
|
||||
|
||||
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
|
||||
5. You are not required to accept this License, since you have not
|
||||
signed it. However, nothing else grants you permission to modify or
|
||||
distribute the Library or its derivative works. These actions are
|
||||
distribute the Program or its derivative works. These actions are
|
||||
prohibited by law if you do not accept this License. Therefore, by
|
||||
modifying or distributing the Library (or any work based on the
|
||||
Library), you indicate your acceptance of this License to do so, and
|
||||
modifying or distributing the Program (or any work based on the
|
||||
Program), you indicate your acceptance of this License to do so, and
|
||||
all its terms and conditions for copying, distributing or modifying
|
||||
the Library or works based on it.
|
||||
the Program or works based on it.
|
||||
|
||||
10. Each time you redistribute the Library (or any work based on the
|
||||
Library), the recipient automatically receives a license from the
|
||||
original licensor to copy, distribute, link with or modify the Library
|
||||
subject to these terms and conditions. You may not impose any further
|
||||
6. Each time you redistribute the Program (or any work based on the
|
||||
Program), the recipient automatically receives a license from the
|
||||
original licensor to copy, distribute or modify the Program subject to
|
||||
these terms and conditions. You may not impose any further
|
||||
restrictions on the recipients' exercise of the rights granted herein.
|
||||
You are not responsible for enforcing compliance by third parties to
|
||||
this License.
|
||||
|
||||
11. If, as a consequence of a court judgment or allegation of patent
|
||||
|
||||
7. If, as a consequence of a court judgment or allegation of patent
|
||||
infringement or for any other reason (not limited to patent issues),
|
||||
conditions are imposed on you (whether by court order, agreement or
|
||||
otherwise) that contradict the conditions of this License, they do not
|
||||
excuse you from the conditions of this License. If you cannot
|
||||
distribute so as to satisfy simultaneously your obligations under this
|
||||
License and any other pertinent obligations, then as a consequence you
|
||||
may not distribute the Library at all. For example, if a patent
|
||||
license would not permit royalty-free redistribution of the Library by
|
||||
may not distribute the Program at all. For example, if a patent
|
||||
license would not permit royalty-free redistribution of the Program by
|
||||
all those who receive copies directly or indirectly through you, then
|
||||
the only way you could satisfy both it and this License would be to
|
||||
refrain entirely from distribution of the Library.
|
||||
refrain entirely from distribution of the Program.
|
||||
|
||||
If any portion of this section is held invalid or unenforceable under any
|
||||
particular circumstance, the balance of the section is intended to apply,
|
||||
and the section as a whole is intended to apply in other circumstances.
|
||||
If any portion of this section is held invalid or unenforceable under
|
||||
any particular circumstance, the balance of the section is intended to
|
||||
apply and the section as a whole is intended to apply in other
|
||||
circumstances.
|
||||
|
||||
It is not the purpose of this section to induce you to infringe any
|
||||
patents or other property right claims or to contest validity of any
|
||||
such claims; this section has the sole purpose of protecting the
|
||||
integrity of the free software distribution system which is
|
||||
integrity of the free software distribution system, which is
|
||||
implemented by public license practices. Many people have made
|
||||
generous contributions to the wide range of software distributed
|
||||
through that system in reliance on consistent application of that
|
||||
|
|
@ -380,102 +226,117 @@ impose that choice.
|
|||
|
||||
This section is intended to make thoroughly clear what is believed to
|
||||
be a consequence of the rest of this License.
|
||||
|
||||
12. If the distribution and/or use of the Library is restricted in
|
||||
|
||||
8. If the distribution and/or use of the Program is restricted in
|
||||
certain countries either by patents or by copyrighted interfaces, the
|
||||
original copyright holder who places the Library under this License may add
|
||||
an explicit geographical distribution limitation excluding those countries,
|
||||
so that distribution is permitted only in or among countries not thus
|
||||
excluded. In such case, this License incorporates the limitation as if
|
||||
written in the body of this License.
|
||||
original copyright holder who places the Program under this License
|
||||
may add an explicit geographical distribution limitation excluding
|
||||
those countries, so that distribution is permitted only in or among
|
||||
countries not thus excluded. In such case, this License incorporates
|
||||
the limitation as if written in the body of this License.
|
||||
|
||||
13. The Free Software Foundation may publish revised and/or new
|
||||
versions of the Library General Public License from time to time.
|
||||
Such new versions will be similar in spirit to the present version,
|
||||
but may differ in detail to address new problems or concerns.
|
||||
9. The Free Software Foundation may publish revised and/or new versions
|
||||
of the General Public License from time to time. Such new versions will
|
||||
be similar in spirit to the present version, but may differ in detail to
|
||||
address new problems or concerns.
|
||||
|
||||
Each version is given a distinguishing version number. If the Library
|
||||
specifies a version number of this License which applies to it and
|
||||
"any later version", you have the option of following the terms and
|
||||
conditions either of that version or of any later version published by
|
||||
the Free Software Foundation. If the Library does not specify a
|
||||
license version number, you may choose any version ever published by
|
||||
the Free Software Foundation.
|
||||
|
||||
14. If you wish to incorporate parts of the Library into other free
|
||||
programs whose distribution conditions are incompatible with these,
|
||||
write to the author to ask for permission. For software which is
|
||||
copyrighted by the Free Software Foundation, write to the Free
|
||||
Software Foundation; we sometimes make exceptions for this. Our
|
||||
decision will be guided by the two goals of preserving the free status
|
||||
of all derivatives of our free software and of promoting the sharing
|
||||
and reuse of software generally.
|
||||
Each version is given a distinguishing version number. If the Program
|
||||
specifies a version number of this License which applies to it and "any
|
||||
later version", you have the option of following the terms and conditions
|
||||
either of that version or of any later version published by the Free
|
||||
Software Foundation. If the Program does not specify a version number of
|
||||
this License, you may choose any version ever published by the Free Software
|
||||
Foundation.
|
||||
|
||||
NO WARRANTY
|
||||
10. If you wish to incorporate parts of the Program into other free
|
||||
programs whose distribution conditions are different, write to the author
|
||||
to ask for permission. For software which is copyrighted by the Free
|
||||
Software Foundation, write to the Free Software Foundation; we sometimes
|
||||
make exceptions for this. Our decision will be guided by the two goals
|
||||
of preserving the free status of all derivatives of our free software and
|
||||
of promoting the sharing and reuse of software generally.
|
||||
|
||||
15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
|
||||
WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
|
||||
EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
|
||||
OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
|
||||
KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
|
||||
LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
|
||||
THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||
NO WARRANTY
|
||||
|
||||
16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
|
||||
WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
|
||||
AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
|
||||
FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
|
||||
CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
|
||||
LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
|
||||
RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
|
||||
FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
|
||||
SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
|
||||
DAMAGES.
|
||||
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
|
||||
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
|
||||
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
|
||||
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
|
||||
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
|
||||
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
|
||||
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
|
||||
REPAIR OR CORRECTION.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
How to Apply These Terms to Your New Libraries
|
||||
12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
|
||||
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
|
||||
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
|
||||
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
|
||||
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
|
||||
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
|
||||
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
|
||||
POSSIBILITY OF SUCH DAMAGES.
|
||||
|
||||
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).
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
To apply these terms, attach the following notices to the library. It is
|
||||
safest to attach them to the start of each source file to most effectively
|
||||
convey the exclusion of warranty; and each file should have at least the
|
||||
"copyright" line and a pointer to where the full notice is found.
|
||||
|
||||
<one line to give the library's name and a brief idea of what it does.>
|
||||
Copyright (C) <year> <name of author>
|
||||
How to Apply These Terms to Your New Programs
|
||||
|
||||
This library is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU Library General Public
|
||||
License as published by the Free Software Foundation; either
|
||||
version 2 of the License, or (at your option) any later version.
|
||||
If you develop a new program, and you want it to be of the greatest
|
||||
possible use to the public, the best way to achieve this is to make it
|
||||
free software which everyone can redistribute and change under these terms.
|
||||
|
||||
This library is distributed in the hope that it will be useful,
|
||||
To do so, attach the following notices to the program. It is safest
|
||||
to attach them to the start of each source file to most effectively
|
||||
convey the exclusion of warranty; and each file should have at least
|
||||
the "copyright" line and a pointer to where the full notice is found.
|
||||
|
||||
<one line to give the program's name and a brief idea of what it does.>
|
||||
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
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
Library General Public License for more details.
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
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.
|
||||
|
||||
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
|
||||
school, if any, to sign a "copyright disclaimer" for the library, if
|
||||
school, if any, to sign a "copyright disclaimer" for the program, if
|
||||
necessary. Here is a sample; alter the names:
|
||||
|
||||
Yoyodyne, Inc., hereby disclaims all copyright interest in the
|
||||
library `Frob' (a library for tweaking knobs) written by James Random Hacker.
|
||||
Yoyodyne, Inc., hereby disclaims all copyright interest in the program
|
||||
`Gnomovision' (which makes passes at compilers) written by James Hacker.
|
||||
|
||||
<signature of Ty Coon>, 1 April 1990
|
||||
<signature of Ty Coon>, 1 April 1989
|
||||
Ty Coon, President of Vice
|
||||
|
||||
That's all there is to it!
|
||||
This General Public License does not permit incorporating your program into
|
||||
proprietary programs. If your program is a subroutine library, you may
|
||||
consider it more useful to permit linking proprietary applications with the
|
||||
library. If this is what you want to do, use the GNU Library General
|
||||
Public License instead of this License.
|
||||
|
|
|
|||
46
Makefile
46
Makefile
|
|
@ -1,30 +1,54 @@
|
|||
### Make file du projet Janat
|
||||
### HEADER HERE
|
||||
###
|
||||
|
||||
PROJECT_NAME=libnazgul
|
||||
TIMESTAMP:= $(shell date +"%Y-%m-%d_r%H%M")
|
||||
ARCHIVE:= $(PROJECT_NAME)-$(TIMESTAMP).tar.bz2
|
||||
PRJNAME=Libnazgul
|
||||
GDATE:= $(shell date +"%Y-%m-%d_r%H%M")
|
||||
GFILENAME:= $(PRJNAME)-$(GDATE).tar.bz2
|
||||
PATH_GFILENAME:= ../$(GFILENAME)
|
||||
GFILESIZE:=
|
||||
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
|
||||
WGET=wget -P lib/
|
||||
|
||||
all: subdir
|
||||
all: subdir
|
||||
|
||||
run:
|
||||
( cd src/ ; \
|
||||
$(MAKE) run )
|
||||
|
||||
subdir:
|
||||
$(MAKE) -C src/
|
||||
$(MAKE) -C test/
|
||||
( cd src/ ; \
|
||||
$(MAKE) )
|
||||
|
||||
doc:
|
||||
$(MAKE) -C doc/rapport
|
||||
( cd src/ ; \
|
||||
$(MAKE) doc )
|
||||
|
||||
clean:
|
||||
$(MAKE) clean -C src/
|
||||
$(MAKE) clean -C test/
|
||||
$(MAKE) clean -C doc/rapport/
|
||||
@rm -f *.class *~
|
||||
|
||||
package: clean createpackage sendtoarchives
|
||||
|
||||
zip:
|
||||
tar -cjvf ../$(ARCHIVE) -C ../ $(PROJECT_NAME)
|
||||
#mail: clean createpackage sendpackage sendtoarchives
|
||||
|
||||
createpackage:
|
||||
mv lib ../lib$(GDATE)
|
||||
tar -cjvf $(PATH_GFILENAME) -C ../ $(PRJNAME)
|
||||
mv ../lib$(GDATE) lib
|
||||
|
||||
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)"
|
||||
|
||||
|
|
|
|||
5
NOTES
Normal file
5
NOTES
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
aller voir du coté des classes:
|
||||
- GeneralPath
|
||||
- QuadCurves2D
|
||||
- ...
|
||||
|
||||
54
README
54
README
|
|
@ -1,54 +1,8 @@
|
|||
#-------------------------------------------------------------------%
|
||||
#
|
||||
# LIBNAZGUL
|
||||
#
|
||||
#-------------------------------------------------------------------%
|
||||
#
|
||||
# IUP GMI 2nd year,
|
||||
# Project for the Operating Systems course,
|
||||
# Classes by J-M. Rifflet, 2003-2004.
|
||||
#
|
||||
#-------------------------------------------------------------------%
|
||||
#
|
||||
# Authors :
|
||||
#
|
||||
# Glenn ROLLAND
|
||||
# Sebastian SCHAWOHL
|
||||
# Rivka ZANA
|
||||
#
|
||||
#-------------------------------------------------------------------%
|
||||
|
||||
Un readme qui explique le fonctionnement du projet
|
||||
|
||||
COMPILATION
|
||||
~~~~~~~~~~~
|
||||
Pour compiler le projet mettez-vous à la racine et faites 'make',
|
||||
ce qui créera notre bibliothèque statique 'libnazgul.a' dans src/
|
||||
ainsi que les programmes de test dans 'test/'.
|
||||
INTERFACE
|
||||
~~~~~~~~~
|
||||
|
||||
|
||||
|
||||
UTILISATION
|
||||
~~~~~~~~~~~
|
||||
Une fois le projet compilé (voir au-dessus), il vous suffit :
|
||||
|
||||
* Pendant l'écriture de vos programmes :
|
||||
- de mettre "#include "libnazgul.h"" au début de votre programme .c,
|
||||
|
||||
* A la compilation
|
||||
- spécifier (option -I) le répertoire où se trouvent les en-têtes (.h)
|
||||
de la bibliothèque libnazgul
|
||||
- indiquer (option -L) le chemin vers le fichier 'libnazgul.a'
|
||||
- renseigner le compilateur (-l) sur les bibliotheques utilisées :
|
||||
libnazgul, librt, et libpthreads.
|
||||
|
||||
Vous pourrez ainsi utiliser toutes les fonctions de notre bibliothèque.
|
||||
|
||||
|
||||
|
||||
DOCUMENTATION & RAPPORT
|
||||
~~~~~~~~~~~~~~~~~~~~~~~
|
||||
Pour voir la documentation allez dans le répertoire '/doc/'. S'y trouve
|
||||
l'énoncé et un répertoire 'rapport' qui contient le rapport. Allez
|
||||
dans celui-ci (donc /doc/rapport/) et faites 'make'. Ceci créera
|
||||
le rapport sous plusieurs formats (dvi, postscript, pdf).
|
||||
blabla
|
||||
|
||||
|
|
|
|||
|
|
@ -1,58 +0,0 @@
|
|||
LATEX = latex
|
||||
PDFLATEX = pdflatex
|
||||
PSLATEX = pslatex
|
||||
DVIPDF = dvipdf
|
||||
DVIPS = dvips
|
||||
PS2PDF = ps2pdf
|
||||
GDATE := $(shell date +"-%Y-%m-%d_r%H")
|
||||
GFILENAME := CDC$(GDATE).tar.bz2
|
||||
LOCALDIR = $(shell pwd)
|
||||
MAINFILE = rapport
|
||||
|
||||
|
||||
#PNGFILES := $(shell ls *.png)
|
||||
#EPSFILES := $(patsubst %.png,%.eps,$(PNGFILES))
|
||||
#PNG2EPSCC = convert
|
||||
TEXFILES := $(MAINFILE).tex
|
||||
DVIFILES := $(MAINFILE).dvi
|
||||
PDFFILES := $(MAINFILE).pdf
|
||||
PSFILES := $(MAINFILE).ps
|
||||
|
||||
all: dvi dvi ps pdf pdf
|
||||
|
||||
#png2eps: $(EPSFILES)
|
||||
|
||||
#%.eps : %.png
|
||||
# @$(PNG2EPSCC) $< $@
|
||||
# @echo -e "png2eps\t$< $@"
|
||||
|
||||
clean:
|
||||
@rm -f rapport.dvi rapport.rtf rapport.pdf rapport.ps
|
||||
@rm -f *.out *.log *.toc *.aux
|
||||
# @rm -f *.eps
|
||||
@rm -f *~
|
||||
|
||||
pdf: $(TEXFILES)
|
||||
$(PDFLATEX) $(TEXFILES)
|
||||
|
||||
ps: $(TEXFILES)
|
||||
$(DVIPS) $(DVIFILES)
|
||||
|
||||
dvi: $(PRJFILES)
|
||||
$(LATEX) $(TEXFILES)
|
||||
|
||||
#mail: package sendmail
|
||||
#
|
||||
#pdfmail :
|
||||
# make && make
|
||||
# echo "Et voila le dernier pdf" | mutt lsr-dev -a $(PDFFILES) -s "[CDC] Rev$(GDATE) (en PDF)"
|
||||
#
|
||||
#sendmail:
|
||||
# echo "Et voila" | mutt lsr-dev -a ../Archives/$(GFILENAME) -s "[CDC] Rev$(GDATE) (en TeX)"
|
||||
#
|
||||
|
||||
package: clean storefile
|
||||
|
||||
#storefile:
|
||||
# tar -cjvf ../$(GFILENAME) -C ../ cdc
|
||||
# mv ../$(GFILENAME) ../Archives
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
\section{Arborescence du projet}
|
||||
\par L'archive du projet contient (au moins) les répertoires et fichiers suivants :
|
||||
\begin{verbatim}
|
||||
Libnazgul/
|
||||
|-- README // Instructions pour la compilation du projet
|
||||
|-- HEADER // Header du projet Libnazgul
|
||||
|-- LICENSE // Licence qui couvre le projet
|
||||
|-- Makefile // Règles de compilation
|
||||
|-- doc/
|
||||
| |-- ennonce // Enoncé du projet en format postscript
|
||||
| `-- rapport/ // Rapport Latex
|
||||
| |-- Makefile // Règles de compilation
|
||||
| `-- ...
|
||||
|
|
||||
|--test
|
||||
| |-- Makefile // Règles de compilation
|
||||
| |-- create_delete // Le main de la fonction
|
||||
| `-- *.c // Programmes de test
|
||||
|
|
||||
`-- src/ // Sources de la bibliothèque
|
||||
|-- Makefile // Règles de compilation
|
||||
|-- *.h // En-têtes pour l'utilisation de Libnazgul
|
||||
`-- *.c // Sources de Libnazgul
|
||||
\end{verbatim}
|
||||
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
\chapter{Conclusion}
|
||||
|
||||
\par Nous avons fini le projet, mais il n'est certainement pas exempt
|
||||
de bugs et d'autres défauts.
|
||||
C'est pourquoi dans l'avenir, il faudrai corriger les bogues éventuels que
|
||||
tous nos tests n'auraient pas fait appara{\^i}tre. Le ``code'' lui-même pourrait {\^e}tre grandement amélioré et allégé car des choses plus ``subtiles'' auraient pu être écrite à certains endroits (nécessitant malheureusement un peu plus de temps).
|
||||
|
||||
\par De même la gestion des codes d'erreurs renvoyés par les fonctions pourrait être améliorée et la facilité de débuggage augmentée.
|
||||
|
||||
\par Il serait également possible de faire en sorte d'utiliser moins de
|
||||
mémoire en réduisant le nombre de segment de mémoire partagée, mais pour
|
||||
cela il faudrai changer de structures de données.
|
||||
|
||||
\par De plus nous aimerions (d'ici la soutenance) rendre les outils de test et d'analyse des espaces de messages plus complet.
|
||||
|
||||
\par Enfin nous tenons à remercier M. Rifflet pour le cours (et son livre) ainsi que M. Bertier pour leurs nombreuses explications (si précieuses) qu'ils nous tout deux apportés.
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
\title{Rapport du projet de système: Libnazgul \\ \today}
|
||||
\date{}
|
||||
\author{\vspace{1cm} \\ {\sc Cours de système} \\
|
||||
de Jean-Marie Rifflet et Marin Bertier. \\~\\
|
||||
{\sc Université Paris 7 - Denis Diderot.}
|
||||
\\ \vspace{3cm} \\
|
||||
\begin{tabular}{ r l l }
|
||||
& Glenn ROLLAND & {\em $<$glenux@fr.st$>$}, \\
|
||||
& Sebastian SCHAWOHL & {\em $<$stormrider@nerim.fr$>$},\\
|
||||
& Rivka ZANA & {\em $<$rivka\_zan@hotmail.com$>$}
|
||||
\end{tabular}
|
||||
}
|
||||
%& Rivka ZANA & {\em $<$crivka@caramail.com$>$}
|
||||
%\date{\today}
|
||||
%\title{Janat}
|
||||
%\author{Par Moi}
|
||||
\maketitle
|
||||
|
|
@ -1,169 +0,0 @@
|
|||
\chapter{Le développement}
|
||||
|
||||
\section{Outils utilisés pour le développement}
|
||||
|
||||
\subsection{Travail collaboratif}
|
||||
|
||||
\par Nous avons travaillé ensemble gr{\^a}ce à CVS (Concurrent Versions System). Notre projet est hébergé chez Sourceforge\footnote{\url{http://www.sourceforge.net}}.
|
||||
Le CVS permet la modification du code du projet en m{\^e}me temps par plusieurs
|
||||
personnes. Les modifications et les mises à jour de chacun des membres du projet peuvent
|
||||
ainsi être diffusées instantanément, avec un risque minimisé de conflits lors des modifications du m{\^e}me code.
|
||||
|
||||
|
||||
\subsection{Moyens techniques}
|
||||
|
||||
\par Chacun selon nos préférences, nous avons utilisés des machines sous GNU/Linux ou Microsoft Windows et codé avec Vim.
|
||||
La personne sous Microsoft Windows avait une session graphique sur un serveur GNU/Linux, appartenant a un autre membre du projet,
|
||||
gr{\^a}ce à l'utilisation de VNC\footnote{\url{http://www.realvnc.com}} (Virtual Network Computing).
|
||||
Cela afin de permettre à l'utilisateur de Microsoft Windows de pouvoir compiler et tester
|
||||
la bibliothèque dans de meilleurs conditions que sous son système initial\ldots
|
||||
|
||||
|
||||
\section{Programmation}
|
||||
|
||||
\subsection{Description des fonctions et de leurs effets}
|
||||
|
||||
\par Nous allons dresser un descriptif de l'utilité des fonctions
|
||||
utilisées dans notre bibliothèque. Vous trouverez tous les prototypes
|
||||
des fonctions dans le fichier \\``\verb+/src/proto.h+'', avec en
|
||||
commentaire le fichier d'où il est issu. Par contre pour les fonctions
|
||||
qui génèrent les {\em ids}, leur prototype est dans le fichier ``\verb+/src/ids.h+'', généré par ``\verb+/src/ids.c+''.
|
||||
|
||||
\par Le fichier ``\verb+/src/proto.h+'' est connu des logiciels qui utilisent
|
||||
notre bibliothèque, tandis que ``\verb+/src/ids.h+'' non.
|
||||
Nous allons donc vous décrire nos différentes fonctions en les classant
|
||||
par famille.
|
||||
\newline
|
||||
|
||||
\par Nous avons quatre grandes {\em familles} de fonctions.
|
||||
|
||||
\begin{description}
|
||||
\item[msgBuffer*]{Ce sont toutes les fonctions qui concernent les
|
||||
buffers : création, attachement aux processus\ldots}
|
||||
|
||||
\item[msgPool*]{Ce sont les fonctions qui permettent de créer ou de
|
||||
détruire une {\em pool}, de l'ouvrir ou encore de poser un ``verrou''.
|
||||
\begin{description}
|
||||
|
||||
\item[msgPool*]{Fonctions servant à gérer une {\em pool}, qui
|
||||
correspond à un ensemble de {\em buffers}.}
|
||||
|
||||
\item[msgPoolDataTab*]{Fonctions utiles pour la gestion des
|
||||
informations d'une {\em pool} telles que la taille des {\em buffers},
|
||||
leur nombre\dots}
|
||||
\end{description}
|
||||
}
|
||||
|
||||
\item[msgQueue*]{Toutes les fonctions gérant les ``queues'', {\em
|
||||
files de messages}. On y trouve celle qui en créé une, celles i
|
||||
qui vérifient si elle est disponible ou pas, celles qui ajoutent
|
||||
un élément ou au contraire en enlève un.
|
||||
\begin{description}
|
||||
\item[msgQueue*]{ Rassemble toutes les fonctions servant à la gestion
|
||||
des files de messages.}
|
||||
|
||||
\item[msgQueueElem*]{ Les fonctions utiles pour gérer un élément
|
||||
d'une file de messages.}
|
||||
|
||||
\item[msgQueue(Prot|Read)*]{Fonctions servant à protéger une file
|
||||
({\em read} indique la disponibilité d'une ressource en lecture,
|
||||
{\em Prot} la protection contre les modification).}
|
||||
\end{description}
|
||||
}
|
||||
\item[msgSpace*]{Ensemble de fonctions qui gèrent les espaces de
|
||||
messages : création, ouverture, listes\ldots
|
||||
\begin{description}
|
||||
\item[msgSpace*]{Fonctions pour la création, ``ouverture'', ``fermeture''\dots d'un espace de messages.}
|
||||
|
||||
\item[msgSpaceList*]{Ce sont toutes les fonctions utiles pour la
|
||||
gestion de la liste cha{\^i}née des {\em msgSpace} existants.}
|
||||
|
||||
\item[msgSpaceListElem*]{ Fonctions correspondant à la gestion d'un
|
||||
élément de la {\em msgSpaceList}.}
|
||||
\end{description}
|
||||
}
|
||||
\end{description}
|
||||
|
||||
|
||||
\subsection{Détails sur certaines fonctions}
|
||||
|
||||
\par Nous détaillerons ici quelques fonctions qui peuvent ne pas
|
||||
par{\^i}tre claires, malgré les explications au-dessus, ou qui n'ont
|
||||
pas encore été abordées.
|
||||
|
||||
\par Voici la liste des fonctions non abordées dans la partie
|
||||
précédente, mais néanmoins utiles pour la compréhension de notre
|
||||
bibliotèque. Les fonctions pour la génération d'{\em ids} ne seront
|
||||
pas traitées ici, car leur utilité est décrite dans la partie {\sc Difficultés recontrées}.
|
||||
|
||||
\begin{itemize}
|
||||
\item{\sc msgAllocate(\dots)} Prend en argument : un espace de mesage\\
|
||||
{\em msgSpace *}, un numéro de {\em pool} qui est un {\em int}, une
|
||||
taille {\em int} et une option {\em int}. Cette fonction, comme
|
||||
spécifié dans l'énoncé, alloue un buffer
|
||||
dans le {\em pool} spécifié, ou sinon dans le {\em pool} le plus proche
|
||||
en taille (supérieure ou égale) et qui sera ``potentiellement'' libre
|
||||
le plus rapidement, sauf s'il l'est déjà. Pour cela, on regarde le
|
||||
nombre de {\em locks}, qu'il y a dessus gr{\^a}ce aux sémaphores. On
|
||||
choisit le buffer dont le {\em pool} a le moins de ``locks'' en fonction
|
||||
du nombre de ses buffers.
|
||||
\item{\sc msgFree(\dots)} Cette fonction prend en argument un espace de
|
||||
message {\em msgSpace *} et l'adresse d'un buffer {\em void *}. Celle-ci
|
||||
restitue le buffer au {\em pool} d'où il a été extrait.
|
||||
\item{\sc msgGet(\dots)} Notre fonction {\em void * msgGet(\dots)}, est
|
||||
telle qu'elle corresponde bien à l'énoncé. Elle prend en argument un
|
||||
espace de messages {\em msgSpace *}, un numéro de file, ou {\em queue},
|
||||
{\em int} et l'adresse d'un buffer {\em void *}. Elle renvoie l'adresse
|
||||
du buffer en t{\^e}te de la file du numéro donné dans l'espace de
|
||||
messages spécifiés. Lors d'un appel à cette fonction, celle-ci
|
||||
``locke'' d'abord le sémaphore qu'il y a sur la {\em queue}. Si la file
|
||||
est vide, cela bloque le {\em get}.\\
|
||||
{\sc Remarque :} Nous n'avons pas implémenté le cas du \verb+ANYFILE+.
|
||||
\item{\sc msgPut(\dots)} Cette fonction fait exactement ce qu'elle est
|
||||
sensée faire tel que énoncé dans le rapport. Elle prend en argument un
|
||||
espace de messages {\em msgSpace *}, un numéro de file, ou {\em queue}, {\em int} et
|
||||
l'adresse d'un buffer {\em void *}. Elle insère le buffer dans le numéro
|
||||
de file de messages de l'espace de messages. Lorsque l'on appelle cette
|
||||
fonction, à la fin, on ``délocke'' le sémaphore sur la {\em queue}.
|
||||
\end{itemize}
|
||||
\newpage
|
||||
|
||||
\section{Difficultés rencontrées}
|
||||
|
||||
\subsection{Restrictions}
|
||||
\par Nous n'avons pas eu de grosses difficultés à proprement parler.
|
||||
Nous avions juste quelques restrictions, comme le fait de ne pas
|
||||
pouvoir utiliser de pointeurs absolus, car l'espace d'adressage entre
|
||||
les différents processus n'est pas forcément le m{\^e}me. Ils ont
|
||||
seulement un segment de mémoire partagée en commun.
|
||||
\par Il a donc fallu utiliser les différentes {\em id} (c'est à dire les identifiants POSIX) des espaces de messages {\em msgSpace}, des {\em pools}
|
||||
et autres types de données stockées en mémoire partagée pour pouvoir permettre a tous les processus d'accéder correctement aux données.
|
||||
|
||||
\subsection{Libertés d'implémentations de POSIX\ldots}
|
||||
|
||||
\par Le choix des identifiants ne fut pas simple non plus, car il
|
||||
fallait en changer en fonction des différentes implémentations de POSIX.
|
||||
En effet la norme POSIX précise que l'identifiant doit commencer par un ``\verb+/+'' et si possible ne pas en comporter d'autres.
|
||||
\par Si cela est vrai sur certains systèmes (comme GNU/Linux) d'autres
|
||||
systemes (HP-UX, SunOS) requièrent que cet identifiant corresponde
|
||||
au chemin absolu (dans l'arborescence UNIX) d'un fichier sur lequel
|
||||
on possède des droits\ldots
|
||||
|
||||
\par Nous avons donc choisi les identifiants du type
|
||||
``\verb+/tmp/identifiant+'', qui pour les systèmes avec la restrictions précédente et ``\verb+/identifiant+'' sur les autres. i
|
||||
Cela nous a également conduit à faire une distinction dans le \verb+Makefile+
|
||||
entre les options de compilation pour {\em HP-UX}, {\em SunOS} ou {\em Linux}.
|
||||
\par Malheureusement le fait de travailler sur plusieurs types de
|
||||
machines n'était pas seulement g{\^e}nant pour les identifiants,
|
||||
mais également pour créer la bibliothèque. En effet, il faut ajouter
|
||||
plus ou moins d'options à la compilation: soit il faut ajouter \verb+-lrt+, dans un cas ou \verb+-lrt -lpthread+ dans l'autre. Ceci afin
|
||||
d'inclure les bonnes librairies pour que notre bibliothèque puisse
|
||||
compiler et fonctionner convenablement.
|
||||
|
||||
\par La seconde difficulté liée à POSIX, est la projection de fichier
|
||||
ou {\em mapping} avec {\em mmap}. Selon l'implémentation, l'offset (décalage par rapport au début de l'addresse mémoire du fichier) peut éventuellement {\^e}tre aligné sur la taille des pages mémoires\ldots
|
||||
\par Ceci est assez génant lorsque l'on veut accéder à bloc de donnée
|
||||
qui peut commencer n'importe où dans la zone de mémoire partagée.
|
||||
Pour remédier à cela, nous {\em mappons} du début de la zone mémoire partagée jusqu'à ``juste derrière'' le bloc de donnée qui nous intéresse.
|
||||
\par Puis nous changeons les droits d'acces (\verb+mprotect+) pour nous autoriser la modifiction uniquement sur le bloc de données qui nous intéresse.
|
||||
\par Enfin nous opérons le décalage d'addresse ``à la main'' et renvoyons l'addresse qui correspond au début du bloc de données demandé.
|
||||
|
|
@ -1,44 +0,0 @@
|
|||
\chapter{À propos du projet}
|
||||
|
||||
\section{Conditions d'utilisation}
|
||||
\par Ce programme est un logiciel libre; vous pouvez le redistribuer et/ou
|
||||
le modifier conformément aux dispositions de la Licence Publique Générale GNU,
|
||||
telle que publiée par la Free Software Foundation; version 2 de la licence, ou encore toute version ultérieure.
|
||||
\par Ce programme est distribué dans l'espoir qu'il sera utile, mais {\em sans aucune garantie}; sans même la garantie implicite de {\em commercialisation} ou {\em d'adaptation à un objet particulier}. Pour plus de détails, voir la Licence Publique Générale GNU.
|
||||
\par Un exemplaire de la Licence Publique Générale GNU doit être fourni avec ce programme; si ce n'est pas le cas, écrivez à la Free Software Foundation Inc., 675 Mass Ave, Cambridge, MA 02139, Etats-Unis.
|
||||
|
||||
\section{Les auteurs}
|
||||
|
||||
\par Le projet est réalisé par Glenn ROLLAND, Sebastian SCHAWOHL et Rivka ZANA, élèves en 2ème année d'IUP GMI à l'Université Paris 7 - Denis Diderot.
|
||||
|
||||
\section{Les objectifs}
|
||||
\par L'objectif de ce projet est de réaliser une bibliothèque permettant
|
||||
à plusieurs processus d'un m{\^e}me sytème de communiquer entre eux via des files de messages, sans faire la recopie de ces messages dans l'espace
|
||||
d'adressage du noyau.
|
||||
\par Nous devions donc mettre en oeuvre les techniques de la programmation
|
||||
système ainsi que la création d'une bibliothèque de fonctions.
|
||||
Pour ce faire, nous avons utilisés les mécanismes de mémoire partagée et de synchronisation à la norme POSIX.
|
||||
|
||||
\section{Obtenir l'archive du projet}
|
||||
|
||||
\par L'archive du projet est sensée accompagner ce rapport. Elle se présente
|
||||
sous la forme d'un fichier tarball. Pour la décompresser il suffit de taper
|
||||
``\verb+tar -xzvf Libnazgul-XXXX-XX-XX-rYYYY.tar.gz+''.
|
||||
\par Si toutefois cette archive n'est pas présente aux c{\^o}tés de ce document,
|
||||
vous pouvez récupérer les sources du projet via CVS anonyme en tapant dans un terminal:\\
|
||||
``\verb+cvs -d:pserver:anonymous@cvs.sourceforge.net:/cvsroot/libnazgul login+''\\
|
||||
(appuyez sur la touche entrée à l'invite du mot de passe),
|
||||
puis :\\
|
||||
``\verb+cvs -z3 -d:pserver:anonymous@cvs.sourceforge.net:/cvsroot/libnazgul co libnazgul+''
|
||||
|
||||
\section{Site internet du projet}
|
||||
|
||||
\par Le projet Libnazgul est hebergé par
|
||||
Sourceforge\footnote{\url{http://www.sourceforge.net}},
|
||||
et son adresse est :
|
||||
\newline
|
||||
{\url{http://www.sourceforge.net/projects/libnazgul/}}.
|
||||
\par Ce site vous permettra de télécharger le projet, d'en avoir
|
||||
une description et éventuellement d'y contribuer.
|
||||
|
||||
\newpage
|
||||
|
|
@ -1,30 +0,0 @@
|
|||
\chapter{Manuel d'utilisation}
|
||||
|
||||
\section{Que faire de nos sources?}
|
||||
|
||||
%\subsection{Les compiler}
|
||||
|
||||
\par Pour pouvoir utiliser notre bibliotèque, il faut commencer par la
|
||||
compiler. Pour cela placez-vous dans le répertoire racine de l'archive (noté ici
|
||||
\verb+/+) ou dans son sous-répertoire \verb+src/+
|
||||
|
||||
et tapez ``\verb+make+''. Cela compilera la bibliothèque
|
||||
(fichier \verb+libnazgul.a+) ainsi que les divers programmes de test dans
|
||||
l'archive.
|
||||
|
||||
\section{Comment utiliser Libnazgul ?}
|
||||
|
||||
\par Une fois le projet compilé (voir ci-dessus), vous il vous est possible
|
||||
d'utiliser {\sc Libnazgul}.
|
||||
Il vous faudra pendant l'écriture de vos programmes C/C++,
|
||||
mettre \verb+#include libnazgul.h+ au début des fichiers utilisant la bibliothèque.
|
||||
\par De même il faudra prendre bien soin, à la compilation de vos programme de :
|
||||
\begin{itemize}
|
||||
\item{spécifier (option \verb+-I+) le répertoire où se trouvent les
|
||||
en-têtes (fichiers *.h) de la bibliothèque {\sc Libnazgul},}
|
||||
\item{indiquer (option \verb+-L+) le chemin vers le fichier \verb+libnazgul.a+,}
|
||||
\item{renseigner le compilateur (option \verb+-l+) sur les bibliotheques nécessaires pour utiliser les fonctions de {\sc Libnazgul} : nazgul, rt, et pthreads.}
|
||||
\end{itemize}
|
||||
\par Vous pourrez ainsi sans problèmes appeler toutes les fonctions fournis
|
||||
par {\sc Libnazgul} : {\it msgSpaceCreate(\ldots), msgPut(\ldots), msgFree(\ldots),
|
||||
etc\dots}
|
||||
|
|
@ -1,109 +0,0 @@
|
|||
\documentclass[12pt,a4paper]{report}
|
||||
%\usepackage{a4wide}
|
||||
\usepackage{geometry}
|
||||
%\usepackage{typehtml}
|
||||
\usepackage[latin1]{inputenc}
|
||||
%\usepackage{listings}
|
||||
\usepackage[french]{babel}
|
||||
\usepackage{fancyheadings}
|
||||
\usepackage{color}
|
||||
\usepackage{float}
|
||||
|
||||
|
||||
|
||||
\usepackage[cyr]{aeguill} % Police vectorielle TrueType, guillemets français
|
||||
%\DeclareGraphicsExtensions{.jpg,.mps,.pdf,.png} % Formats d'images
|
||||
|
||||
|
||||
%--------------------------------------------------------------
|
||||
\pagestyle{fancy}
|
||||
\rhead[{\small\sc{LIBnazgul is Not Another Zero-share Great or Ultimate Library}}]{{\small \sc{LIBnazgul is Not Another Zero-share Great or Ultimate Library}}}
|
||||
\lhead[\it{}]{\it{}}
|
||||
%\rhead[\it{Projet de Système.}]{\it{Projet de Système.}}
|
||||
|
||||
%---------------------------------------------------------------
|
||||
|
||||
|
||||
|
||||
\newif\ifpdf
|
||||
\ifx\pdfoutput\undefined
|
||||
\pdffalse
|
||||
\else
|
||||
\pdfoutput=1
|
||||
\pdftrue
|
||||
\fi
|
||||
|
||||
\ifpdf
|
||||
% ! The next three lines should be one !
|
||||
\usepackage[pdftex,colorlinks=true,urlcolor=blue,pdfstartview=FitH]{hyperref}
|
||||
\pdfcompresslevel=9
|
||||
\hypersetup{
|
||||
pdftitle={RAPPORT DU PROJET DE SYSTEME},
|
||||
pdfauthor={ROLLAND Glenn, SCHAWOHL Sebastian, ZANA Rivka},
|
||||
pdfsubject={LIBNAZGUL},
|
||||
pdfkeywords={PROJET}
|
||||
pdfcreator={GleNuX}
|
||||
}
|
||||
\usepackage[pdftex]{thumbpdf} % Vignettes
|
||||
%\usepackage[pdftex, %
|
||||
% bookmarks = true,% % Signets
|
||||
% bookmarksnumbered = true,% % Signets numérotés
|
||||
% pdfpagemode = None,% % Signets/vignettes fermé à l'ouverture
|
||||
% pdfstartview = FitH,% % La page prend toute la largeur
|
||||
% pdfpagelayout = SinglePage,% Vue par page
|
||||
% colorlinks = true,% % Liens en couleur
|
||||
% urlcolor = magenta,% % Couleur des liens externes
|
||||
% pdfborder = {0 0 0}% % Style de bordure : ici, pas de bordure
|
||||
% ]{hyperref} % Utilisation de HyperTeX
|
||||
|
||||
\usepackage[pdftex]{graphicx}
|
||||
% \usepackage[pdftex]{thumbpdf}
|
||||
\else
|
||||
\usepackage[dvips]{epsfig}
|
||||
\usepackage{hyperref}
|
||||
\usepackage[T1]{fontenc}
|
||||
\fi
|
||||
|
||||
|
||||
%---------------------------------------------------------------
|
||||
\begin{document}
|
||||
%---------------------------------------------------------------
|
||||
|
||||
\newcommand{\texima}[3]{
|
||||
\begin{figure}[H]
|
||||
\begin{center}
|
||||
\ifpdf
|
||||
% Dans le cas du PDF
|
||||
% utiliser une image .png, .jpeg ou .jpg
|
||||
\includegraphics[width=#2,height=#3]{#1.png}
|
||||
\else
|
||||
% et dans le cas du DVI / PS
|
||||
% utiliser du .ps ou du .eps
|
||||
\epsfig{figure=#1.eps,width=#2,height=#3}
|
||||
\fi
|
||||
\end{center}
|
||||
\end{figure}
|
||||
}
|
||||
\newcommand{\texillustr}[3]{
|
||||
\ifpdf
|
||||
% Dans le cas du PDF
|
||||
% utiliser une image .png, .jpeg ou .jpg
|
||||
\includegraphics[width=#2,height=#3]{#1.png}
|
||||
\else
|
||||
% et dans le cas du DVI / PS
|
||||
% utiliser du .ps ou du .eps
|
||||
\epsfig{figure=#1.eps,width=#2,height=#3}
|
||||
\fi
|
||||
}
|
||||
|
||||
|
||||
\input{couv.tex} % Page de garde
|
||||
\tableofcontents % Sommaire
|
||||
\clearpage
|
||||
\input{intro.tex} % Intro, compilation, exécution
|
||||
\input{arbo.tex} % arborescence du projet
|
||||
\input{manuel.tex} % Manuel de l'utilisateur
|
||||
\input{devel.tex} % outils, ce qu'on a pu trouver dur
|
||||
\input{avenir.tex}
|
||||
%\input{conclusion.tex} % est-ce vraiment utile ?
|
||||
\end{document}
|
||||
8
libnzg-ssh
Executable file
8
libnzg-ssh
Executable file
|
|
@ -0,0 +1,8 @@
|
|||
#!/bin/sh
|
||||
if [ -f .ssh-agent ]; then
|
||||
. .ssh-agent
|
||||
else
|
||||
killall ssh-agent
|
||||
ssh-agent > .ssh-agent
|
||||
ssh-add ~/.ssh/id_rsa
|
||||
fi
|
||||
9
libnzg-tuxfamily
Executable file
9
libnzg-tuxfamily
Executable file
|
|
@ -0,0 +1,9 @@
|
|||
#!/bin/bash
|
||||
|
||||
export CVS_RSH=ssh
|
||||
export CVSROOT=:ext:login@cvs.tuxfamily.org:/cvsroot/libnazgul
|
||||
|
||||
# ci commit
|
||||
# co new branch
|
||||
# update
|
||||
exec $SHELL
|
||||
69
src/Makefile
69
src/Makefile
|
|
@ -1,29 +1,16 @@
|
|||
#-------------------------------------------------------------------%
|
||||
#
|
||||
# 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
|
||||
#
|
||||
#-------------------------------------------------------------------%
|
||||
### HEADER HERE
|
||||
|
||||
OS=$(shell uname -s)
|
||||
# @CLASSPATH=$(CLASSPATH) $(JAVAC) $(JFLAGS) $<
|
||||
|
||||
#INCLUDES=-I/
|
||||
#LIBINC=-L
|
||||
#LIBS=
|
||||
|
||||
CC=gcc
|
||||
CFLAGS=-ggdb -Wall -O2
|
||||
#LIBS=-lrt
|
||||
CFLAGS=-ggdb -O2 -Wall
|
||||
USER_CLASSPATH:=../bin:../lib
|
||||
JFLAGS=-d ../bin -g -deprecation
|
||||
#-verbose
|
||||
PRJNAME=Libnazgul
|
||||
GDATE := $(shell date +"-%Y-%m-%d_r%H")
|
||||
GFILENAME := ../$(PRJNAME)$(GDATE).tar.bz2
|
||||
|
|
@ -31,49 +18,15 @@ LOCALDIR = $(shell pwd)
|
|||
BINDIR=../bin
|
||||
CFILES := $(shell ls *.c)
|
||||
OFILES := $(patsubst %.c,%.o,$(CFILES))
|
||||
DESTFILE=libnazgul.a
|
||||
|
||||
INCLUDES=-I /usr/lib/ -I /usr/local/lib/
|
||||
DEFINES:=
|
||||
|
||||
ifeq "SunOS" "${OS}"
|
||||
DEFINES:=-D_NZG_REALFILEID -D_NZG_SUNOS
|
||||
endif
|
||||
|
||||
ifeq "HP-UX" "${OS}"
|
||||
DEFINES:=-D_NZG_REALFILEID
|
||||
endif
|
||||
|
||||
ifeq "Linux" "${OS}"
|
||||
#DEFINES:=-D_NZG_REALFILEID
|
||||
endif
|
||||
|
||||
|
||||
all: build
|
||||
|
||||
build : $(OFILES)
|
||||
@echo -e "Creating library..."
|
||||
@ar rc $(DESTFILE) $(OFILES)
|
||||
@ranlib $(DESTFILE)
|
||||
|
||||
clean:
|
||||
@echo -e "Cleaning..."
|
||||
@rm -f *.a
|
||||
@rm -f *.o
|
||||
|
||||
%.o : %.c
|
||||
@echo -e "$(CC)\t$@"
|
||||
@$(CC) $(CFLAGS) -c $< $(INCLUDES) $(LIBINC) $(LIBS) $(DEFINES) -o $*.o
|
||||
$(CC) $(CFLAGS) $(INCLUDES) $(LIBINC) $(LIBS) -c $< -o $*.o
|
||||
|
||||
protos: $(CFILES)
|
||||
@rm -f proto.h
|
||||
@touch proto.h
|
||||
@( echo -e "#ifndef _NZG_PROTO"; \
|
||||
echo -e "#define _NZG_PROTO 1\n"; \
|
||||
cproto *.c ; \
|
||||
echo -e "\n#endif") > proto.t
|
||||
@mv proto.t proto.h
|
||||
|
||||
|
||||
edit:
|
||||
gvim *.c *.h
|
||||
|
|
|
|||
225
src/allocate.c
225
src/allocate.c
|
|
@ -1,225 +0,0 @@
|
|||
#include "libnazgul.h"
|
||||
#include "ids.h"
|
||||
|
||||
/* TODO: remplacer le bool de msgPoolData par un identifiant
|
||||
de semaphore. Le semaphore contient poolNb valeurs (et indique
|
||||
donc le nombre de ressources disponnibles).
|
||||
|
||||
*/
|
||||
|
||||
/* TODO: prevoir le cas des négatifs dans la taille ... */
|
||||
|
||||
void *msgAllocate(msgSpace * space, int pool, int taille, int option)
|
||||
{
|
||||
void *resultAddr = NULL;
|
||||
int bufferFreeSize;
|
||||
int i;
|
||||
msgPoolId resultPoolId;
|
||||
/* tableau des valeurs des semPoolCoef/pool pour identifier le pool
|
||||
* qui sera libéré le plus rapidement */
|
||||
float semPoolCoef[space->poolNb];
|
||||
int idxPoolOptimum;
|
||||
bool gotRessourceSem;
|
||||
msgPoolDataTabSemId ressourceSemId;
|
||||
sem_t *ressourceSemFd;
|
||||
int ressourceSemVal;
|
||||
int nbLockedSem;
|
||||
float minPoolCoef;
|
||||
int selectedPoolIndex;
|
||||
int bufferFreeIndex;
|
||||
msgPoolData *mSPoolDataTabAddr;
|
||||
|
||||
selectedPoolIndex = -1;
|
||||
|
||||
mSPoolDataTabAddr = msgPoolDataTabOpen(space);
|
||||
if (mSPoolDataTabAddr == NULL) {
|
||||
NZG_ERROR("msgPoolDataTabOpen", space->poolDataTabId);
|
||||
goto ERROR;
|
||||
}
|
||||
/*
|
||||
// verifier le premier arg du shm_open
|
||||
mSPoolDataTabFd=shm_open(space->poolDataTabId,
|
||||
O_RDWR,
|
||||
MSGSPACE_DEFAULT_MODE);
|
||||
if (mSPoolDataTabFd == -1 ) {
|
||||
fprintf( stderr, "Allocate %s failed: %s\n",
|
||||
(char*)space->poolDataTabId,
|
||||
strerror( errno ) );
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
mSPoolDataTabAddr = mmap( 0, (space->poolNb) * sizeof( msgPoolData ),
|
||||
PROT_READ | PROT_WRITE,
|
||||
MAP_SHARED, mSPoolDataTabFd, 0 );
|
||||
|
||||
if( mSPoolDataTabAddr == MAP_FAILED) {
|
||||
fprintf( stderr, "mmap failed: %s\n",
|
||||
strerror( errno ) );
|
||||
return NULL;
|
||||
}
|
||||
*/
|
||||
gotRessourceSem = false;
|
||||
|
||||
/* initialisation des coefs */
|
||||
for (i = 0; i < (space->poolNb); i++) {
|
||||
semPoolCoef[i] = -1;
|
||||
}
|
||||
|
||||
nbLockedSem = 0;
|
||||
if (pool == ANYPOOL) {
|
||||
fprintf(stderr, "[ ALLOCATION ANYPOOL : %d ]\n", (int)getpid());
|
||||
// choisir le pool au hasard (ou presque)
|
||||
for (i = 0; i < (space->poolNb); i++) {
|
||||
printf("- boucle %d\n", i);
|
||||
fflush(stdout);
|
||||
if (mSPoolDataTabAddr[i].bufferSize >= taille) {
|
||||
printf("( buffSize > taille )\n");
|
||||
fflush(stdout);
|
||||
/* choisir le numero du semaphore
|
||||
en fonction du nombre de lock poses / nombre de buffer */
|
||||
msgPoolSemIdIntern(ressourceSemId, space->id,
|
||||
i);
|
||||
ressourceSemFd =
|
||||
sem_open(ressourceSemId, O_CREAT,
|
||||
SEM_DEFAULT_MODE, 0);
|
||||
if (ressourceSemFd == SEM_FAILED) {
|
||||
NZG_ERROR("sem_open", ressourceSemId);
|
||||
return NULL;
|
||||
}
|
||||
/* on remplit le tableau avec les valeurs des semaphores */
|
||||
|
||||
if (sem_getvalue
|
||||
(ressourceSemFd, &ressourceSemVal) < 0) {
|
||||
NZG_ERROR("sem_getvalue",
|
||||
ressourceSemId);
|
||||
return NULL;
|
||||
}
|
||||
printf("RESSOURCESEMVAL %d\n", ressourceSemVal);
|
||||
if (ressourceSemVal <= 0) {
|
||||
printf("resVal < 0 : %d\n",
|
||||
ressourceSemVal);
|
||||
/* il y a ressourceSemVal processus qui attendent déja... */
|
||||
semPoolCoef[nbLockedSem] =
|
||||
(float)((1 -
|
||||
ressourceSemVal) /
|
||||
mSPoolDataTabAddr[i].
|
||||
bufferNb);
|
||||
nbLockedSem++;
|
||||
}
|
||||
if (sem_trywait(ressourceSemFd) == 0) {
|
||||
printf("got try_wait\n");
|
||||
/* choisir la 1ere pool de taille plus grande
|
||||
* libre si possible */
|
||||
gotRessourceSem = true;
|
||||
selectedPoolIndex = i;
|
||||
break;
|
||||
}
|
||||
if (sem_close(ressourceSemFd) < 0) {
|
||||
NZG_ERROR("sem_getvalue",
|
||||
ressourceSemId);
|
||||
return NULL;
|
||||
}
|
||||
} // if buffSize > taille
|
||||
} // for
|
||||
|
||||
printf("ERRORDETECT outFor\n");
|
||||
fflush(stdout);
|
||||
|
||||
if (!gotRessourceSem) {
|
||||
printf("Calcul du meilleur en cas de liberation\n");
|
||||
minPoolCoef = semPoolCoef[0];
|
||||
idxPoolOptimum = 0;
|
||||
/* on cherche le pool avec le moins de lock poses / nbre de buffer
|
||||
* le numéro du pool est stocké dans idxPoolOptimum */
|
||||
for (i = 0; i < nbLockedSem; i++) {
|
||||
printf("Coef %d : %d\n", i,
|
||||
(int)semPoolCoef[i]);
|
||||
if ((semPoolCoef[i] != -1)
|
||||
&& (semPoolCoef[i] < minPoolCoef)) {
|
||||
minPoolCoef = semPoolCoef[i];
|
||||
idxPoolOptimum = i;
|
||||
}
|
||||
}
|
||||
|
||||
if (minPoolCoef == -1) {
|
||||
/* il n'y a aucune pool dont la taille satisfait la demande */
|
||||
return NULL;
|
||||
} else {
|
||||
selectedPoolIndex = idxPoolOptimum;
|
||||
}
|
||||
printf("Optimum : %d\n", selectedPoolIndex);
|
||||
}
|
||||
} else {
|
||||
fprintf(stderr, "[ ALLOCATION : %d ]\n", (int)getpid());
|
||||
selectedPoolIndex = pool;
|
||||
}
|
||||
|
||||
if (!gotRessourceSem) {
|
||||
msgPoolSemIdIntern(ressourceSemId, space->externId,
|
||||
selectedPoolIndex);
|
||||
ressourceSemFd =
|
||||
sem_open(ressourceSemId, O_CREAT, SEM_DEFAULT_MODE, 0);
|
||||
if (ressourceSemFd == SEM_FAILED) {
|
||||
NZG_ERROR("sem_open", ressourceSemId);
|
||||
return NULL;
|
||||
}
|
||||
//TODO:virer la ligne suivante:
|
||||
sem_getvalue(ressourceSemFd, &ressourceSemVal);
|
||||
|
||||
printf("SemWait... %s : %d\n", ressourceSemId, ressourceSemVal);
|
||||
if (sem_wait(ressourceSemFd) < 0) {
|
||||
NZG_ERROR("sem_wait", ressourceSemId);
|
||||
sem_close(ressourceSemFd);
|
||||
return NULL;
|
||||
}
|
||||
printf("Passed %s\n", ressourceSemId);
|
||||
}
|
||||
|
||||
/* on a acqui un semaphore pour la ressouce */
|
||||
/* on acquiert le droit de modifier les infos sur la ressource */
|
||||
/* on protege le tableau des associations */
|
||||
msgPoolDataTabLock(space);
|
||||
|
||||
/* on modifie maintenant les données */
|
||||
/* - on récupere l'index du premier buffer libre */
|
||||
bufferFreeIndex =
|
||||
msgBufferGetFreeIndex(mSPoolDataTabAddr, selectedPoolIndex);
|
||||
if (bufferFreeIndex < 0) {
|
||||
// aucun buffer libre ?
|
||||
NZG_ERROR("msgBufferGetFreeIndex", "");
|
||||
goto ERROR;
|
||||
}
|
||||
printf("Buffer selected : %d,%d\n", selectedPoolIndex, bufferFreeIndex);
|
||||
/* mapper le buffer libre dans l'esp addr du proc */
|
||||
strcpy(resultPoolId, mSPoolDataTabAddr[selectedPoolIndex].poolId);
|
||||
|
||||
bufferFreeSize = mSPoolDataTabAddr[selectedPoolIndex].bufferSize;
|
||||
printf("BufferSize : %d\n", bufferFreeSize);
|
||||
|
||||
resultAddr =
|
||||
msgBufferMap(mSPoolDataTabAddr, selectedPoolIndex, bufferFreeIndex);
|
||||
if (resultAddr == NULL) {
|
||||
NZG_ERROR("msgBufferMap",
|
||||
mSPoolDataTabAddr[selectedPoolIndex].poolId);
|
||||
goto ERROR;
|
||||
}
|
||||
|
||||
/* - on s'enregistre aupres de ce buffer */
|
||||
msgBufferAttachProc(mSPoolDataTabAddr,
|
||||
selectedPoolIndex, bufferFreeIndex, resultAddr);
|
||||
|
||||
// munmap(mSPoolDataTabAddr,(space->poolNb) * sizeof( msgPoolData ));
|
||||
/* unmapper le msgPoolDataTab */
|
||||
msgPoolDataTabClose(space, mSPoolDataTabAddr);
|
||||
msgPoolDataTabUnlock(space);
|
||||
|
||||
printf("alloc de %p\n", (void *)resultAddr);
|
||||
return resultAddr;
|
||||
|
||||
ERROR:
|
||||
NZG_ERROR("msgAllocate", "error processing");
|
||||
msgPoolDataTabUnlock(space);
|
||||
munmap(mSPoolDataTabAddr, (space->poolNb) * sizeof(msgPoolData));
|
||||
return NULL;
|
||||
}
|
||||
11
src/buffer.c
11
src/buffer.c
|
|
@ -1,11 +0,0 @@
|
|||
#include "libnazgul.h"
|
||||
|
||||
int msgBufferGetAttachedProcIndex(msgPoolData * poolDataTabAddr,
|
||||
int poolIndex, void *addr)
|
||||
{
|
||||
|
||||
//TODO: parcourrir tous les index, et regarder s'il y
|
||||
//a une addresse qui correspond avec le meme processus...
|
||||
//et renvoyer l'index du buffer correspondant a l'addresse...
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -1,36 +0,0 @@
|
|||
#include "libnazgul.h"
|
||||
|
||||
int msgBufferAttachProc(msgPoolData * poolDataTabAddr,
|
||||
int poolIndex, int bufferIndex, void *addr)
|
||||
{
|
||||
msgBufferInfoTabId bufferInfoTabId;
|
||||
int bufferInfoTabFd;
|
||||
msgBufferInfo *bufferInfoTabAddr;
|
||||
int bufferInfoNb;
|
||||
|
||||
//récuperer l'ID du BufferInfoTab;
|
||||
strcpy(bufferInfoTabId, poolDataTabAddr[poolIndex].bufferInfoTabId);
|
||||
|
||||
bufferInfoTabFd = shm_open(bufferInfoTabId, O_RDWR, SHM_DEFAULT_MODE);
|
||||
if (bufferInfoTabFd < 0) {
|
||||
NZG_ERROR("sem_open", bufferInfoTabId);
|
||||
return -1;
|
||||
}
|
||||
|
||||
/** on regarde dans le tableau d'infos de buffer **/
|
||||
bufferInfoNb = poolDataTabAddr[poolIndex].bufferNb;
|
||||
bufferInfoTabAddr = mmap(NULL, bufferInfoNb * sizeof(msgBufferInfo),
|
||||
PROT_READ | PROT_WRITE, MAP_SHARED,
|
||||
bufferInfoTabFd, (off_t) 0);
|
||||
printf("atta gooo %s\n", bufferInfoTabId);
|
||||
|
||||
bufferInfoTabAddr[bufferIndex].ownerPid = getpid();
|
||||
bufferInfoTabAddr[bufferIndex].addr = addr;
|
||||
|
||||
if (munmap(bufferInfoTabAddr, bufferInfoNb * sizeof(msgBufferInfo)) < 0) {
|
||||
NZG_ERROR("munmap", bufferInfoTabId);
|
||||
return -1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -1,37 +0,0 @@
|
|||
#include "libnazgul.h"
|
||||
|
||||
int msgBufferDetachProc(msgPoolData * poolDataTabAddr,
|
||||
int poolIndex, int bufferIndex, void *addr)
|
||||
{
|
||||
msgBufferInfoTabId bufferInfoTabId;
|
||||
int bufferInfoTabFd;
|
||||
msgBufferInfo *bufferInfoTabAddr;
|
||||
int bufferInfoNb;
|
||||
|
||||
printf("Detaching %d,%d\n", poolIndex, bufferIndex);
|
||||
//récuperer l'ID du BufferInfoTab;
|
||||
|
||||
strcpy(bufferInfoTabId, poolDataTabAddr[poolIndex].bufferInfoTabId);
|
||||
|
||||
bufferInfoTabFd = shm_open(bufferInfoTabId, O_RDWR, SHM_DEFAULT_MODE);
|
||||
if (bufferInfoTabFd < 0) {
|
||||
NZG_ERROR("shm_open", bufferInfoTabId);
|
||||
return -1;
|
||||
}
|
||||
|
||||
/** on regarde dans le tableau d'infos de buffer **/
|
||||
bufferInfoNb = poolDataTabAddr[poolIndex].bufferNb;
|
||||
bufferInfoTabAddr = mmap(NULL, bufferInfoNb * sizeof(msgBufferInfo),
|
||||
PROT_READ | PROT_WRITE, MAP_SHARED,
|
||||
bufferInfoTabFd, (off_t) 0);
|
||||
|
||||
bufferInfoTabAddr[bufferIndex].ownerPid = (pid_t) - 1;
|
||||
bufferInfoTabAddr[bufferIndex].addr = NULL;
|
||||
|
||||
if (munmap(bufferInfoTabAddr, bufferInfoNb * sizeof(msgBufferInfo)) < 0) {
|
||||
NZG_ERROR("munmap", bufferInfoTabId);
|
||||
return -1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -1,43 +0,0 @@
|
|||
#include "libnazgul.h"
|
||||
|
||||
int msgBufferGetFreeIndex(msgPoolData * poolDataTabAddr, int poolIndex)
|
||||
{
|
||||
msgBufferInfoTabId bufferInfoTabId;
|
||||
int bufferInfoTabFd;
|
||||
msgBufferInfo *bufferInfoTabAddr;
|
||||
int bufferInfoNb;
|
||||
int bufferFreeIndex;
|
||||
int i;
|
||||
|
||||
//récuperer l'ID du BufferInfoTab;
|
||||
strcpy(bufferInfoTabId, poolDataTabAddr[poolIndex].bufferInfoTabId);
|
||||
|
||||
bufferInfoTabFd = shm_open(bufferInfoTabId, O_RDWR, SHM_DEFAULT_MODE);
|
||||
if (bufferInfoTabFd < 0) {
|
||||
NZG_ERROR("shm_open", bufferInfoTabId);
|
||||
return -1;
|
||||
}
|
||||
|
||||
/** on regarde dans le tableau d'infos de buffer **/
|
||||
bufferInfoNb = poolDataTabAddr[poolIndex].bufferNb;
|
||||
bufferInfoTabAddr = mmap(NULL, bufferInfoNb * sizeof(msgBufferInfo),
|
||||
PROT_READ, MAP_SHARED, bufferInfoTabFd,
|
||||
(off_t) 0);
|
||||
|
||||
i = 0;
|
||||
while ((i < bufferInfoNb)
|
||||
&& (bufferInfoTabAddr[i].ownerPid != (pid_t) - 1)) {
|
||||
i++;
|
||||
}
|
||||
if (i == bufferInfoNb) {
|
||||
return -1;
|
||||
}
|
||||
bufferFreeIndex = i;
|
||||
|
||||
if (munmap(bufferInfoTabAddr, bufferInfoNb * sizeof(msgBufferInfo)) < 0) {
|
||||
NZG_ERROR("munmap", bufferInfoTabId);
|
||||
return -1;
|
||||
}
|
||||
|
||||
return bufferFreeIndex;
|
||||
}
|
||||
|
|
@ -1,61 +0,0 @@
|
|||
#include "libnazgul.h"
|
||||
|
||||
int msgBufferGetProcAttach(msgPoolData * poolDataTabAddr,
|
||||
int poolNb,
|
||||
int *poolIndex, int *bufferIndex, void *addr)
|
||||
{
|
||||
msgBufferInfoTabId bufferInfoTabId;
|
||||
int bufferInfoTabFd;
|
||||
msgBufferInfo *bufferInfoTabAddr;
|
||||
int bufferInfoNb;
|
||||
|
||||
bool found = false;
|
||||
int pIdx = 0;
|
||||
int bIdx;
|
||||
while ((!found) && (pIdx < poolNb)) {
|
||||
/* Pour chaque pool */
|
||||
//récuperer l'ID du BufferInfoTab;
|
||||
strcpy(bufferInfoTabId, poolDataTabAddr[pIdx].bufferInfoTabId);
|
||||
bufferInfoNb = poolDataTabAddr[pIdx].bufferNb;
|
||||
|
||||
bufferInfoTabFd =
|
||||
shm_open(bufferInfoTabId, O_RDWR, SHM_DEFAULT_MODE);
|
||||
if (bufferInfoTabFd < 0) {
|
||||
NZG_ERROR("shm_open", bufferInfoTabId);
|
||||
return -1;
|
||||
}
|
||||
|
||||
/** on regarde dans le tableau d'infos de buffer **/
|
||||
bufferInfoTabAddr =
|
||||
mmap(NULL, bufferInfoNb * sizeof(msgBufferInfo), PROT_READ,
|
||||
MAP_SHARED, bufferInfoTabFd, (off_t) 0);
|
||||
|
||||
/* on cherche dans chacun des buffers */
|
||||
bIdx = 0;
|
||||
while ((!found) && bIdx < bufferInfoNb) {
|
||||
if (bufferInfoTabAddr[bIdx].addr == addr) {
|
||||
found = true;
|
||||
(*bufferIndex) = bIdx;
|
||||
};
|
||||
bIdx++;
|
||||
}
|
||||
if (found) {
|
||||
(*poolIndex) = pIdx;
|
||||
}
|
||||
/* on détache le morceau de mémoire */
|
||||
if (munmap
|
||||
(bufferInfoTabAddr,
|
||||
bufferInfoNb * sizeof(msgBufferInfo)) < 0) {
|
||||
NZG_ERROR("munmap", bufferInfoTabId);
|
||||
return -1;
|
||||
}
|
||||
close(bufferInfoTabFd);
|
||||
pIdx++;
|
||||
}
|
||||
|
||||
if (found) {
|
||||
return 0;
|
||||
} else {
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,39 +0,0 @@
|
|||
#include "libnazgul.h"
|
||||
#include "ids.h"
|
||||
|
||||
int msgBufferInfoTabCreate(msgSpaceId externId,
|
||||
msgPoolData * poolDataTabAddr,
|
||||
int poolIdx, int bufferNb)
|
||||
{
|
||||
|
||||
int bufferInfoTabFd;
|
||||
msgBufferInfoTabId bufferInfoTabId;
|
||||
|
||||
/* creation des infos sur buffers DEBUT */
|
||||
if (msgBufferInfoTabIdIntern(bufferInfoTabId, externId, poolIdx) == -1) {
|
||||
NZG_ERROR("msgPoolId creation", bufferInfoTabId);
|
||||
return -1;
|
||||
}
|
||||
|
||||
bufferInfoTabFd =
|
||||
shm_open(bufferInfoTabId, O_RDWR | O_CREAT | O_EXCL | O_TRUNC,
|
||||
MSGSPACE_DEFAULT_MODE);
|
||||
if (bufferInfoTabFd == -1) {
|
||||
fprintf(stderr, "msgInfoTab : %s creation failed: %s\n",
|
||||
bufferInfoTabId, strerror(errno));
|
||||
return -1;
|
||||
}
|
||||
if (ftruncate(bufferInfoTabFd, bufferNb * sizeof(msgBufferInfo)) == -1) {
|
||||
fprintf(stderr, "msgBufferInfoTab resizing failed: %s\n",
|
||||
strerror(errno));
|
||||
return -1;
|
||||
}
|
||||
close(bufferInfoTabFd);
|
||||
/* creation des infos sur buffers FIN */
|
||||
|
||||
msgBufferInfoTabInit(poolDataTabAddr, poolIdx);
|
||||
|
||||
return -1;
|
||||
NZG_ERROR("munmap", bufferInfoTabId);
|
||||
return -1;
|
||||
}
|
||||
|
|
@ -1,38 +0,0 @@
|
|||
#include "libnazgul.h"
|
||||
|
||||
int msgBufferInfoTabInit(msgPoolData * poolDataTabAddr, int poolIndex)
|
||||
{
|
||||
msgBufferInfoTabId bufferInfoTabId;
|
||||
int bufferInfoTabFd;
|
||||
msgBufferInfo *bufferInfoTabAddr;
|
||||
int bufferInfoNb;
|
||||
int i;
|
||||
|
||||
//récuperer l'ID du BufferInfoTab;
|
||||
strcpy(bufferInfoTabId, poolDataTabAddr[poolIndex].bufferInfoTabId);
|
||||
|
||||
printf("msgBufferInfoTabId %d open >>%s<<\n", poolIndex,
|
||||
bufferInfoTabId);
|
||||
bufferInfoTabFd = shm_open(bufferInfoTabId, O_RDWR, SHM_DEFAULT_MODE);
|
||||
if (bufferInfoTabFd < 0) {
|
||||
NZG_ERROR("msgBufferInfoTabId open", bufferInfoTabId);
|
||||
return -1;
|
||||
}
|
||||
|
||||
/** on regarde dans le tableau d'infos de buffer **/
|
||||
bufferInfoNb = poolDataTabAddr[poolIndex].bufferNb;
|
||||
bufferInfoTabAddr = mmap(NULL, bufferInfoNb * sizeof(msgBufferInfo),
|
||||
PROT_WRITE | PROT_READ, MAP_SHARED,
|
||||
bufferInfoTabFd, (off_t) 0);
|
||||
|
||||
for (i = 0; i < bufferInfoNb; i++) {
|
||||
bufferInfoTabAddr[i].ownerPid = (pid_t) - 1;
|
||||
}
|
||||
|
||||
if (munmap(bufferInfoTabAddr, bufferInfoNb * sizeof(msgBufferInfo)) < 0) {
|
||||
perror("munmap");
|
||||
return -1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -1,50 +0,0 @@
|
|||
#include "libnazgul.h"
|
||||
|
||||
void *msgBufferMap(msgPoolData * poolDataTab, int poolIndex, int bufferIndex)
|
||||
{
|
||||
void *resultAddr;
|
||||
int bufferSize, bufferNb;
|
||||
int poolBufferTabFd;
|
||||
msgPoolId poolBufferTabId;
|
||||
printf("Mapping buffer (%d,%d)\n", poolIndex, bufferIndex);
|
||||
// TODO: récuperer l'ID du BufferInfoTab;
|
||||
strcpy(poolBufferTabId, poolDataTab[poolIndex].poolId);
|
||||
bufferSize = poolDataTab[poolIndex].bufferSize;
|
||||
bufferNb = poolDataTab[poolIndex].bufferNb;
|
||||
if (bufferNb < 0) {
|
||||
// do something with bufferNb
|
||||
}
|
||||
|
||||
poolBufferTabFd = shm_open(poolBufferTabId, O_RDWR, SHM_DEFAULT_MODE);
|
||||
if (poolBufferTabFd < 0) {
|
||||
NZG_ERROR("shm_open", poolBufferTabId);
|
||||
goto ERROR;
|
||||
}
|
||||
// mapper le buffer dans l'espace mémoire du processus
|
||||
/* on s'arrete juste derriere l'index qui nous intéresse */
|
||||
resultAddr = mmap(NULL, bufferSize * (bufferIndex + 1), PROT_READ | PROT_WRITE, //PROT_NONE
|
||||
MAP_SHARED, poolBufferTabFd, (off_t) 0);
|
||||
if (resultAddr == MAP_FAILED) {
|
||||
NZG_ERROR("mmap", poolBufferTabId);
|
||||
goto ERROR;
|
||||
}
|
||||
printf("Mapped from %p to %p\n",
|
||||
(void *)resultAddr,
|
||||
(void *)(resultAddr + bufferSize * (bufferIndex + 1))
|
||||
);
|
||||
|
||||
resultAddr = resultAddr + (bufferSize * bufferIndex);
|
||||
printf("Moved to %p\n", (void *)resultAddr);
|
||||
|
||||
/* mprotect(
|
||||
resultAddr,
|
||||
bufferSize,
|
||||
PROT_READ|PROT_WRITE
|
||||
); */
|
||||
|
||||
close(poolBufferTabFd);
|
||||
|
||||
return resultAddr;
|
||||
ERROR:
|
||||
return NULL;
|
||||
}
|
||||
63
src/free.c
63
src/free.c
|
|
@ -1,63 +0,0 @@
|
|||
#include "libnazgul.h"
|
||||
|
||||
int msgFree(msgSpace * space, void *addr)
|
||||
{
|
||||
|
||||
int poolIndex;
|
||||
int bufferIndex;
|
||||
msgPoolData *poolDataTabAddr;
|
||||
sem_t *ressourceSemFd;
|
||||
msgPoolDataTabSemId ressourceSemId;
|
||||
int err;
|
||||
int bufferNb;
|
||||
int bufferSize;
|
||||
void *realAddr;
|
||||
printf("[ FREE %p ]\n", (void *)addr);
|
||||
/* on acquiert le droit de modifier les infos sur la ressource */
|
||||
/* on protege le tableau des associations */
|
||||
if (msgPoolDataTabLock(space) < 0) {
|
||||
NZG_ERROR("msgPoolDataTabLock", space->poolDataTabSemId);
|
||||
goto ERROR;
|
||||
};
|
||||
|
||||
/* verifier le premier arg du shm_open */
|
||||
|
||||
poolDataTabAddr = msgPoolDataTabOpen(space);
|
||||
|
||||
// TODO: verouiller semaphore DataInfo ??
|
||||
|
||||
poolIndex = -1;
|
||||
bufferIndex = -1;
|
||||
err = msgBufferGetProcAttach(poolDataTabAddr,
|
||||
space->poolNb,
|
||||
&poolIndex, &bufferIndex, addr);
|
||||
|
||||
printf("Found : %d\n", err);
|
||||
printf("Freing pool: %d, buffer: %d\n", poolIndex, bufferIndex);
|
||||
msgBufferDetachProc(poolDataTabAddr, poolIndex, bufferIndex, addr);
|
||||
|
||||
/* unmapper le buffer */
|
||||
realAddr = addr;
|
||||
bufferSize = poolDataTabAddr[poolIndex].bufferSize;
|
||||
bufferNb = poolDataTabAddr[poolIndex].bufferNb;
|
||||
realAddr = realAddr - poolIndex * bufferSize;
|
||||
munmap(realAddr, bufferSize * bufferNb);
|
||||
|
||||
msgPoolDataTabClose(space, poolDataTabAddr);
|
||||
|
||||
// deverouiller semaphore DataInfo
|
||||
msgPoolDataTabUnlock(space);
|
||||
|
||||
// deverouiller semaphore ressource.
|
||||
msgPoolSemIdIntern(ressourceSemId, space->externId, poolIndex);
|
||||
ressourceSemFd = sem_open(ressourceSemId, O_CREAT, SEM_DEFAULT_MODE, 0);
|
||||
if (ressourceSemFd == SEM_FAILED) {
|
||||
NZG_ERROR("sem_open", ressourceSemId);
|
||||
goto ERROR;
|
||||
}
|
||||
sem_post(ressourceSemFd);
|
||||
sem_close(ressourceSemFd);
|
||||
return 0;
|
||||
ERROR:
|
||||
return -1;
|
||||
}
|
||||
72
src/get.c
72
src/get.c
|
|
@ -1,72 +0,0 @@
|
|||
#include "libnazgul.h"
|
||||
|
||||
#define NONBLOCK -1
|
||||
|
||||
void *msgGet(msgSpace * space, int queueIndex, int option)
|
||||
{
|
||||
void *resultAddr;
|
||||
msgQueueId queueId;
|
||||
msgQueue *queue;
|
||||
msgQueueElemId oldElemId;
|
||||
msgQueueElem *oldElem;
|
||||
msgPoolData *poolDataTab;
|
||||
// on teste la possibilité de lecture sur la liste...
|
||||
if (option == NONBLOCK) {
|
||||
if (msgQueueReadTryLock(space->externId, queueIndex) < 0) {
|
||||
NZG_ERROR("msgQueueReadTryLock", space->externId);
|
||||
goto ERROR;
|
||||
}
|
||||
} else {
|
||||
if (msgQueueReadLock(space->externId, queueIndex) < 0) {
|
||||
NZG_ERROR("msgQueueReadLock", space->externId);
|
||||
goto ERROR;
|
||||
}
|
||||
}
|
||||
// la lecture est possible
|
||||
// on essaye donc de modifier la liste
|
||||
msgQueueProtLock(space->externId, queueIndex);
|
||||
msgQueueIdIntern(queueId, space->externId, queueIndex);
|
||||
// ouvrir la file
|
||||
queue = msgQueueOpen(queueId);
|
||||
if (queue == NULL) {
|
||||
NZG_ERROR("msgQueueOpen", queueId);
|
||||
goto ERROR;
|
||||
}
|
||||
// recupérer l'id de l'ancien element...
|
||||
msgQueueRem(queue, oldElemId);
|
||||
|
||||
oldElem = msgQueueElemOpen(oldElemId);
|
||||
if (oldElem == NULL) {
|
||||
NZG_ERROR("msgQueueElemOpen", oldElemId);
|
||||
goto ERROR;
|
||||
}
|
||||
/* on récupere la taille des buffer dans la pool du buffer */
|
||||
poolDataTab = msgPoolDataTabOpen(space);
|
||||
// mapper le buffer dans l'espace mémoire du processus
|
||||
resultAddr =
|
||||
msgBufferMap(poolDataTab, oldElem->poolIndex, oldElem->bufferIndex);
|
||||
// attacher au buffer...
|
||||
if (msgBufferAttachProc(poolDataTab,
|
||||
oldElem->poolIndex,
|
||||
oldElem->bufferIndex, resultAddr) < 0) {
|
||||
NZG_ERROR("msgBufferAttachProc", oldElemId);
|
||||
goto ERROR;
|
||||
}
|
||||
|
||||
msgPoolDataTabClose(space, poolDataTab);
|
||||
if (msgQueueElemClose(oldElem) < 0) {
|
||||
NZG_ERROR("msgQueueElemClose", oldElemId);
|
||||
}
|
||||
|
||||
shm_unlink(oldElemId);
|
||||
|
||||
// fermer la file
|
||||
msgQueueClose(queue);
|
||||
|
||||
// on a fini de modifier la liste
|
||||
msgQueueProtUnlock(space->externId, queueIndex);
|
||||
|
||||
return resultAddr;
|
||||
ERROR:
|
||||
return NULL;
|
||||
}
|
||||
46
src/global.h
46
src/global.h
|
|
@ -1,46 +0,0 @@
|
|||
#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
|
||||
|
|
@ -1,48 +0,0 @@
|
|||
#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
|
||||
150
src/ids.c
150
src/ids.c
|
|
@ -1,150 +0,0 @@
|
|||
#include "libnazgul.h"
|
||||
#include "ids.h"
|
||||
|
||||
int msgSpaceIdIntern(msgSpaceId dest, const msgSpaceId src)
|
||||
{
|
||||
if (strlen(src) > MSGSPACE_ID_LEN) {
|
||||
return -1;
|
||||
}
|
||||
/* sprintf(resNzgId,"/tmp/.nzg-%s",(char *)spaceId); */
|
||||
#ifdef _NZG_REALFILEID
|
||||
sprintf(dest, "/tmp/nzgSpace%s", (char *)src);
|
||||
#else
|
||||
sprintf(dest, "/nzgSpace%s", (char *)src);
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
|
||||
int msgPoolDataTabSemIdIntern(msgPoolSemId destSemId, const msgSpaceId externId)
|
||||
{
|
||||
if (strlen(externId) > MSGSPACE_ID_LEN * 4) {
|
||||
return -1;
|
||||
}
|
||||
/* sprintf(resNzgId,"/tmp/.nzg-%s",(char *)spaceId); */
|
||||
#ifdef _NZG_REALFILEID
|
||||
sprintf(destSemId, "/tmp/nzgPoolDTSem-%s", (char *)externId);
|
||||
#else
|
||||
sprintf(destSemId, "/nzgPoolDTSem-%s", (char *)externId);
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
|
||||
int msgPoolSemIdIntern(msgPoolSemId destSemId,
|
||||
const msgSpaceId srcPoolId, int poolIdx)
|
||||
{
|
||||
if (strlen(srcPoolId) > MSGSPACE_ID_LEN * 4) {
|
||||
return -1;
|
||||
}
|
||||
/* sprintf(resNzgId,"/tmp/.nzg-%s",(char *)spaceId); */
|
||||
#ifdef _NZG_REALFILEID
|
||||
sprintf(destSemId, "/tmp/nzgPoolSem-%s-%d", (char *)srcPoolId, poolIdx);
|
||||
#else
|
||||
sprintf(destSemId, "/nzgPoolSem-%s-%d", (char *)srcPoolId, poolIdx);
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
|
||||
int msgPoolDataIdIntern(msgPoolDataTabId dest, const msgSpaceId src)
|
||||
{
|
||||
if (strlen(src) > MSGSPACE_ID_LEN) {
|
||||
return -1;
|
||||
}
|
||||
/* sprintf(resNzgId,"/tmp/.nzg-%s",(char *)spaceId); */
|
||||
#ifdef _NZG_REALFILEID
|
||||
sprintf(dest, "/tmp/nzgPoolData-%s", (char *)src);
|
||||
#else
|
||||
sprintf(dest, "/nzgPoolData-%s", (char *)src);
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
|
||||
int msgPoolIdIntern(msgPoolId dest, msgPoolId src, int num)
|
||||
{
|
||||
if (strlen(src) > MSGSPACE_ID_LEN) {
|
||||
return -1;
|
||||
}
|
||||
#ifdef _NZG_REALFILEID
|
||||
sprintf(dest, "/tmp/nzgPool-%s-%d", (char *)src, num);
|
||||
#else
|
||||
sprintf(dest, "/nzgPool-%s-%d", (char *)src, num);
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
|
||||
int msgBufferInfoTabIdIntern(msgBufferInfoTabId dest, msgSpaceId src, int num)
|
||||
{
|
||||
if (strlen(src) > MSGSPACE_ID_LEN) {
|
||||
return -1;
|
||||
}
|
||||
#ifdef _NZG_REALFILEID
|
||||
sprintf(dest, "/tmp/nzgBufferInfo-%s-%d", (char *)src, num);
|
||||
#else
|
||||
sprintf(dest, "/nzgBufferInfo-%s-%d", (char *)src, num);
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
|
||||
int msgQueueProtSemIdIntern(msgQueueSemId dest,
|
||||
msgSpaceId externId, int queueIdx)
|
||||
{
|
||||
if (strlen(externId) > MSGSPACE_ID_LEN) {
|
||||
return -1;
|
||||
}
|
||||
#ifdef _NZG_REALFILEID
|
||||
sprintf(dest, "/tmp/nzgQueueProtSem-%s-%d", (char *)externId, queueIdx);
|
||||
#else
|
||||
sprintf(dest, "/nzgQueueProtSem-%s-%d", (char *)externId, queueIdx);
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
|
||||
int msgQueueReadSemIdIntern(msgQueueSemId dest,
|
||||
msgSpaceId externId, int queueIdx)
|
||||
{
|
||||
if (strlen(externId) > MSGSPACE_ID_LEN) {
|
||||
return -1;
|
||||
}
|
||||
#ifdef _NZG_REALFILEID
|
||||
sprintf(dest, "/tmp/nzgQueueReadSem-%s-%d", (char *)externId, queueIdx);
|
||||
#else
|
||||
sprintf(dest, "/nzgQueueReadSem-%s-%d", (char *)externId, queueIdx);
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
|
||||
int msgQueueIdIntern(msgQueueId dest, msgSpaceId externId, int queueIdx)
|
||||
{
|
||||
if (strlen(externId) > MSGSPACE_ID_LEN) {
|
||||
return -1;
|
||||
}
|
||||
#ifdef _NZG_REALFILEID
|
||||
sprintf(dest, "/tmp/nzgQueue-%s-%d", (char *)externId, queueIdx);
|
||||
#else
|
||||
sprintf(dest, "/nzgQueue-%s-%d", (char *)externId, queueIdx);
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
|
||||
int msgQueueElemIdIntern(msgQueueElemId dest, msgQueueId src, int counter)
|
||||
{
|
||||
if (strlen(src) > MSGSPACE_ID_LEN) {
|
||||
return -1;
|
||||
}
|
||||
sprintf(dest, "%s-%d", (char *)src, counter);
|
||||
return 0;
|
||||
}
|
||||
|
||||
int msgSpaceListElemIdIntern(msgSpaceListElemId elemListId, msgSpaceId externId)
|
||||
{
|
||||
if (strlen(externId) > MSGSPACE_ID_LEN) {
|
||||
return -1;
|
||||
}
|
||||
/* sprintf(resNzgId,"/tmp/.nzg-%s",(char *)spaceId); */
|
||||
#ifdef _NZG_REALFILEID
|
||||
sprintf(elemListId, "/tmp/nzgSpaceListElem-%s", (char *)externId);
|
||||
#else
|
||||
sprintf(elemListId, "/nzgSpaceListElem-%s", (char *)externId);
|
||||
#endif
|
||||
return 0;
|
||||
|
||||
}
|
||||
14
src/ids.h
14
src/ids.h
|
|
@ -1,14 +0,0 @@
|
|||
#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
|
||||
22
src/ids.h~
22
src/ids.h~
|
|
@ -1,22 +0,0 @@
|
|||
#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
|
||||
89
src/iface.h
89
src/iface.h
|
|
@ -1,89 +0,0 @@
|
|||
#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
|
||||
/* */
|
||||
91
src/iface.h~
91
src/iface.h~
|
|
@ -1,91 +0,0 @@
|
|||
#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
|
||||
/* */
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
#ifndef _LIBNAZGUL
|
||||
#define _LIBNAZGUL 1
|
||||
|
||||
#include "global.h"
|
||||
#include "iface.h"
|
||||
#include "proto.h"
|
||||
|
||||
#endif
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
#ifndef _LIBNAZGUL
|
||||
#define _LIBNAZGUL 1
|
||||
|
||||
#include "global.h"
|
||||
#include "iface.h"
|
||||
#include "proto.h"
|
||||
|
||||
#endif
|
||||
10
src/list.c
10
src/list.c
|
|
@ -1,10 +0,0 @@
|
|||
#include "libnazgul.h"
|
||||
|
||||
/*
|
||||
void msgSpaceIdList(msgSpaceListId){
|
||||
// i = le nombre d'id publics disponnibles
|
||||
int i=0;
|
||||
msgSpaceListId idList;
|
||||
return;
|
||||
}
|
||||
*/
|
||||
33
src/nzg_create.c
Normal file
33
src/nzg_create.c
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
#include <stdlib.h>
|
||||
#include "nzg_iface.h"
|
||||
#include "nzg_proto.h"
|
||||
|
||||
/*
|
||||
* spaceId : identifiant externe de l'espace de msg
|
||||
* queueNb : nombre de files de messages
|
||||
* poolNb : nombre de pool de buffers
|
||||
* queueNbCar : tableau de caracteristiques des different pool
|
||||
*/
|
||||
|
||||
msgSpace * msgSpaceCreate(
|
||||
msgSpaceId spaceId, // identifiant externe de l'espace de msg
|
||||
int queueNb, // nombre de files de messages
|
||||
int poolNb, // nombre de pool de buffers
|
||||
msgPool * queueNbCar // tableau de caracteristiques des different pool
|
||||
){
|
||||
|
||||
// on ajoute spaceId a la liste des msgSpace connus
|
||||
|
||||
// on crée queueNb files de messages
|
||||
|
||||
// on créer poolNb pool de buffers
|
||||
|
||||
// on attache tout ce beau monde au spaceId
|
||||
|
||||
// on renvoie un pointeur sur le bon spaceId
|
||||
|
||||
msgSpace * result=NULL;
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
10
src/nzg_iface.h
Normal file
10
src/nzg_iface.h
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
#include "types.h"
|
||||
|
||||
typedef int msgSpaceId;
|
||||
typedef int msgSpace;
|
||||
typedef int msgPool;
|
||||
|
||||
|
||||
|
||||
|
||||
/* */
|
||||
11
src/nzg_list.c
Normal file
11
src/nzg_list.c
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
#include <stdlib.h>
|
||||
#include "nzg_iface.h"
|
||||
#include "nzg_proto.h"
|
||||
|
||||
char ** msgSpaceIdList(){
|
||||
// i = le nombre d'id publics disponnibles
|
||||
int i=0;
|
||||
char ** idList;
|
||||
idList=(char **)malloc(i*sizeof(char *));
|
||||
return idList;
|
||||
}
|
||||
8
src/nzg_main.c
Normal file
8
src/nzg_main.c
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
#include "nzg_iface.h"
|
||||
#include "nzg_proto.h"
|
||||
|
||||
int main(void) {
|
||||
// msgSpaceId mSID=msgSpaceIdGet(""); //renvoie un ID propre au programme
|
||||
// msgSpace mS=0;
|
||||
return 0;
|
||||
}
|
||||
18
src/nzg_proto.h
Normal file
18
src/nzg_proto.h
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
|
||||
char **msgSpaceIdList(void);
|
||||
|
||||
msgSpace * msgSpaceCreate(
|
||||
msgSpaceId spaceId, // identifiant externe de l'espace de msg
|
||||
int queueNb, // nombre de files de messages
|
||||
int poolNb, // nombre de pool de buffers
|
||||
msgPool * queueNbCar // tableau de caracteristiques des different pool
|
||||
);
|
||||
|
||||
msgSpace * msgSpaceOpen(msgSpaceId spaceId);
|
||||
|
||||
void * msgAllocate(
|
||||
msgSpace * space, //espace de message concerné
|
||||
int pool, //numéro de pool ou réaliser l'allocation
|
||||
int taille, //si l'argument précédent est ANYPOOL, taille requise
|
||||
int option // 0 ou NONBLOCK
|
||||
);
|
||||
9
src/nzg_show.c
Normal file
9
src/nzg_show.c
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
#include "nzg_iface.h"
|
||||
#include "nzg_proto.h"
|
||||
|
||||
int main(void) {
|
||||
//show existing MsgSpaces
|
||||
char ** msID=msgSpaceIdList(); //renvoie un msgSpaceId
|
||||
msID=msID;
|
||||
return 0;
|
||||
}
|
||||
0
src/nzg_state.c
Normal file
0
src/nzg_state.c
Normal file
|
|
@ -1,62 +0,0 @@
|
|||
#include "libnazgul.h"
|
||||
#include "ids.h"
|
||||
|
||||
int msgPoolCreate(msgSpaceId externId, int poolIdx, int buffNb, int buffSize)
|
||||
{
|
||||
|
||||
int poolFd;
|
||||
sem_t *ressourceSemFd;
|
||||
msgPoolId poolId;
|
||||
msgPoolSemId poolRessourceSemId;
|
||||
|
||||
/* creation des buffers DEBUT */
|
||||
if (msgPoolIdIntern(poolId, externId, poolIdx) == -1) {
|
||||
fprintf(stderr, "msgPoolId creation failed for id %s\n",
|
||||
(char *)poolId);
|
||||
return -1;
|
||||
}
|
||||
poolFd =
|
||||
shm_open(poolId, O_RDWR | O_CREAT | O_EXCL | O_TRUNC,
|
||||
MSGSPACE_DEFAULT_MODE);
|
||||
if (poolFd == -1) {
|
||||
fprintf(stderr, "msgPool : %s creation failed: %s\n", poolId,
|
||||
strerror(errno));
|
||||
return -1;
|
||||
}
|
||||
if (ftruncate(poolFd, (buffSize * buffNb)) == -1) {
|
||||
fprintf(stderr, "msgPool resizing failed: %s\n",
|
||||
strerror(errno));
|
||||
return -1;
|
||||
}
|
||||
/* creation des buffers FIN */
|
||||
|
||||
if (msgPoolSemIdIntern(poolRessourceSemId, externId, poolIdx) == -1) {
|
||||
fprintf(stderr, "msgPoolId creation failed for id %s\n",
|
||||
(char *)poolRessourceSemId);
|
||||
return -1;
|
||||
}
|
||||
// on met un semaphore sur le pool
|
||||
ressourceSemFd =
|
||||
sem_open(poolRessourceSemId, O_CREAT | O_EXCL, SEM_DEFAULT_MODE,
|
||||
buffNb);
|
||||
if (ressourceSemFd == SEM_FAILED) {
|
||||
NZG_ERROR("sem_open : creation de la ressource",
|
||||
poolRessourceSemId);
|
||||
goto ERROR;
|
||||
} else {
|
||||
printf("[ Created %s with %d ressources ]\n",
|
||||
poolRessourceSemId, buffNb);
|
||||
}
|
||||
|
||||
//TODO: verrifier les erreurs sur l'ouverture de la sem
|
||||
|
||||
sem_close(ressourceSemFd);
|
||||
// on met le pool a la taille voulue pour qu'il
|
||||
// puisse contenir les buffs
|
||||
|
||||
close(poolFd);
|
||||
|
||||
return 0;
|
||||
ERROR:
|
||||
return -1;
|
||||
}
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
#include "libnazgul.h"
|
||||
|
||||
int msgPoolDataTabClose(msgSpace * space, void *addr)
|
||||
{
|
||||
/* unmapper le msgPoolDataTab */
|
||||
|
||||
if (munmap(addr, (space->poolNb) * sizeof(msgPoolData)) < 0) {
|
||||
NZG_ERROR("unmap", space->poolDataTabId);
|
||||
goto ERROR;
|
||||
}
|
||||
return 0;
|
||||
ERROR:
|
||||
return -1;
|
||||
}
|
||||
|
|
@ -1,39 +0,0 @@
|
|||
#include "libnazgul.h"
|
||||
#include "ids.h"
|
||||
|
||||
void *msgPoolDataTabCreate(msgSpace * space)
|
||||
{
|
||||
int poolDataFd; // shm file descriptor
|
||||
msgPoolData *poolDataTabAddr;
|
||||
poolDataFd = shm_open(space->poolDataTabId,
|
||||
O_RDWR | O_CREAT | O_EXCL | O_TRUNC,
|
||||
MSGSPACE_DEFAULT_MODE);
|
||||
if (poolDataFd == -1) {
|
||||
NZG_ERROR("shm_open :create", space->poolDataTabId);
|
||||
goto ERROR;
|
||||
}
|
||||
|
||||
/* allocation de la bonne zone mémoire pour le poolData */
|
||||
if (ftruncate(poolDataFd, (space->poolNb) * sizeof(msgPoolData)) == -1) {
|
||||
NZG_ERROR("ftruncate", space->poolDataTabId);
|
||||
goto ERROR;
|
||||
}
|
||||
|
||||
close(poolDataFd);
|
||||
poolDataTabAddr = msgPoolDataTabOpen(space);
|
||||
if (poolDataTabAddr == NULL) {
|
||||
NZG_ERROR("msgPoolDataTabOpen : create", space->poolDataTabId);
|
||||
goto ERROR;
|
||||
}
|
||||
/*mmap( 0, sizeof( *mSAddr ),
|
||||
PROT_READ | PROT_WRITE,
|
||||
MAP_SHARED, mSFd, 0 );
|
||||
if( poolDataAddr == MAP_FAILED ) {
|
||||
NZG_ERROR("mmap",poolDataTabId);
|
||||
goto ERROR;
|
||||
} */
|
||||
|
||||
return poolDataTabAddr;
|
||||
ERROR:
|
||||
return NULL;
|
||||
}
|
||||
|
|
@ -1,37 +0,0 @@
|
|||
#include "libnazgul.h"
|
||||
#include "ids.h"
|
||||
|
||||
#define DEBUG 0
|
||||
|
||||
int msgPoolDataTabLock(msgSpace * space)
|
||||
{
|
||||
int semval;
|
||||
sem_t *poolDataTabSemFd;
|
||||
semval = 0;
|
||||
if (DEBUG) {
|
||||
printf("Locking %s\n", space->poolDataTabSemId);
|
||||
}
|
||||
|
||||
poolDataTabSemFd = sem_open(space->poolDataTabSemId, O_CREAT,
|
||||
SEM_DEFAULT_MODE, 1);
|
||||
if (poolDataTabSemFd == SEM_FAILED) {
|
||||
NZG_ERROR("sem_open", space->poolDataTabSemId);
|
||||
goto ERROR;
|
||||
}
|
||||
|
||||
if (sem_wait(poolDataTabSemFd) == -1) {
|
||||
NZG_ERROR("sem_wait", space->poolDataTabSemId);
|
||||
goto ERROR;
|
||||
}
|
||||
|
||||
sem_getvalue(poolDataTabSemFd, &semval);
|
||||
if (DEBUG) {
|
||||
printf("(AfternValue:%d)\n", semval);
|
||||
}
|
||||
|
||||
sem_close(poolDataTabSemFd);
|
||||
|
||||
return 0;
|
||||
ERROR:
|
||||
return -1;
|
||||
}
|
||||
|
|
@ -1,30 +0,0 @@
|
|||
#include "libnazgul.h"
|
||||
#include "ids.h"
|
||||
|
||||
void *msgPoolDataTabOpen(msgSpace * space)
|
||||
{
|
||||
int poolDataTabFd;
|
||||
void *poolDataTabAddr;
|
||||
|
||||
poolDataTabFd = shm_open(space->poolDataTabId,
|
||||
O_RDWR, MSGSPACE_DEFAULT_MODE);
|
||||
if (poolDataTabFd == -1) {
|
||||
NZG_ERROR("shm_open", space->poolDataTabId);
|
||||
goto ERROR;
|
||||
}
|
||||
|
||||
poolDataTabAddr = mmap(NULL, (space->poolNb) * sizeof(msgPoolData),
|
||||
PROT_READ | PROT_WRITE,
|
||||
MAP_SHARED, poolDataTabFd, 0);
|
||||
|
||||
if (poolDataTabAddr == MAP_FAILED) {
|
||||
NZG_ERROR("mmap", space->poolDataTabId);
|
||||
goto ERROR;
|
||||
}
|
||||
|
||||
close(poolDataTabFd);
|
||||
|
||||
return poolDataTabAddr;
|
||||
ERROR:
|
||||
return NULL;
|
||||
}
|
||||
|
|
@ -1,36 +0,0 @@
|
|||
#include "libnazgul.h"
|
||||
#include "ids.h"
|
||||
|
||||
#define DEBUG 0
|
||||
|
||||
int msgPoolDataTabUnlock(msgSpace * space)
|
||||
{
|
||||
int semval;
|
||||
sem_t *poolDataTabSemFd;
|
||||
if (DEBUG) {
|
||||
printf("Unlocking %s\n", space->poolDataTabSemId);
|
||||
}
|
||||
poolDataTabSemFd = sem_open(space->poolDataTabSemId, O_CREAT,
|
||||
SEM_DEFAULT_MODE, 1);
|
||||
if (poolDataTabSemFd == SEM_FAILED) {
|
||||
NZG_ERROR("sem_open", space->poolDataTabSemId);
|
||||
goto ERROR;
|
||||
}
|
||||
|
||||
if (sem_post(poolDataTabSemFd) == -1) {
|
||||
NZG_ERROR("sem_post", space->poolDataTabSemId);
|
||||
goto ERROR;
|
||||
}
|
||||
|
||||
semval = 0;
|
||||
sem_getvalue(poolDataTabSemFd, &semval);
|
||||
if (DEBUG) {
|
||||
printf("(AfternValue:%d)\n", semval);
|
||||
}
|
||||
|
||||
sem_close(poolDataTabSemFd);
|
||||
|
||||
return 0;
|
||||
ERROR:
|
||||
return -1;
|
||||
}
|
||||
|
|
@ -1,49 +0,0 @@
|
|||
#include "libnazgul.h"
|
||||
#include "ids.h"
|
||||
|
||||
int msgPoolDelete(msgSpaceId spaceId, int poolIdx)
|
||||
{
|
||||
|
||||
msgPoolId poolId;
|
||||
msgBufferInfoTabId bufferInfoTabId;
|
||||
msgPoolSemId poolRessourceSemId;
|
||||
|
||||
/* suppression des infos sur buffers DEBUT */
|
||||
if (msgBufferInfoTabIdIntern(bufferInfoTabId, spaceId, poolIdx) == -1) {
|
||||
fprintf(stderr, "msgPoolId creation failed for id %s\n",
|
||||
(char *)poolId);
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (shm_unlink(bufferInfoTabId) < 0) {
|
||||
fprintf(stderr, "msgInfoTab : %s deletion failed: %s\n",
|
||||
bufferInfoTabId, strerror(errno));
|
||||
return -1;
|
||||
}
|
||||
/* suppression des infos sur buffers FIN */
|
||||
|
||||
/* suppression des buffers DEBUT */
|
||||
if (msgPoolIdIntern(poolId, spaceId, poolIdx) == -1) {
|
||||
fprintf(stderr, "msgPoolId creation failed for id %s\n",
|
||||
(char *)poolId);
|
||||
return -1;
|
||||
}
|
||||
if (shm_unlink(poolId) < 0) {
|
||||
fprintf(stderr, "msgPool : %s deletion failed: %s\n", poolId,
|
||||
strerror(errno));
|
||||
return -1;
|
||||
}
|
||||
/* suppression des buffers FIN */
|
||||
|
||||
/* suppression de la sémaphore */
|
||||
if (msgPoolSemIdIntern(poolRessourceSemId, spaceId, poolIdx) == -1) {
|
||||
fprintf(stderr, "msgPoolId creation failed for id %s\n",
|
||||
(char *)poolRessourceSemId);
|
||||
return -1;
|
||||
}
|
||||
// on met un semaphore sur le pool
|
||||
sem_unlink(poolRessourceSemId);
|
||||
//TODO: verrifier les erreurs sur l'ouverture de la sem
|
||||
|
||||
return 0;
|
||||
}
|
||||
130
src/proto.h
130
src/proto.h
|
|
@ -1,130 +0,0 @@
|
|||
#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
|
||||
118
src/proto.h~
118
src/proto.h~
|
|
@ -1,118 +0,0 @@
|
|||
#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
|
||||
66
src/put.c
66
src/put.c
|
|
@ -1,66 +0,0 @@
|
|||
#include "libnazgul.h"
|
||||
|
||||
int msgPut(msgSpace * space, int queueIndex, void *addr)
|
||||
{
|
||||
// retrouver le pool, buffer qui correspondent à l'addresse...
|
||||
msgPoolData *poolDataTabAddr;
|
||||
int poolIndex;
|
||||
int bufferIndex;
|
||||
int err;
|
||||
msgQueueElemId newElemId;
|
||||
msgQueueElem *queueElem;
|
||||
msgQueueId queueId;
|
||||
msgQueue *queue;
|
||||
|
||||
msgPoolDataTabLock(space);
|
||||
poolDataTabAddr = msgPoolDataTabOpen(space);
|
||||
if (poolDataTabAddr == NULL) {
|
||||
NZG_ERROR("msgPoolDataTabOpen", space->poolDataTabId);
|
||||
goto ERROR;
|
||||
}
|
||||
err = msgBufferGetProcAttach(poolDataTabAddr,
|
||||
space->poolNb,
|
||||
&poolIndex, &bufferIndex, addr);
|
||||
if (err) {
|
||||
//FIXME
|
||||
}
|
||||
// ouvrir la queue avec le bon index
|
||||
msgQueueIdIntern(queueId, space->externId, queueIndex);
|
||||
|
||||
msgQueueProtLock(space->externId, queueIndex);
|
||||
queue = msgQueueOpen(queueId);
|
||||
|
||||
// creer un element vide
|
||||
|
||||
msgQueueElemCreate(newElemId, queueId, queue->elemCounter);
|
||||
// ouvrir l'element
|
||||
queueElem = msgQueueElemOpen(newElemId);
|
||||
|
||||
// modifier les index pour retrouver le buffer
|
||||
queueElem->poolIndex = poolIndex;
|
||||
queueElem->bufferIndex = bufferIndex;
|
||||
|
||||
// fermer l'element
|
||||
if (msgQueueElemClose(queueElem) < 0) {
|
||||
NZG_ERROR("msgQueueElemClose", "");
|
||||
goto ERROR;
|
||||
}
|
||||
//ajouter le message a la bonne file...
|
||||
if (msgQueueAdd(queue, newElemId) < 0) {
|
||||
NZG_ERROR("msgQueueAdd", newElemId);
|
||||
goto ERROR;
|
||||
}
|
||||
// fermer la file
|
||||
msgQueueClose(queue);
|
||||
msgQueueProtUnlock(space->externId, queueIndex);
|
||||
|
||||
msgPoolDataTabClose(space, poolDataTabAddr);
|
||||
msgPoolDataTabUnlock(space);
|
||||
|
||||
// on laisse une nouvelle ressource de la liste au get
|
||||
msgQueueReadUnlock(space->externId, queueIndex);
|
||||
return 0;
|
||||
|
||||
ERROR:
|
||||
return -1;
|
||||
}
|
||||
|
|
@ -1,49 +0,0 @@
|
|||
#include "libnazgul.h"
|
||||
|
||||
// on ajoute en fin de queue...
|
||||
|
||||
int msgQueueAdd(msgQueue * queue, msgQueueElemId newElemId)
|
||||
{
|
||||
msgQueueElem *queueOldTailElem;
|
||||
msgQueueElem *queueNewTailElem;
|
||||
|
||||
// on informe l'element qu'il est le dernier
|
||||
queueNewTailElem = msgQueueElemOpen(newElemId);
|
||||
if (queueNewTailElem == NULL) {
|
||||
NZG_ERROR("msgQueueElemOpen", newElemId);
|
||||
goto ERROR;
|
||||
}
|
||||
strcpy(queueNewTailElem->next, newElemId);
|
||||
if (msgQueueElemClose(queueNewTailElem) < 0) {
|
||||
NZG_ERROR("msgQueueElemClose", newElemId);
|
||||
goto ERROR;
|
||||
}
|
||||
|
||||
/* TODO: verifier si la liste n'est pas vide... */
|
||||
if ((strcmp(queue->headId, queue->id) == 0)
|
||||
&& (strcmp(queue->tailId, queue->id) == 0)) {
|
||||
printf("- premier elem de queue -\n");
|
||||
// on donne a la queue l'id de l'element
|
||||
strcpy(queue->headId, newElemId);
|
||||
strcpy(queue->tailId, newElemId);
|
||||
} else {
|
||||
/* on informe son prédecesseur qu'il a un suivant */
|
||||
queueOldTailElem = msgQueueElemOpen(queue->tailId);
|
||||
if (queueOldTailElem == NULL) {
|
||||
NZG_ERROR("msgQueueElemOpen", queue->tailId);
|
||||
goto ERROR;
|
||||
}
|
||||
strcpy(queueOldTailElem->next, newElemId);
|
||||
if (msgQueueElemClose(queueOldTailElem) < 0) {
|
||||
NZG_ERROR("msgQueueElemClose", queue->tailId);
|
||||
goto ERROR;
|
||||
}
|
||||
// on donne a la queue l'id du dernier element
|
||||
strcpy(queue->tailId, newElemId);
|
||||
}
|
||||
// on incremente elemCounter
|
||||
queue->elemCounter++;
|
||||
return 0;
|
||||
ERROR:
|
||||
return -1;
|
||||
}
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
#include "libnazgul.h"
|
||||
#include "ids.h"
|
||||
|
||||
int msgQueueClose(msgQueue * queue)
|
||||
{
|
||||
msgQueueId qId;
|
||||
strcpy(qId, queue->id);
|
||||
|
||||
if (munmap(queue, sizeof(msgQueue)) < 0) {
|
||||
NZG_ERROR("unmap", qId);
|
||||
goto ERROR;
|
||||
}
|
||||
|
||||
return 0;
|
||||
ERROR:
|
||||
return -1;
|
||||
}
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
#include "libnazgul.h"
|
||||
|
||||
int msgQueueDelete(msgQueueId externId, int queueIdx)
|
||||
{
|
||||
msgQueue *queue;
|
||||
msgQueueId queueId;
|
||||
msgQueueSemId queueProtLockSemId;
|
||||
msgQueueSemId queueReadLockSemId;
|
||||
|
||||
msgQueueIdIntern(queueId, externId, queueIdx);
|
||||
queue = msgQueueOpen(queueId);
|
||||
|
||||
if (strcmp(queue->headId, queue->id) != 0) {
|
||||
// liste non-vide
|
||||
if (msgQueueElemDelete(queue->headId) < 0) {
|
||||
NZG_ERROR("msgQueueElemDelete", queue->headId);
|
||||
goto ERROR;
|
||||
}
|
||||
}
|
||||
|
||||
msgQueueProtSemIdIntern(queueProtLockSemId, externId, queueIdx);
|
||||
msgQueueReadSemIdIntern(queueReadLockSemId, externId, queueIdx);
|
||||
sem_unlink(queueProtLockSemId);
|
||||
sem_unlink(queueReadLockSemId);
|
||||
|
||||
if (shm_unlink(queueId) < 0) {
|
||||
NZG_ERROR("shm_unlink msgQueueElem", queueId);
|
||||
goto ERROR;
|
||||
}
|
||||
|
||||
return 0;
|
||||
ERROR:
|
||||
return -1;
|
||||
}
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
#include "libnazgul.h"
|
||||
|
||||
int msgQueueElemClose(msgQueueElem * queueElem)
|
||||
{
|
||||
msgQueueElemId qId;
|
||||
strcpy(qId, queueElem->id);
|
||||
|
||||
if (munmap(queueElem, sizeof(msgQueueElem)) < 0) {
|
||||
NZG_ERROR("unmap", qId);
|
||||
goto ERROR;
|
||||
}
|
||||
|
||||
return 0;
|
||||
ERROR:
|
||||
return -1;
|
||||
}
|
||||
|
|
@ -1,30 +0,0 @@
|
|||
#include "libnazgul.h"
|
||||
#include "ids.h"
|
||||
|
||||
int msgQueueElemCreate(msgQueueElemId finalQueueElemId,
|
||||
msgQueueId queueId, int counter)
|
||||
{
|
||||
msgQueueElemId queueElemId;
|
||||
int queueElemFd;
|
||||
|
||||
msgQueueElemIdIntern(queueElemId, queueId, counter);
|
||||
strcpy(finalQueueElemId, queueElemId);
|
||||
|
||||
queueElemFd = shm_open(queueElemId,
|
||||
O_RDWR | O_CREAT | O_EXCL | O_TRUNC,
|
||||
SHM_DEFAULT_MODE);
|
||||
if (queueElemFd == -1) {
|
||||
NZG_ERROR("shm_open : msgQueueElem creation", queueElemId);
|
||||
goto ERROR;
|
||||
}
|
||||
|
||||
if (ftruncate(queueElemFd, sizeof(msgQueueElem)) < 0) {
|
||||
NZG_ERROR("ftruncate", queueElemId);
|
||||
goto ERROR;
|
||||
}
|
||||
|
||||
close(queueElemFd);
|
||||
return 0;
|
||||
ERROR:
|
||||
return -1;
|
||||
}
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
#include "libnazgul.h"
|
||||
|
||||
int msgQueueElemDelete(msgQueueElemId queueElemId)
|
||||
{
|
||||
msgQueueElem *queueElem;
|
||||
msgQueueElemId nextIdToDie;
|
||||
|
||||
queueElem = msgQueueElemOpen(queueElemId);
|
||||
if (queueElem == NULL) {
|
||||
NZG_ERROR("msgQueueElemOpen", queueElemId);
|
||||
goto ERROR;
|
||||
}
|
||||
|
||||
strcpy(nextIdToDie, queueElem->next);
|
||||
|
||||
if (msgQueueElemClose(queueElem) < 0) {
|
||||
NZG_ERROR("msgQueueElemClose", queueElemId);
|
||||
goto ERROR;
|
||||
}
|
||||
// on détruit l'élément
|
||||
shm_unlink(queueElemId);
|
||||
|
||||
if (nextIdToDie != queueElemId) {
|
||||
return msgQueueElemDelete(nextIdToDie);
|
||||
} else {
|
||||
printf("msgQueueElemDelete: EOL reached \n");
|
||||
// element unique...
|
||||
return 0;
|
||||
}
|
||||
|
||||
ERROR:
|
||||
return -1;
|
||||
}
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
#include "libnazgul.h"
|
||||
#include "ids.h"
|
||||
|
||||
void *msgQueueElemOpen(msgQueueElemId queueElemId)
|
||||
{
|
||||
int queueElemFd;
|
||||
void *queueElemAddr;
|
||||
|
||||
queueElemFd = shm_open(queueElemId, O_RDWR, SHM_DEFAULT_MODE);
|
||||
if (queueElemFd == -1) {
|
||||
NZG_ERROR("shm_open : msgQueue open", queueElemId);
|
||||
goto ERROR;
|
||||
}
|
||||
|
||||
queueElemAddr = mmap(NULL,
|
||||
sizeof(msgQueueElem),
|
||||
PROT_READ | PROT_WRITE,
|
||||
MAP_SHARED, queueElemFd, 0);
|
||||
if (queueElemAddr == MAP_FAILED) {
|
||||
NZG_ERROR("mmap", queueElemId);
|
||||
goto ERROR;
|
||||
}
|
||||
|
||||
close(queueElemFd);
|
||||
return queueElemAddr;
|
||||
ERROR:
|
||||
return NULL;
|
||||
}
|
||||
|
|
@ -1,71 +0,0 @@
|
|||
#include "libnazgul.h"
|
||||
#include "ids.h"
|
||||
|
||||
msgQueue *msgQueueInit(msgSpaceId externId, int queueIdx)
|
||||
{
|
||||
int queueFd;
|
||||
msgQueue *queue;
|
||||
sem_t *semProtectFd;
|
||||
msgQueueSemId queueSemProtectId;
|
||||
sem_t *semReadableFd;
|
||||
msgQueueSemId queueSemReadableId;
|
||||
msgQueueId queueId;
|
||||
|
||||
queue = NULL;
|
||||
|
||||
msgQueueProtSemIdIntern(queueSemProtectId, externId, queueIdx);
|
||||
msgQueueReadSemIdIntern(queueSemReadableId, externId, queueIdx);
|
||||
|
||||
// creation du semaphore de lecture
|
||||
semReadableFd = sem_open(queueSemReadableId,
|
||||
O_CREAT | O_EXCL, SEM_DEFAULT_MODE, 0);
|
||||
if (semReadableFd == SEM_FAILED) {
|
||||
NZG_ERROR("sem_open", queueSemReadableId);
|
||||
goto ERROR;
|
||||
}
|
||||
// creation du semaphore de protection
|
||||
semProtectFd = sem_open(queueSemProtectId,
|
||||
O_CREAT | O_EXCL, SEM_DEFAULT_MODE, 0);
|
||||
if (semProtectFd == SEM_FAILED) {
|
||||
NZG_ERROR("sem_open", queueSemProtectId);
|
||||
goto ERROR;
|
||||
}
|
||||
|
||||
/* if(sem_wait(semProtectFd)==-1){
|
||||
NZG_ERROR("sem_wait",queueSemProtectId);
|
||||
goto ERROR;
|
||||
} */
|
||||
|
||||
if (msgQueueIdIntern(queueId, externId, queueIdx) < 0) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
queueFd =
|
||||
shm_open(queueId, O_RDWR | O_CREAT | O_EXCL | O_TRUNC,
|
||||
MSGSPACE_DEFAULT_MODE);
|
||||
if (queueFd == -1) {
|
||||
NZG_ERROR("shm_open : queueInit", queueId);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if (ftruncate(queueFd, sizeof(msgQueue)) == -1) {
|
||||
fprintf(stderr, "Queue resizing failed: %s\n", strerror(errno));
|
||||
return NULL;
|
||||
}
|
||||
|
||||
queue = msgQueueOpen(queueId);
|
||||
/* on remplit la structure msgQueue */
|
||||
queue->elemCounter = 0;
|
||||
strcpy(queue->id, queueId);
|
||||
strcpy(queue->headId, queue->id);
|
||||
strcpy(queue->tailId, queue->id);
|
||||
|
||||
/* on ferme tout ce qu'il faut */
|
||||
close(queueFd);
|
||||
msgQueueProtUnlock(externId, queueIdx);
|
||||
|
||||
return queue;
|
||||
ERROR:
|
||||
return NULL;
|
||||
|
||||
}
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
#include "libnazgul.h"
|
||||
#include "ids.h"
|
||||
|
||||
void *msgQueueOpen(msgQueueId queueId)
|
||||
{
|
||||
int queueFd;
|
||||
void *queueAddr;
|
||||
|
||||
queueFd = shm_open(queueId, O_RDWR, SHM_DEFAULT_MODE);
|
||||
if (queueFd == -1) {
|
||||
NZG_ERROR("shm_open : msgQueue open", queueId);
|
||||
goto ERROR;
|
||||
}
|
||||
|
||||
queueAddr = mmap(NULL,
|
||||
sizeof(msgQueue),
|
||||
PROT_READ | PROT_WRITE, MAP_SHARED, queueFd, 0);
|
||||
if (queueAddr == MAP_FAILED) {
|
||||
NZG_ERROR("mmap", queueId);
|
||||
goto ERROR;
|
||||
}
|
||||
|
||||
close(queueFd);
|
||||
return queueAddr;
|
||||
ERROR:
|
||||
return NULL;
|
||||
}
|
||||
|
|
@ -1,37 +0,0 @@
|
|||
#include "libnazgul.h"
|
||||
#include "ids.h"
|
||||
|
||||
#define DEBUG 0
|
||||
int msgQueueProtLock(msgSpaceId externId, int queueIdx)
|
||||
{
|
||||
int semval;
|
||||
sem_t *queueSemFd;
|
||||
msgQueueSemId queueSemId;
|
||||
|
||||
msgQueueProtSemIdIntern(queueSemId, externId, queueIdx);
|
||||
if (DEBUG) {
|
||||
printf("Locking %s\n", queueSemId);
|
||||
}
|
||||
queueSemFd = sem_open(queueSemId, O_CREAT, SEM_DEFAULT_MODE, 1);
|
||||
if (queueSemFd == SEM_FAILED) {
|
||||
NZG_ERROR("sem_open", queueSemId);
|
||||
goto ERROR;
|
||||
}
|
||||
|
||||
if (sem_wait(queueSemFd) == -1) {
|
||||
NZG_ERROR("sem_wait", queueSemId);
|
||||
goto ERROR;
|
||||
}
|
||||
semval = 0;
|
||||
sem_getvalue(queueSemFd, &semval);
|
||||
if (DEBUG) {
|
||||
printf("(AfterValue:%d)\n", semval);
|
||||
}
|
||||
|
||||
sem_close(queueSemFd);
|
||||
sem_close(queueSemFd);
|
||||
|
||||
return 0;
|
||||
ERROR:
|
||||
return -1;
|
||||
}
|
||||
|
|
@ -1,38 +0,0 @@
|
|||
#include "libnazgul.h"
|
||||
#include "ids.h"
|
||||
|
||||
#define DEBUG 0
|
||||
|
||||
int msgQueueProtUnlock(msgSpaceId externId, int queueIdx)
|
||||
{
|
||||
int semval;
|
||||
sem_t *queueSemFd;
|
||||
msgQueueSemId queueSemId;
|
||||
|
||||
msgQueueProtSemIdIntern(queueSemId, externId, queueIdx);
|
||||
if (DEBUG) {
|
||||
printf("Unlocking %s\n", queueSemId);
|
||||
}
|
||||
|
||||
queueSemFd = sem_open(queueSemId, O_CREAT, SEM_DEFAULT_MODE, 1);
|
||||
if (queueSemFd == SEM_FAILED) {
|
||||
NZG_ERROR("sem_open", queueSemId);
|
||||
goto ERROR;
|
||||
}
|
||||
|
||||
if (sem_post(queueSemFd) == -1) {
|
||||
NZG_ERROR("sem_post", queueSemId);
|
||||
goto ERROR;
|
||||
}
|
||||
semval = 0;
|
||||
sem_getvalue(queueSemFd, &semval);
|
||||
if (DEBUG) {
|
||||
printf("(AfterValue:%d)\n", semval);
|
||||
}
|
||||
|
||||
sem_close(queueSemFd);
|
||||
|
||||
return 0;
|
||||
ERROR:
|
||||
return -1;
|
||||
}
|
||||
|
|
@ -1,37 +0,0 @@
|
|||
#include "libnazgul.h"
|
||||
#include "ids.h"
|
||||
|
||||
#define DEBUG 0
|
||||
|
||||
int msgQueueReadLock(msgSpaceId externId, int queueIdx)
|
||||
{
|
||||
int semval;
|
||||
sem_t *queueSemFd;
|
||||
msgQueueSemId queueSemId;
|
||||
|
||||
msgQueueReadSemIdIntern(queueSemId, externId, queueIdx);
|
||||
if (DEBUG) {
|
||||
printf("Locking %s\n", queueSemId);
|
||||
}
|
||||
queueSemFd = sem_open(queueSemId, O_CREAT, SEM_DEFAULT_MODE, 1);
|
||||
if (queueSemFd == SEM_FAILED) {
|
||||
NZG_ERROR("sem_open", queueSemId);
|
||||
goto ERROR;
|
||||
}
|
||||
|
||||
if (sem_wait(queueSemFd) == -1) {
|
||||
NZG_ERROR("sem_wait", queueSemId);
|
||||
goto ERROR;
|
||||
}
|
||||
semval = 0;
|
||||
sem_getvalue(queueSemFd, &semval);
|
||||
if (DEBUG) {
|
||||
printf("(AfterValue:%d)\n", semval);
|
||||
}
|
||||
|
||||
sem_close(queueSemFd);
|
||||
|
||||
return 0;
|
||||
ERROR:
|
||||
return -1;
|
||||
}
|
||||
|
|
@ -1,37 +0,0 @@
|
|||
#include "libnazgul.h"
|
||||
#include "ids.h"
|
||||
|
||||
#define DEBUG 0
|
||||
|
||||
int msgQueueReadTryLock(msgSpaceId externId, int queueIdx)
|
||||
{
|
||||
int semval;
|
||||
sem_t *queueSemFd;
|
||||
msgQueueSemId queueSemId;
|
||||
|
||||
msgQueueReadSemIdIntern(queueSemId, externId, queueIdx);
|
||||
queueSemFd = sem_open(queueSemId, O_CREAT, SEM_DEFAULT_MODE, 1);
|
||||
if (queueSemFd == SEM_FAILED) {
|
||||
NZG_ERROR("sem_open", queueSemId);
|
||||
goto ERROR;
|
||||
}
|
||||
|
||||
if (sem_trywait(queueSemFd) == -1) {
|
||||
NZG_ERROR("sem_wait", queueSemId);
|
||||
goto ERROR;
|
||||
}
|
||||
if (DEBUG) {
|
||||
printf("Locking %s\n", queueSemId);
|
||||
}
|
||||
semval = 0;
|
||||
sem_getvalue(queueSemFd, &semval);
|
||||
if (DEBUG) {
|
||||
printf("(AfterValue:%d)\n", semval);
|
||||
}
|
||||
|
||||
sem_close(queueSemFd);
|
||||
|
||||
return 0;
|
||||
ERROR:
|
||||
return -1;
|
||||
}
|
||||
|
|
@ -1,37 +0,0 @@
|
|||
#include "libnazgul.h"
|
||||
#include "ids.h"
|
||||
|
||||
#define DEBUG 0
|
||||
|
||||
int msgQueueReadUnlock(msgSpaceId externId, int queueIdx)
|
||||
{
|
||||
int semval;
|
||||
sem_t *queueSemFd;
|
||||
msgQueueSemId queueSemId;
|
||||
|
||||
msgQueueReadSemIdIntern(queueSemId, externId, queueIdx);
|
||||
if (DEBUG) {
|
||||
printf("Unlocking %s\n", queueSemId);
|
||||
}
|
||||
queueSemFd = sem_open(queueSemId, O_CREAT, SEM_DEFAULT_MODE, 1);
|
||||
if (queueSemFd == SEM_FAILED) {
|
||||
NZG_ERROR("sem_open", queueSemId);
|
||||
goto ERROR;
|
||||
}
|
||||
|
||||
if (sem_post(queueSemFd) == -1) {
|
||||
NZG_ERROR("sem_post", queueSemId);
|
||||
goto ERROR;
|
||||
}
|
||||
semval = 0;
|
||||
sem_getvalue(queueSemFd, &semval);
|
||||
if (DEBUG) {
|
||||
printf("(AfterValue:%d)\n", semval);
|
||||
}
|
||||
|
||||
sem_close(queueSemFd);
|
||||
|
||||
return 0;
|
||||
ERROR:
|
||||
return -1;
|
||||
}
|
||||
|
|
@ -1,37 +0,0 @@
|
|||
#include "libnazgul.h"
|
||||
|
||||
// l'id de l'element enlevé vas dans oldElemId
|
||||
|
||||
int msgQueueRem(msgQueue * queue, msgQueueElemId oldElemId)
|
||||
{
|
||||
msgQueueElem *queueOldHeadElem;
|
||||
|
||||
if (strcmp(queue->headId, queue->id) == 0) {
|
||||
NZG_ERROR("msgQueueElemRem : Empty queue", queue->id);
|
||||
goto ERROR;
|
||||
}
|
||||
strcpy(oldElemId, queue->headId);
|
||||
|
||||
queueOldHeadElem = msgQueueElemOpen(oldElemId);
|
||||
if (queueOldHeadElem == NULL) {
|
||||
NZG_ERROR("msgQueueElemOpen", oldElemId);
|
||||
goto ERROR;
|
||||
}
|
||||
// on indique à la queue le nouveau premier element
|
||||
strcpy(queue->headId, queueOldHeadElem->next);
|
||||
if (strcmp(queueOldHeadElem->next, oldElemId) == 0) {
|
||||
strcpy(queue->headId, queue->id);
|
||||
}
|
||||
// on fait en sorte que l'element ne connaisse plus
|
||||
// ses voisins (utile pour le Delete)
|
||||
strcpy(queueOldHeadElem->next, queueOldHeadElem->id);
|
||||
|
||||
if (msgQueueElemClose(queueOldHeadElem) < 0) {
|
||||
NZG_ERROR("msgQueueElemClose", oldElemId);
|
||||
goto ERROR;
|
||||
|
||||
}
|
||||
return 0;
|
||||
ERROR:
|
||||
return -1;
|
||||
}
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
#include "libnazgul.h"
|
||||
|
||||
int msgSpaceClose(msgSpace * space)
|
||||
{
|
||||
msgSpaceId spaceId;
|
||||
strcpy(spaceId, space->id);
|
||||
|
||||
if (munmap(space, sizeof(msgSpace)) < 0) {
|
||||
NZG_ERROR("unmap", spaceId);
|
||||
goto ERROR;
|
||||
}
|
||||
|
||||
return 0;
|
||||
ERROR:
|
||||
return -1;
|
||||
}
|
||||
|
|
@ -1,197 +0,0 @@
|
|||
#include "libnazgul.h"
|
||||
#include "ids.h"
|
||||
|
||||
/* prototypes des fonctions annexes à ne pas exporter */
|
||||
int msgSpaceIdIntern(msgSpaceId dest, const msgSpaceId src);
|
||||
int msgPoolDataIdIntern(msgSpaceId dest, const msgSpaceId src);
|
||||
int msgPoolDataTabSemIdIntern(msgPoolSemId destSemId,
|
||||
const msgSpaceId externId);
|
||||
/*
|
||||
* spaceId : identifiant externe de l'espace de msg
|
||||
* queueNb : nombre de files de messages
|
||||
* poolNb : nombre de pool de buffers
|
||||
* queueNbCar : tableau de caracteristiques des different pool
|
||||
*/
|
||||
|
||||
msgSpace *msgSpaceCreate(msgSpaceId externId,
|
||||
int queueNb, int poolNb, msgPool * poolInfos)
|
||||
{
|
||||
msgSpaceId nzgId;
|
||||
/* msgSpaceList mSList; */
|
||||
int mSFd; // shm file descriptor
|
||||
int i;
|
||||
int err;
|
||||
static int mSIdNum = -1;
|
||||
msgSpace *space;
|
||||
msgSpaceListElemId listElemId;
|
||||
|
||||
msgPoolDataTabId poolDataTabId;
|
||||
msgPoolData *poolDataTabAddr;
|
||||
msgBufferInfoTabId bufferInfoTabId;
|
||||
msgPoolId poolId;
|
||||
sem_t *mSDataTabSemFd;
|
||||
|
||||
mSIdNum++;
|
||||
space = NULL;
|
||||
/** recuperation de la liste des msgSpace **/
|
||||
/* (creation si elle n'existe pas */
|
||||
|
||||
/** on créee le nouvel element **/
|
||||
printf("PAGESIZE : %d\n", (int)PAGESIZE);
|
||||
if (msgSpaceIdIntern(nzgId, externId) < 0) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if (msgSpaceListInit() < 0) {
|
||||
NZG_ERROR("msgSpaceListInit", nzgId);
|
||||
goto ERROR;
|
||||
};
|
||||
if (msgSpaceListLock() < 0) {
|
||||
NZG_ERROR("msgSpaceListLock", "");
|
||||
goto ERROR;
|
||||
}
|
||||
if ((err = msgSpaceListFindId(externId)) < 1) {
|
||||
if (err == 0) {
|
||||
// soit le msgSpace existe deja
|
||||
NZG_ERROR("spaceListFindId : existing ", nzgId);
|
||||
} else {
|
||||
// zut, il y a soit une erreur
|
||||
NZG_ERROR("spaceListFindId : error ", nzgId);
|
||||
}
|
||||
msgSpaceListUnlock();
|
||||
// on quitte
|
||||
goto ERROR;
|
||||
}
|
||||
printf("spaceListFind ok\n");
|
||||
if (msgSpaceListUnlock() < 0) {
|
||||
NZG_ERROR("msgSpaceListUnlock", "");
|
||||
goto ERROR;
|
||||
}
|
||||
printf("spaceListUnlock ok\n");
|
||||
|
||||
fprintf(stderr, "Creating msgSpace with id : %s\n", nzgId);
|
||||
mSFd = shm_open(nzgId,
|
||||
O_RDWR | O_CREAT | O_EXCL | O_TRUNC,
|
||||
MSGSPACE_DEFAULT_MODE);
|
||||
if (mSFd == -1) {
|
||||
NZG_ERROR("shm_open : msgSpace creation", nzgId);
|
||||
goto ERROR;
|
||||
}
|
||||
|
||||
/* on redimentionne l'element */
|
||||
if (ftruncate(mSFd, sizeof(*space)) == -1) {
|
||||
NZG_ERROR("ftruncate", nzgId);
|
||||
goto ERROR;
|
||||
}
|
||||
|
||||
/* Map the memory object */
|
||||
space = mmap(0, sizeof(*space),
|
||||
PROT_READ | PROT_WRITE, MAP_SHARED, mSFd, 0);
|
||||
if (space == MAP_FAILED) {
|
||||
NZG_ERROR("mmap", nzgId);
|
||||
goto ERROR;
|
||||
}
|
||||
|
||||
printf("CREAT: msgSpace mapped to 0x%08lx in %d\n", (long)space,
|
||||
(int)getpid());
|
||||
|
||||
/* on ferme le descripteur du fichier */
|
||||
close(mSFd);
|
||||
|
||||
/* on remplit la structure */
|
||||
strcpy(space->id, nzgId);
|
||||
space->poolNb = poolNb;
|
||||
space->queueNb = queueNb;
|
||||
space->pid = getpid();
|
||||
msgPoolDataTabSemIdIntern(space->poolDataTabSemId, externId);
|
||||
/* creation du poolData */
|
||||
msgPoolDataIdIntern(poolDataTabId, externId);
|
||||
strcpy(space->poolDataTabId, poolDataTabId);
|
||||
strcpy(space->externId, externId);
|
||||
|
||||
mSDataTabSemFd = sem_open(space->poolDataTabSemId,
|
||||
O_CREAT | O_EXCL, SEM_DEFAULT_MODE, 0);
|
||||
if (mSDataTabSemFd == SEM_FAILED) {
|
||||
NZG_ERROR("sem_open : creation de la ressource",
|
||||
space->poolDataTabSemId);
|
||||
goto ERROR;
|
||||
} else {
|
||||
/* NZG_ERROR("sem_open : creation oki",
|
||||
space->poolDataTabSemId); */
|
||||
}
|
||||
sem_close(mSDataTabSemFd);
|
||||
|
||||
/* attacher le tableau des msgPoolData */
|
||||
poolDataTabAddr = msgPoolDataTabCreate(space);
|
||||
if (poolDataTabAddr == NULL) {
|
||||
NZG_ERROR("msgPoolDataTabCreate", space->poolDataTabId);
|
||||
goto ERROR;
|
||||
}
|
||||
|
||||
for (i = 0; i < poolNb; i++) {
|
||||
/* Pour chacun des poolData
|
||||
* - y écrire les informations passées en param
|
||||
* - creer les zones mémoires de chacune des pool
|
||||
*/
|
||||
// creation d'une pool
|
||||
poolDataTabAddr[i].bufferNb = poolInfos[i].bufferNb;
|
||||
poolDataTabAddr[i].bufferSize = poolInfos[i].bufferSize;
|
||||
poolDataTabAddr[i].allocDispBuffer = 0;
|
||||
|
||||
if (msgBufferInfoTabIdIntern(bufferInfoTabId, externId, i) ==
|
||||
-1) {
|
||||
fprintf(stderr,
|
||||
"msgBufferInfoTabId creation failed for id %s\n",
|
||||
(char *)poolId);
|
||||
return NULL;
|
||||
}
|
||||
strcpy(poolDataTabAddr[i].bufferInfoTabId, bufferInfoTabId);
|
||||
printf("buffIfoTab %d name : %s\n", i,
|
||||
poolDataTabAddr[i].bufferInfoTabId);
|
||||
msgBufferInfoTabCreate(externId, poolDataTabAddr, i,
|
||||
poolInfos[i].bufferNb);
|
||||
|
||||
if (msgPoolIdIntern(poolId, externId, i) == -1) {
|
||||
fprintf(stderr, "msgPoolId creation failed for id %s\n",
|
||||
(char *)poolId);
|
||||
return NULL;
|
||||
}
|
||||
strcpy(poolDataTabAddr[i].poolId, poolId);
|
||||
msgPoolCreate(externId, i, poolInfos[i].bufferNb,
|
||||
poolInfos[i].bufferSize);
|
||||
|
||||
}
|
||||
|
||||
/* on crée queueNb files de messages */
|
||||
printf("Creating queues:\n");
|
||||
for (i = 0; i < queueNb; i++) {
|
||||
printf("- queue %i...", i);
|
||||
fflush(stdout);
|
||||
if (msgQueueInit(space->externId, i) < 0) {
|
||||
printf("fail.\n");
|
||||
NZG_ERROR("msgQueueInit : queue ?? for",
|
||||
space->externId);
|
||||
goto ERROR;
|
||||
}
|
||||
printf("ok.\n");
|
||||
}
|
||||
msgPoolDataTabClose(space, poolDataTabAddr);
|
||||
/* on ajoute spaceId a la liste des msgSpace connus */
|
||||
printf("spaceListInit...\n");
|
||||
|
||||
printf("ok\n");
|
||||
msgSpaceListLock();
|
||||
printf("spaceListLock...ok\n");
|
||||
msgSpaceListElemCreate(listElemId, space);
|
||||
printf("spaceListElemCreate...ok\n");
|
||||
msgSpaceListAdd(listElemId);
|
||||
printf("spaceListAdd...ok\n");
|
||||
msgSpaceListUnlock();
|
||||
printf("spaceListUnlock...ok\n");
|
||||
|
||||
/* on renvoie un pointeur sur le bon spaceId */
|
||||
msgPoolDataTabUnlock(space);
|
||||
return space;
|
||||
ERROR:
|
||||
return NULL;
|
||||
}
|
||||
|
|
@ -1,67 +0,0 @@
|
|||
#include "libnazgul.h"
|
||||
#include "ids.h"
|
||||
|
||||
/* prototypes des fonctions annexes à ne pas exporter */
|
||||
int msgSpaceIdIntern(msgSpaceId dest, const msgSpaceId src);
|
||||
int msgPoolDataIdIntern(msgSpaceId dest, const msgSpaceId src);
|
||||
int msgPoolDataTabSemIdIntern(msgPoolSemId destSemId,
|
||||
const msgSpaceId externId);
|
||||
|
||||
int msgSpaceDelete(msgSpaceId externId)
|
||||
{
|
||||
//int shmId;
|
||||
msgSpaceId nzgId;
|
||||
msgSpace *space;
|
||||
int i;
|
||||
fprintf(stderr, "Deleting msgSpace with id : %s\n", externId);
|
||||
if (msgSpaceIdIntern(nzgId, externId) == -1) {
|
||||
NZG_ERROR("msgSpaceIdIntern", externId);
|
||||
goto ERROR;
|
||||
}
|
||||
|
||||
space = msgSpaceOpen(externId);
|
||||
/* supprimer chaque pool */
|
||||
for (i = 0; i < space->poolNb; i++) {
|
||||
msgPoolDelete(externId, i);
|
||||
}
|
||||
|
||||
/* supprimer chaque queue */
|
||||
for (i = 0; i < space->queueNb; i++) {
|
||||
msgQueueDelete(externId, i);
|
||||
}
|
||||
printf("openned successfully !\n");
|
||||
printf("Unlinking DataTab... ");
|
||||
if (shm_unlink(space->poolDataTabId) < 0) {
|
||||
perror("shm_unlink");
|
||||
return -1;
|
||||
}
|
||||
printf("ok\n");
|
||||
|
||||
printf("Unlinking DataTabSem... ");
|
||||
if (sem_unlink(space->poolDataTabSemId) < 0) {
|
||||
NZG_ERROR("sem_unlink", space->poolDataTabSemId);
|
||||
return -1;
|
||||
}
|
||||
printf("ok\n");
|
||||
|
||||
if (shm_unlink(nzgId) < 0) {
|
||||
NZG_ERROR("shm_unlink", nzgId);
|
||||
goto ERROR;
|
||||
};
|
||||
if (msgSpaceListLock() < 0) {
|
||||
NZG_ERROR("msgSpaceListLock", "");
|
||||
goto ERROR;
|
||||
}
|
||||
|
||||
if (msgSpaceListRem(nzgId) < 0) {
|
||||
NZG_ERROR("msgSpaceListRem", nzgId);
|
||||
goto ERROR;
|
||||
}
|
||||
if (msgSpaceListUnlock() < 0) {
|
||||
NZG_ERROR("msgSpaceListUnlock", "");
|
||||
goto ERROR;
|
||||
}
|
||||
return 0;
|
||||
ERROR:
|
||||
return -1;
|
||||
}
|
||||
|
|
@ -1,57 +0,0 @@
|
|||
#include "libnazgul.h"
|
||||
|
||||
// ajoute un element en début de liste.
|
||||
// fait pointer l'ancien dernier vers lui
|
||||
// il s'enregistre en tant que dernier chez la liste
|
||||
int msgSpaceListAdd(msgSpaceListElemId newElemId)
|
||||
{
|
||||
msgSpaceListElem *listOldTailElem;
|
||||
msgSpaceListElem *listNewTailElem;
|
||||
msgSpaceList *list;
|
||||
|
||||
list = msgSpaceListOpen();
|
||||
if (list == NULL) {
|
||||
NZG_ERROR("msgSpaceListOpen", "");
|
||||
goto ERROR;
|
||||
}
|
||||
// on informe l'element qui est le dernier
|
||||
listNewTailElem = msgSpaceListElemOpen(newElemId);
|
||||
if (listNewTailElem == NULL) {
|
||||
NZG_ERROR("msgSpaceListElemOpen", newElemId);
|
||||
goto ERROR;
|
||||
}
|
||||
strcpy(listNewTailElem->next, newElemId);
|
||||
if (msgSpaceListElemClose(listNewTailElem) < 0) {
|
||||
NZG_ERROR("msgSpaceListElemClose", newElemId);
|
||||
goto ERROR;
|
||||
}
|
||||
|
||||
/* verifier si la liste n'est pas vide... */
|
||||
if ((strcmp(list->headId, list->id) == 0)
|
||||
&& (strcmp(list->tailId, list->id) == 0)) {
|
||||
printf("- premier elem de spaceList -\n");
|
||||
// on donne a la queue l'id de l'element
|
||||
strcpy(list->headId, newElemId);
|
||||
strcpy(list->tailId, newElemId);
|
||||
} else {
|
||||
/* on informe son prédecesseur qu'il a un suivant */
|
||||
listOldTailElem = msgSpaceListElemOpen(list->tailId);
|
||||
if (listOldTailElem == NULL) {
|
||||
NZG_ERROR("msgSpaceListElemOpen", list->tailId);
|
||||
goto ERROR;
|
||||
}
|
||||
strcpy(listOldTailElem->next, newElemId);
|
||||
if (msgSpaceListElemClose(listOldTailElem) < 0) {
|
||||
NZG_ERROR("msgSpaceListElemClose", list->tailId);
|
||||
goto ERROR;
|
||||
}
|
||||
// on donne a la queue l'id du dernier element
|
||||
strcpy(list->tailId, newElemId);
|
||||
}
|
||||
// on incremente elemCounter
|
||||
msgSpaceListClose(list);
|
||||
return 0;
|
||||
ERROR:
|
||||
return -1;
|
||||
|
||||
}
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
#include "libnazgul.h"
|
||||
#include "ids.h"
|
||||
|
||||
int msgSpaceListClose(msgSpaceList * list)
|
||||
{
|
||||
|
||||
msgSpaceListId spaceListId;
|
||||
strcpy(spaceListId, DEFAULT_MSGSPACELISTID);
|
||||
|
||||
if (munmap(list, sizeof(msgSpaceList)) < 0) {
|
||||
NZG_ERROR("unmap", spaceListId);
|
||||
goto ERROR;
|
||||
}
|
||||
|
||||
return 0;
|
||||
ERROR:
|
||||
return -1;
|
||||
}
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
#include "libnazgul.h"
|
||||
#include "ids.h"
|
||||
|
||||
int msgSpaceListElemClose(msgSpaceListElem * listElem)
|
||||
{
|
||||
|
||||
msgSpaceListElemId eId;
|
||||
strcpy(eId, listElem->id);
|
||||
|
||||
if (munmap(listElem, sizeof(msgSpaceListElem)) < 0) {
|
||||
NZG_ERROR("unmap", eId);
|
||||
goto ERROR;
|
||||
}
|
||||
|
||||
return 0;
|
||||
ERROR:
|
||||
return -1;
|
||||
};
|
||||
|
|
@ -1,44 +0,0 @@
|
|||
#include "libnazgul.h"
|
||||
#include "ids.h"
|
||||
|
||||
// cree un nouvel elemen
|
||||
int msgSpaceListElemCreate(msgSpaceListElemId listElemId, msgSpace * space)
|
||||
{
|
||||
|
||||
int listElemFd;
|
||||
msgSpaceListElem *listElem;
|
||||
msgSpaceListElemIdIntern(listElemId, space->externId);
|
||||
|
||||
listElemFd = shm_open(listElemId,
|
||||
O_RDWR | O_CREAT | O_EXCL | O_TRUNC,
|
||||
SHM_DEFAULT_MODE);
|
||||
|
||||
if (listElemFd == -1) {
|
||||
NZG_ERROR("shm_open : msgSpaceListElem creation", listElemId);
|
||||
goto ERROR;
|
||||
}
|
||||
|
||||
if (ftruncate(listElemFd, sizeof(msgSpaceListElem)) < 0) {
|
||||
NZG_ERROR("ftruncate", listElemId);
|
||||
goto ERROR;
|
||||
}
|
||||
|
||||
close(listElemFd);
|
||||
listElem = msgSpaceListElemOpen(listElemId);
|
||||
if (listElem == NULL) {
|
||||
NZG_ERROR("msgSpaceListElemOpen", listElemId);
|
||||
goto ERROR;
|
||||
}
|
||||
strcpy(listElem->id, listElemId);
|
||||
strcpy(listElem->next, listElemId);
|
||||
strcpy(listElem->spaceId, space->id);
|
||||
printf("[ ListElem : id %s,next: %s, Sid: %s ]\n",
|
||||
listElem->id, listElem->next, listElem->spaceId);
|
||||
if (msgSpaceListElemClose(listElem) < 0) {
|
||||
NZG_ERROR("msgSpaceListElemClose", listElemId);
|
||||
}
|
||||
return 0;
|
||||
ERROR:
|
||||
return -1;
|
||||
|
||||
};
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
#include "libnazgul.h"
|
||||
|
||||
// modifie l'element suivant de l'element choisi
|
||||
// et le fait pointer sur un nouvel ID
|
||||
int msgSpaceListElemLinkNext(msgSpaceListElemId current,
|
||||
msgSpaceListElemId next);
|
||||
|
|
@ -1,30 +0,0 @@
|
|||
#include "libnazgul.h"
|
||||
#include "ids.h"
|
||||
|
||||
// cree un nouvel elemen
|
||||
void *msgSpaceListElemOpen(msgSpaceListElemId listElemId)
|
||||
{
|
||||
int listElemFd;
|
||||
void *listElemAddr;
|
||||
|
||||
listElemFd = shm_open(listElemId, O_RDWR, SHM_DEFAULT_MODE);
|
||||
if (listElemFd == -1) {
|
||||
NZG_ERROR("shm_open : msgSpaceListElem open", listElemId);
|
||||
goto ERROR;
|
||||
}
|
||||
|
||||
listElemAddr = mmap(NULL,
|
||||
sizeof(msgQueueElem),
|
||||
PROT_READ | PROT_WRITE, MAP_SHARED, listElemFd, 0);
|
||||
|
||||
if (listElemAddr == MAP_FAILED) {
|
||||
NZG_ERROR("mmap", listElemId);
|
||||
goto ERROR;
|
||||
}
|
||||
|
||||
close(listElemFd);
|
||||
return listElemAddr;
|
||||
ERROR:
|
||||
return NULL;
|
||||
|
||||
};
|
||||
|
|
@ -1,85 +0,0 @@
|
|||
#include "libnazgul.h"
|
||||
|
||||
#define DEBUG 1
|
||||
|
||||
int msgSpaceListFindId(msgSpaceId externId)
|
||||
{
|
||||
msgSpaceList *list;
|
||||
msgSpaceId spaceId;
|
||||
msgSpaceListElemId listHeadElemId;
|
||||
msgSpaceListElemId listTailElemId;
|
||||
msgSpaceListId listId;
|
||||
|
||||
msgSpaceIdIntern(spaceId, externId);
|
||||
list = msgSpaceListOpen();
|
||||
if (list == NULL) {
|
||||
NZG_ERROR("msgSpaceListOpen", "");
|
||||
goto ERROR;
|
||||
}
|
||||
if (DEBUG) {
|
||||
printf("Before ListStrCpy\n");
|
||||
}
|
||||
strcpy(listHeadElemId, list->headId);
|
||||
strcpy(listTailElemId, list->tailId);
|
||||
strcpy(listId, list->id);
|
||||
if (DEBUG) {
|
||||
printf("After ListStrCpy\n");
|
||||
}
|
||||
if ((strcmp(listHeadElemId, listId) == 0)
|
||||
&& strcmp(listTailElemId, listId) == 0) {
|
||||
// si la liste est vide
|
||||
if (DEBUG) {
|
||||
printf("SpaceList : vide\n");
|
||||
}
|
||||
return 1;
|
||||
} else {
|
||||
return msgSpaceListElemFindId(listHeadElemId, spaceId);
|
||||
}
|
||||
if (msgSpaceListClose(list) < 0) {
|
||||
NZG_ERROR("msgSpaceListClose", "");
|
||||
goto ERROR;
|
||||
}
|
||||
return 0;
|
||||
ERROR:
|
||||
return -1;
|
||||
}
|
||||
|
||||
int msgSpaceListElemFindId(msgSpaceListElemId elemId, msgSpaceId spaceId)
|
||||
{
|
||||
msgSpaceListElem *listElem;
|
||||
msgSpaceListElemId listElemIdNext;
|
||||
msgSpaceId currentElemSpaceId;
|
||||
|
||||
listElem = msgSpaceListElemOpen(elemId);
|
||||
if (listElem == NULL) {
|
||||
NZG_ERROR("msgSpaceListElemOpen", elemId);
|
||||
goto ERROR;
|
||||
}
|
||||
strcpy(listElemIdNext, listElem->next);
|
||||
strcpy(currentElemSpaceId, listElem->spaceId);
|
||||
if (msgSpaceListElemClose(listElem) < 0) {
|
||||
NZG_ERROR("msgSpaceListElemClose", elemId);
|
||||
goto ERROR;
|
||||
}
|
||||
|
||||
printf("Current ListElem: Next:%s, Sid:%s\n",
|
||||
listElemIdNext, currentElemSpaceId);
|
||||
printf("comparisons...\n");
|
||||
if (strcmp(currentElemSpaceId, spaceId) == 0) {
|
||||
printf("Found %s in spaceList !\n", spaceId);
|
||||
return 0;
|
||||
} else {
|
||||
if (strcmp(listElemIdNext, elemId) == 0) {
|
||||
printf("End of spaceList reached.\n");
|
||||
/* fin de liste ?? */
|
||||
return 1;
|
||||
} else {
|
||||
/* continuer sur l'element suivant */
|
||||
return msgSpaceListElemFindId(listElemIdNext, spaceId);
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
ERROR:
|
||||
return -1;
|
||||
}
|
||||
|
|
@ -1,73 +0,0 @@
|
|||
#include "libnazgul.h"
|
||||
#include "ids.h"
|
||||
|
||||
int msgSpaceListInit()
|
||||
{
|
||||
int spaceListFd;
|
||||
sem_t *spaceListSemFd;
|
||||
msgSpaceList *list;
|
||||
|
||||
msgSpaceListSemId spaceListSemId;
|
||||
msgSpaceListId spaceListId;
|
||||
|
||||
strcpy(spaceListSemId, DEFAULT_MSGSPACELISTSEMID);
|
||||
strcpy(spaceListId, DEFAULT_MSGSPACELISTID);
|
||||
|
||||
/* Creation de semaphore */
|
||||
spaceListSemFd = sem_open(spaceListSemId, O_CREAT | O_EXCL, 0666, 0);
|
||||
if (spaceListSemFd == SEM_FAILED) {
|
||||
spaceListSemFd = sem_open(spaceListSemId, O_CREAT, 0666, 0);
|
||||
if (spaceListSemFd == SEM_FAILED) {
|
||||
NZG_ERROR("sem_open", spaceListSemId);
|
||||
goto ERROR;
|
||||
}
|
||||
}
|
||||
|
||||
/*Fait un segment de memoir partager sur espace de listelement */
|
||||
spaceListFd = shm_open(spaceListId,
|
||||
O_RDWR | O_CREAT | O_EXCL | O_TRUNC, 0666);
|
||||
if (spaceListFd == -1) {
|
||||
spaceListFd = shm_open(spaceListId, O_RDWR, 0666);
|
||||
if (spaceListFd == -1) {
|
||||
NZG_ERROR("shm_open", spaceListId);
|
||||
goto ERROR;
|
||||
} else {
|
||||
close(spaceListFd);
|
||||
goto EXISTING;
|
||||
}
|
||||
}
|
||||
if (ftruncate(spaceListFd, sizeof(msgSpaceList)) < 0) {
|
||||
NZG_ERROR("ftruncate", spaceListId);
|
||||
goto ERROR;
|
||||
}
|
||||
close(spaceListFd);
|
||||
|
||||
list = msgSpaceListOpen();
|
||||
if (list == NULL) {
|
||||
NZG_ERROR("msgSpaceListOpen", "");
|
||||
goto ERROR;
|
||||
}
|
||||
strcpy(list->id, spaceListId);
|
||||
strcpy(list->headId, spaceListId);
|
||||
strcpy(list->tailId, spaceListId);
|
||||
if (msgSpaceListClose(list) < 0) {
|
||||
NZG_ERROR("msgSpaceListClose", "");
|
||||
goto ERROR;
|
||||
}
|
||||
|
||||
if (msgSpaceListUnlock() < 0) {
|
||||
NZG_ERROR("msgSpaceListUnlock", "");
|
||||
goto ERROR;
|
||||
}
|
||||
|
||||
return 0;
|
||||
ERROR:
|
||||
return -1;
|
||||
EXISTING:
|
||||
if (msgSpaceListUnlock() < 0) {
|
||||
NZG_ERROR("msgSpaceListUnlock", "");
|
||||
goto ERROR;
|
||||
}
|
||||
|
||||
return 0;
|
||||
};
|
||||
|
|
@ -1,65 +0,0 @@
|
|||
#include "libnazgul.h"
|
||||
|
||||
// verouille le semaphore de la liste
|
||||
|
||||
int msgSpaceListLock()
|
||||
{
|
||||
sem_t *msgSpaceListSemFd;
|
||||
msgSpaceListSemId spaceListSemId;
|
||||
strcpy(spaceListSemId, DEFAULT_MSGSPACELISTSEMID);
|
||||
|
||||
/* Ouverture d'un semafore */
|
||||
msgSpaceListSemFd = sem_open(spaceListSemId, O_CREAT, 0666, 1);
|
||||
if (msgSpaceListSemFd == SEM_FAILED) {
|
||||
NZG_ERROR("sem_open", spaceListSemId);
|
||||
goto ERROR;
|
||||
}
|
||||
|
||||
/* Pose d'un semaphore et le verrouille */
|
||||
if (sem_wait(msgSpaceListSemFd) == -1) {
|
||||
NZG_ERROR("sem_wait", spaceListSemId);
|
||||
goto ERROR;
|
||||
}
|
||||
|
||||
/* Ferme le semaphore */
|
||||
/* if(sem_close(msgSpaceListSemFd)==-1){
|
||||
NZG_ERROR("sem_close",spaceListSemId);
|
||||
return -1;
|
||||
} */
|
||||
sem_close(msgSpaceListSemFd);
|
||||
|
||||
return 0;
|
||||
ERROR:
|
||||
return -1;
|
||||
}
|
||||
|
||||
// deverouille le semaphore de la liste
|
||||
int msgSpaceListUnlock()
|
||||
{
|
||||
sem_t *msgSpaceListSemFd;
|
||||
msgSpaceListSemId spaceListSemId;
|
||||
strcpy(spaceListSemId, DEFAULT_MSGSPACELISTSEMID);
|
||||
|
||||
/*Ouverture dun semaphore */
|
||||
msgSpaceListSemFd = sem_open(spaceListSemId, O_CREAT, 0666, 0);
|
||||
if (msgSpaceListSemFd == SEM_FAILED) {
|
||||
NZG_ERROR("sem_open", spaceListSemId);
|
||||
goto ERROR;
|
||||
}
|
||||
|
||||
/*Relachement du semaphore */
|
||||
if (sem_post(msgSpaceListSemFd) == -1) {
|
||||
NZG_ERROR("sem_relache", spaceListSemId);
|
||||
goto ERROR;
|
||||
}
|
||||
|
||||
/* Ferme le semaphore */
|
||||
if (sem_close(msgSpaceListSemFd) == -1) {
|
||||
NZG_ERROR("sem_close", spaceListSemId);
|
||||
goto ERROR;
|
||||
}
|
||||
|
||||
return 0;
|
||||
ERROR:
|
||||
return -1;
|
||||
};
|
||||
|
|
@ -1,30 +0,0 @@
|
|||
#include "libnazgul.h"
|
||||
#include "ids.h"
|
||||
|
||||
void *msgSpaceListOpen()
|
||||
{
|
||||
int listFd;
|
||||
void *listAddr;
|
||||
|
||||
msgSpaceListId spaceListId;
|
||||
strcpy(spaceListId, DEFAULT_MSGSPACELISTID);
|
||||
|
||||
listFd = shm_open(spaceListId, O_RDWR, SHM_DEFAULT_MODE);
|
||||
if (listFd == -1) {
|
||||
NZG_ERROR("shm_open : msgSpaceList open", spaceListId);
|
||||
goto ERROR;
|
||||
}
|
||||
|
||||
listAddr = mmap(NULL,
|
||||
sizeof(msgSpaceList),
|
||||
PROT_READ | PROT_WRITE, MAP_SHARED, listFd, 0);
|
||||
if (listAddr == MAP_FAILED) {
|
||||
NZG_ERROR("mmap", spaceListId);
|
||||
goto ERROR;
|
||||
}
|
||||
|
||||
close(listFd);
|
||||
return listAddr;
|
||||
ERROR:
|
||||
return NULL;
|
||||
}
|
||||
|
|
@ -1,128 +0,0 @@
|
|||
#include "libnazgul.h"
|
||||
|
||||
#define DEBUG 1
|
||||
|
||||
int msgSpaceListRem(msgSpaceId spaceId)
|
||||
{
|
||||
msgSpaceList *list;
|
||||
msgSpaceListElemId listHeadElemId;
|
||||
msgSpaceListElemId listTailElemId;
|
||||
msgSpaceListId listId;
|
||||
|
||||
msgSpaceListElemId prevElemId;
|
||||
msgSpaceListElemId currElemId;
|
||||
msgSpaceListElemId nextElemId;
|
||||
|
||||
msgSpaceListElem *prevElem;
|
||||
msgSpaceListElem *currElem;
|
||||
msgSpaceId currSpaceId;
|
||||
|
||||
list = msgSpaceListOpen();
|
||||
if (list == NULL) {
|
||||
NZG_ERROR("msgSpaceListOpen", "");
|
||||
goto ERROR;
|
||||
}
|
||||
if (DEBUG) {
|
||||
printf("Before ListStrCpy\n");
|
||||
}
|
||||
strcpy(listHeadElemId, list->headId);
|
||||
strcpy(listTailElemId, list->tailId);
|
||||
strcpy(listId, list->id);
|
||||
if (DEBUG) {
|
||||
printf("After ListStrCpy\n");
|
||||
}
|
||||
if ((strcmp(listHeadElemId, listId) == 0)
|
||||
&& strcmp(listTailElemId, listId) == 0) {
|
||||
if (DEBUG) {
|
||||
printf("SpaceList : vide\n");
|
||||
}
|
||||
return 1;
|
||||
} else {
|
||||
bool found = false;
|
||||
|
||||
strcpy(prevElemId, list->headId);
|
||||
strcpy(currElemId, list->headId);
|
||||
while (!found) {
|
||||
printf("Recherche dans l'element %s\n", listHeadElemId);
|
||||
currElem = msgSpaceListElemOpen(currElemId);
|
||||
if (currElem == NULL) {
|
||||
NZG_ERROR("msgSpaceListElemOpen", currElemId);
|
||||
goto ERROR;
|
||||
}
|
||||
strcpy(nextElemId, currElem->next);
|
||||
strcpy(currSpaceId, currElem->spaceId);
|
||||
if (msgSpaceListElemClose(currElem) < 0) {
|
||||
NZG_ERROR("msgSpaceListElemClose", currElemId);
|
||||
goto ERROR;
|
||||
}
|
||||
if (strcmp(prevElemId, nextElemId) == 0) {
|
||||
// list à 1 seul élement
|
||||
if (strcmp(currSpaceId, spaceId) == 0) {
|
||||
// on a trouvé l'elem
|
||||
strcpy(list->headId, list->id);
|
||||
strcpy(list->tailId, list->id);
|
||||
// on efface
|
||||
shm_unlink(currElemId);
|
||||
found = true;
|
||||
} else {
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
// liste à plusieurs élements...
|
||||
if (strcmp(currSpaceId, spaceId) == 0) {
|
||||
// ca correspond
|
||||
if (strcmp(prevElemId, currElemId) == 0) {
|
||||
// si on est en début de liste (prev=current)
|
||||
// - la tete de liste pointe sur le suivant
|
||||
strcpy(list->headId,
|
||||
nextElemId);
|
||||
} else {
|
||||
if (strcmp
|
||||
(currElemId,
|
||||
nextElemId) == 0) {
|
||||
// si on est en find de liste (current=next)
|
||||
// - on fait pointer la queue de liste sur le précédent
|
||||
strcpy(list->tailId,
|
||||
prevElemId);
|
||||
// - on fait pointer le précédent sur lui-meme
|
||||
prevElem =
|
||||
msgSpaceListElemOpen
|
||||
(prevElemId);
|
||||
strcpy(prevElem->next,
|
||||
prevElemId);
|
||||
msgSpaceListElemClose
|
||||
(prevElem);
|
||||
} else {
|
||||
// on est en milieu de liste
|
||||
// - on fait pointer le précédent sur le suivant
|
||||
prevElem =
|
||||
msgSpaceListElemOpen
|
||||
(prevElemId);
|
||||
strcpy(prevElem->next,
|
||||
nextElemId);
|
||||
msgSpaceListElemClose
|
||||
(prevElem);
|
||||
}
|
||||
}
|
||||
// - on détruit l'actuel
|
||||
shm_unlink(currElemId);
|
||||
found = true;
|
||||
break;
|
||||
} else {
|
||||
//cela ne correspond pas
|
||||
//on recopie
|
||||
strcpy(prevElemId, currElemId);
|
||||
strcpy(currElemId, nextElemId);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
if (msgSpaceListClose(list) < 0) {
|
||||
NZG_ERROR("msgSpaceListClose", "");
|
||||
goto ERROR;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
ERROR:
|
||||
return -1;
|
||||
}
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
#include "libnazgul.h"
|
||||
#include "ids.h"
|
||||
|
||||
/* prototypes des fonctions annexes à ne pas exporter */
|
||||
int msgSpaceIdIntern(msgSpaceId dest, const msgSpaceId src);
|
||||
int msgPoolDataIdIntern(msgSpaceId dest, const msgSpaceId src);
|
||||
|
||||
msgSpace *msgSpaceOpen(msgSpaceId externId)
|
||||
{
|
||||
int shmFd;
|
||||
msgSpaceId nzgId;
|
||||
msgSpace *mSAddr;
|
||||
if (msgSpaceIdIntern(nzgId, externId) < 0) {
|
||||
return NULL;
|
||||
}
|
||||
if ((shmFd = shm_open(nzgId, O_RDWR, MSGSPACE_DEFAULT_MODE)) < 0) {
|
||||
perror("shm_open");
|
||||
return NULL;
|
||||
}
|
||||
mSAddr =
|
||||
mmap(NULL, sizeof(msgSpace), PROT_READ | PROT_WRITE, MAP_SHARED,
|
||||
shmFd, (off_t) 0);
|
||||
|
||||
printf("OPEN: msgSpace mapped to %p in %d\n", (void *)mSAddr,
|
||||
(int)getpid());
|
||||
return mSAddr;
|
||||
}
|
||||
|
|
@ -1 +0,0 @@
|
|||
#include "libnazgul.h"
|
||||
0
src/types.h
Normal file
0
src/types.h
Normal file
|
|
@ -1,70 +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
|
||||
#
|
||||
#-------------------------------------------------------------------%
|
||||
|
||||
OS=$(shell uname -s)
|
||||
CC=gcc
|
||||
|
||||
CFLAGS=-Wall -O2 -ggdb
|
||||
#-O2 -ggdb
|
||||
INCLUDES=-I /usr/include/ -I ../src/
|
||||
LIBINC=-L /usr/lib -L ../src
|
||||
|
||||
BASELIBS=-lnazgul
|
||||
LIBS=$(BASELIBS)
|
||||
|
||||
DEFS=
|
||||
|
||||
ifeq "HP-UX" "${OS}"
|
||||
DEFS=-D_NZG_HPUX
|
||||
LIBS=$(BASELIBS) -lpthread -lrt
|
||||
endif
|
||||
|
||||
ifeq "SunOS" "${OS}"
|
||||
DEFS=-D_NZG_SUNOS
|
||||
LIBS=$(BASELIBS) -lrt
|
||||
endif
|
||||
|
||||
ifeq "Linux" "${OS}"
|
||||
DEFS=-D_NZG_LINUX
|
||||
LIBS=$(BASELIBS) -lrt -lpthread
|
||||
endif
|
||||
|
||||
PRJNAME=Libnazgul
|
||||
GDATE := $(shell date +"-%Y-%m-%d_r%H")
|
||||
GFILENAME := ../$(PRJNAME)$(GDATE).tar.bz2
|
||||
LOCALDIR = $(shell pwd)
|
||||
CFILES := $(shell ls *.c)
|
||||
#OFILES := $(patsubst %.c,%.o,$(CFILES))
|
||||
FILES := $(patsubst %.c,%,$(CFILES))
|
||||
|
||||
all: build
|
||||
|
||||
build : $(FILES)
|
||||
|
||||
clean:
|
||||
@echo -e "Cleaning..."
|
||||
@rm -f *.a
|
||||
@rm -f *.o
|
||||
@rm -f $(FILES)
|
||||
|
||||
% : %.c
|
||||
$(CC) -o $* $< $(INCLUDES) $(LIBINC) $(LIBS) $(CFLAGS) $(DEFS)
|
||||
|
||||
|
|
@ -1,66 +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,111 +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,56 +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,58 +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;
|
||||
}
|
||||
Loading…
Reference in a new issue