diff --git a/LICENSE b/LICENSE index a98a793..39dca48 100644 --- a/LICENSE +++ b/LICENSE @@ -1,388 +1,388 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -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 -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -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 software, or if you modify it. - - 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. - - 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 author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -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 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. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 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". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -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. - - 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) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - 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 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 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. - -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 Program. - -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 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: - - 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, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -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. - - 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 Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -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 Program or works based on it. - - 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. - - 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 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 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. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 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 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. - - 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 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. - - 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. - - NO WARRANTY - - 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. - - 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. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - 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. - - 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. - - - Copyright (C) 19yy - - 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 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 - - -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 program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -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. --------------------------------------------------------------------------------------------- -Copyright (c) 2006-2007 Frans Kaashoek, Robert Morris, and Russ Cox - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. --------------------------------------------------------------------------------------------- -Copyright (c) 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2009 - The President and Fellows of Harvard College. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - 3. Neither the name of the University nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE UNIVERSITY AND CONTRIBUTORS ``AS IS'' AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - ARE DISCLAIMED. IN NO EVENT SHALL THE UNIVERSITY OR CONTRIBUTORS BE LIABLE - FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - SUCH DAMAGE. + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +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 +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +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 software, or if you modify it. + + 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. + + 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 author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +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 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. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 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". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +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. + + 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) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + 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 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 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. + +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 Program. + +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 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: + + 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, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +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. + + 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 Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +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 Program or works based on it. + + 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. + + 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 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 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. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 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 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. + + 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 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. + + 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. + + NO WARRANTY + + 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. + + 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. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + 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. + + 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. + + + Copyright (C) 19yy + + 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 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 + + +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 program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +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. +-------------------------------------------------------------------------------------------- +Copyright (c) 2006-2007 Frans Kaashoek, Robert Morris, and Russ Cox + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. +-------------------------------------------------------------------------------------------- +Copyright (c) 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2009 + The President and Fellows of Harvard College. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. Neither the name of the University nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE UNIVERSITY AND CONTRIBUTORS ``AS IS'' AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE UNIVERSITY OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + SUCH DAMAGE. ------------------------------------------------------------------------------------------- \ No newline at end of file diff --git a/code/lab2/kern/mm/memlayout.h b/code/lab2/kern/mm/memlayout.h index 8b18fe5..12af91c 100644 --- a/code/lab2/kern/mm/memlayout.h +++ b/code/lab2/kern/mm/memlayout.h @@ -97,7 +97,7 @@ struct e820map { * that convert Page to other data types, such as phyical address. * */ struct Page { - atomic_t ref; // page frame's reference counter + int ref; // page frame's reference counter uint32_t flags; // array of flags that describe the status of the page frame unsigned int property; // the num of free block, used in first fit pm manager list_entry_t page_link; // free list link diff --git a/code/lab2/kern/mm/pmm.h b/code/lab2/kern/mm/pmm.h index 54d573e..1d97c75 100644 --- a/code/lab2/kern/mm/pmm.h +++ b/code/lab2/kern/mm/pmm.h @@ -117,22 +117,24 @@ pde2page(pde_t pde) { static inline int page_ref(struct Page *page) { - return atomic_read(&(page->ref)); + return page->ref; } static inline void set_page_ref(struct Page *page, int val) { - atomic_set(&(page->ref), val); + page->ref = val; } static inline int page_ref_inc(struct Page *page) { - return atomic_add_return(&(page->ref), 1); + page->ref += 1; + return page->ref; } static inline int page_ref_dec(struct Page *page) { - return atomic_sub_return(&(page->ref), 1); + page->ref -= 1; + return page->ref; } extern char bootstack[], bootstacktop[]; diff --git a/code/lab2/libs/atomic.h b/code/lab2/libs/atomic.h index a3a9525..958be2e 100644 --- a/code/lab2/libs/atomic.h +++ b/code/lab2/libs/atomic.h @@ -3,167 +3,9 @@ /* Atomic operations that C can't guarantee us. Useful for resource counting etc.. */ -typedef struct { - volatile int counter; -} atomic_t; - -static inline int atomic_read(const atomic_t *v) __attribute__((always_inline)); -static inline void atomic_set(atomic_t *v, int i) __attribute__((always_inline)); -static inline void atomic_add(atomic_t *v, int i) __attribute__((always_inline)); -static inline void atomic_sub(atomic_t *v, int i) __attribute__((always_inline)); -static inline bool atomic_sub_test_zero(atomic_t *v, int i) __attribute__((always_inline)); -static inline void atomic_inc(atomic_t *v) __attribute__((always_inline)); -static inline void atomic_dec(atomic_t *v) __attribute__((always_inline)); -static inline bool atomic_inc_test_zero(atomic_t *v) __attribute__((always_inline)); -static inline bool atomic_dec_test_zero(atomic_t *v) __attribute__((always_inline)); -static inline int atomic_add_return(atomic_t *v, int i) __attribute__((always_inline)); -static inline int atomic_sub_return(atomic_t *v, int i) __attribute__((always_inline)); - -/* * - * atomic_read - read atomic variable - * @v: pointer of type atomic_t - * - * Atomically reads the value of @v. - * */ -static inline int -atomic_read(const atomic_t *v) { - return v->counter; -} - -/* * - * atomic_set - set atomic variable - * @v: pointer of type atomic_t - * @i: required value - * - * Atomically sets the value of @v to @i. - * */ -static inline void -atomic_set(atomic_t *v, int i) { - v->counter = i; -} - -/* * - * atomic_add - add integer to atomic variable - * @v: pointer of type atomic_t - * @i: integer value to add - * - * Atomically adds @i to @v. - * */ -static inline void -atomic_add(atomic_t *v, int i) { - asm volatile ("addl %1, %0" : "+m" (v->counter) : "ir" (i)); -} - -/* * - * atomic_sub - subtract integer from atomic variable - * @v: pointer of type atomic_t - * @i: integer value to subtract - * - * Atomically subtracts @i from @v. - * */ -static inline void -atomic_sub(atomic_t *v, int i) { - asm volatile("subl %1, %0" : "+m" (v->counter) : "ir" (i)); -} - -/* * - * atomic_sub_test_zero - subtract value from variable and test result - * @v: pointer of type atomic_t - * @i: integer value to subtract - * - * Atomically subtracts @i from @v and - * returns true if the result is zero, or false for all other cases. - * */ -static inline bool -atomic_sub_test_zero(atomic_t *v, int i) { - unsigned char c; - asm volatile("subl %2, %0; sete %1" : "+m" (v->counter), "=qm" (c) : "ir" (i) : "memory"); - return c != 0; -} - -/* * - * atomic_inc - increment atomic variable - * @v: pointer of type atomic_t - * - * Atomically increments @v by 1. - * */ -static inline void -atomic_inc(atomic_t *v) { - asm volatile("incl %0" : "+m" (v->counter)); -} - -/* * - * atomic_dec - decrement atomic variable - * @v: pointer of type atomic_t - * - * Atomically decrements @v by 1. - * */ -static inline void -atomic_dec(atomic_t *v) { - asm volatile("decl %0" : "+m" (v->counter)); -} - -/* * - * atomic_inc_test_zero - increment and test - * @v: pointer of type atomic_t - * - * Atomically increments @v by 1 and - * returns true if the result is zero, or false for all other cases. - * */ -static inline bool -atomic_inc_test_zero(atomic_t *v) { - unsigned char c; - asm volatile("incl %0; sete %1" : "+m" (v->counter), "=qm" (c) :: "memory"); - return c != 0; -} - -/* * - * atomic_dec_test_zero - decrement and test - * @v: pointer of type atomic_t - * - * Atomically decrements @v by 1 and - * returns true if the result is 0, or false for all other cases. - * */ -static inline bool -atomic_dec_test_zero(atomic_t *v) { - unsigned char c; - asm volatile("decl %0; sete %1" : "+m" (v->counter), "=qm" (c) :: "memory"); - return c != 0; -} - -/* * - * atomic_add_return - add integer and return - * @i: integer value to add - * @v: pointer of type atomic_t - * - * Atomically adds @i to @v and returns @i + @v - * Requires Modern 486+ processor - * */ -static inline int -atomic_add_return(atomic_t *v, int i) { - int __i = i; - asm volatile("xaddl %0, %1" : "+r" (i), "+m" (v->counter) :: "memory"); - return i + __i; -} - -/* * - * atomic_sub_return - subtract integer and return - * @v: pointer of type atomic_t - * @i: integer value to subtract - * - * Atomically subtracts @i from @v and returns @v - @i - * */ -static inline int -atomic_sub_return(atomic_t *v, int i) { - return atomic_add_return(v, -i); -} - static inline void set_bit(int nr, volatile void *addr) __attribute__((always_inline)); static inline void clear_bit(int nr, volatile void *addr) __attribute__((always_inline)); static inline void change_bit(int nr, volatile void *addr) __attribute__((always_inline)); -static inline bool test_and_set_bit(int nr, volatile void *addr) __attribute__((always_inline)); -static inline bool test_and_clear_bit(int nr, volatile void *addr) __attribute__((always_inline)); -static inline bool test_and_change_bit(int nr, volatile void *addr) __attribute__((always_inline)); static inline bool test_bit(int nr, volatile void *addr) __attribute__((always_inline)); /* * @@ -199,42 +41,6 @@ change_bit(int nr, volatile void *addr) { asm volatile ("btcl %1, %0" :"=m" (*(volatile long *)addr) : "Ir" (nr)); } -/* * - * test_and_set_bit - Atomically set a bit and return its old value - * @nr: the bit to set - * @addr: the address to count from - * */ -static inline bool -test_and_set_bit(int nr, volatile void *addr) { - int oldbit; - asm volatile ("btsl %2, %1; sbbl %0, %0" : "=r" (oldbit), "=m" (*(volatile long *)addr) : "Ir" (nr) : "memory"); - return oldbit != 0; -} - -/* * - * test_and_clear_bit - Atomically clear a bit and return its old value - * @nr: the bit to clear - * @addr: the address to count from - * */ -static inline bool -test_and_clear_bit(int nr, volatile void *addr) { - int oldbit; - asm volatile ("btrl %2, %1; sbbl %0, %0" : "=r" (oldbit), "=m" (*(volatile long *)addr) : "Ir" (nr) : "memory"); - return oldbit != 0; -} - -/* * - * test_and_change_bit - Atomically change a bit and return its old value - * @nr: the bit to change - * @addr: the address to count from - * */ -static inline bool -test_and_change_bit(int nr, volatile void *addr) { - int oldbit; - asm volatile ("btcl %2, %1; sbbl %0, %0" : "=r" (oldbit), "=m" (*(volatile long *)addr) : "Ir" (nr) : "memory"); - return oldbit != 0; -} - /* * * test_bit - Determine whether a bit is set * @nr: the bit to test diff --git a/code/lab3/kern/mm/memlayout.h b/code/lab3/kern/mm/memlayout.h index af4f82e..f0c6816 100644 --- a/code/lab3/kern/mm/memlayout.h +++ b/code/lab3/kern/mm/memlayout.h @@ -98,7 +98,7 @@ struct e820map { * that convert Page to other data types, such as phyical address. * */ struct Page { - atomic_t ref; // page frame's reference counter + int ref; // page frame's reference counter uint32_t flags; // array of flags that describe the status of the page frame unsigned int property; // the num of free block, used in first fit pm manager list_entry_t page_link; // free list link diff --git a/code/lab3/kern/mm/pmm.h b/code/lab3/kern/mm/pmm.h index 003084f..d820922 100644 --- a/code/lab3/kern/mm/pmm.h +++ b/code/lab3/kern/mm/pmm.h @@ -118,22 +118,24 @@ pde2page(pde_t pde) { static inline int page_ref(struct Page *page) { - return atomic_read(&(page->ref)); + return page->ref; } static inline void set_page_ref(struct Page *page, int val) { - atomic_set(&(page->ref), val); + page->ref = val; } static inline int page_ref_inc(struct Page *page) { - return atomic_add_return(&(page->ref), 1); + page->ref += 1; + return page->ref; } static inline int page_ref_dec(struct Page *page) { - return atomic_sub_return(&(page->ref), 1); + page->ref -= 1; + return page->ref; } extern char bootstack[], bootstacktop[]; diff --git a/code/lab3/libs/atomic.h b/code/lab3/libs/atomic.h index a3a9525..958be2e 100644 --- a/code/lab3/libs/atomic.h +++ b/code/lab3/libs/atomic.h @@ -3,167 +3,9 @@ /* Atomic operations that C can't guarantee us. Useful for resource counting etc.. */ -typedef struct { - volatile int counter; -} atomic_t; - -static inline int atomic_read(const atomic_t *v) __attribute__((always_inline)); -static inline void atomic_set(atomic_t *v, int i) __attribute__((always_inline)); -static inline void atomic_add(atomic_t *v, int i) __attribute__((always_inline)); -static inline void atomic_sub(atomic_t *v, int i) __attribute__((always_inline)); -static inline bool atomic_sub_test_zero(atomic_t *v, int i) __attribute__((always_inline)); -static inline void atomic_inc(atomic_t *v) __attribute__((always_inline)); -static inline void atomic_dec(atomic_t *v) __attribute__((always_inline)); -static inline bool atomic_inc_test_zero(atomic_t *v) __attribute__((always_inline)); -static inline bool atomic_dec_test_zero(atomic_t *v) __attribute__((always_inline)); -static inline int atomic_add_return(atomic_t *v, int i) __attribute__((always_inline)); -static inline int atomic_sub_return(atomic_t *v, int i) __attribute__((always_inline)); - -/* * - * atomic_read - read atomic variable - * @v: pointer of type atomic_t - * - * Atomically reads the value of @v. - * */ -static inline int -atomic_read(const atomic_t *v) { - return v->counter; -} - -/* * - * atomic_set - set atomic variable - * @v: pointer of type atomic_t - * @i: required value - * - * Atomically sets the value of @v to @i. - * */ -static inline void -atomic_set(atomic_t *v, int i) { - v->counter = i; -} - -/* * - * atomic_add - add integer to atomic variable - * @v: pointer of type atomic_t - * @i: integer value to add - * - * Atomically adds @i to @v. - * */ -static inline void -atomic_add(atomic_t *v, int i) { - asm volatile ("addl %1, %0" : "+m" (v->counter) : "ir" (i)); -} - -/* * - * atomic_sub - subtract integer from atomic variable - * @v: pointer of type atomic_t - * @i: integer value to subtract - * - * Atomically subtracts @i from @v. - * */ -static inline void -atomic_sub(atomic_t *v, int i) { - asm volatile("subl %1, %0" : "+m" (v->counter) : "ir" (i)); -} - -/* * - * atomic_sub_test_zero - subtract value from variable and test result - * @v: pointer of type atomic_t - * @i: integer value to subtract - * - * Atomically subtracts @i from @v and - * returns true if the result is zero, or false for all other cases. - * */ -static inline bool -atomic_sub_test_zero(atomic_t *v, int i) { - unsigned char c; - asm volatile("subl %2, %0; sete %1" : "+m" (v->counter), "=qm" (c) : "ir" (i) : "memory"); - return c != 0; -} - -/* * - * atomic_inc - increment atomic variable - * @v: pointer of type atomic_t - * - * Atomically increments @v by 1. - * */ -static inline void -atomic_inc(atomic_t *v) { - asm volatile("incl %0" : "+m" (v->counter)); -} - -/* * - * atomic_dec - decrement atomic variable - * @v: pointer of type atomic_t - * - * Atomically decrements @v by 1. - * */ -static inline void -atomic_dec(atomic_t *v) { - asm volatile("decl %0" : "+m" (v->counter)); -} - -/* * - * atomic_inc_test_zero - increment and test - * @v: pointer of type atomic_t - * - * Atomically increments @v by 1 and - * returns true if the result is zero, or false for all other cases. - * */ -static inline bool -atomic_inc_test_zero(atomic_t *v) { - unsigned char c; - asm volatile("incl %0; sete %1" : "+m" (v->counter), "=qm" (c) :: "memory"); - return c != 0; -} - -/* * - * atomic_dec_test_zero - decrement and test - * @v: pointer of type atomic_t - * - * Atomically decrements @v by 1 and - * returns true if the result is 0, or false for all other cases. - * */ -static inline bool -atomic_dec_test_zero(atomic_t *v) { - unsigned char c; - asm volatile("decl %0; sete %1" : "+m" (v->counter), "=qm" (c) :: "memory"); - return c != 0; -} - -/* * - * atomic_add_return - add integer and return - * @i: integer value to add - * @v: pointer of type atomic_t - * - * Atomically adds @i to @v and returns @i + @v - * Requires Modern 486+ processor - * */ -static inline int -atomic_add_return(atomic_t *v, int i) { - int __i = i; - asm volatile("xaddl %0, %1" : "+r" (i), "+m" (v->counter) :: "memory"); - return i + __i; -} - -/* * - * atomic_sub_return - subtract integer and return - * @v: pointer of type atomic_t - * @i: integer value to subtract - * - * Atomically subtracts @i from @v and returns @v - @i - * */ -static inline int -atomic_sub_return(atomic_t *v, int i) { - return atomic_add_return(v, -i); -} - static inline void set_bit(int nr, volatile void *addr) __attribute__((always_inline)); static inline void clear_bit(int nr, volatile void *addr) __attribute__((always_inline)); static inline void change_bit(int nr, volatile void *addr) __attribute__((always_inline)); -static inline bool test_and_set_bit(int nr, volatile void *addr) __attribute__((always_inline)); -static inline bool test_and_clear_bit(int nr, volatile void *addr) __attribute__((always_inline)); -static inline bool test_and_change_bit(int nr, volatile void *addr) __attribute__((always_inline)); static inline bool test_bit(int nr, volatile void *addr) __attribute__((always_inline)); /* * @@ -199,42 +41,6 @@ change_bit(int nr, volatile void *addr) { asm volatile ("btcl %1, %0" :"=m" (*(volatile long *)addr) : "Ir" (nr)); } -/* * - * test_and_set_bit - Atomically set a bit and return its old value - * @nr: the bit to set - * @addr: the address to count from - * */ -static inline bool -test_and_set_bit(int nr, volatile void *addr) { - int oldbit; - asm volatile ("btsl %2, %1; sbbl %0, %0" : "=r" (oldbit), "=m" (*(volatile long *)addr) : "Ir" (nr) : "memory"); - return oldbit != 0; -} - -/* * - * test_and_clear_bit - Atomically clear a bit and return its old value - * @nr: the bit to clear - * @addr: the address to count from - * */ -static inline bool -test_and_clear_bit(int nr, volatile void *addr) { - int oldbit; - asm volatile ("btrl %2, %1; sbbl %0, %0" : "=r" (oldbit), "=m" (*(volatile long *)addr) : "Ir" (nr) : "memory"); - return oldbit != 0; -} - -/* * - * test_and_change_bit - Atomically change a bit and return its old value - * @nr: the bit to change - * @addr: the address to count from - * */ -static inline bool -test_and_change_bit(int nr, volatile void *addr) { - int oldbit; - asm volatile ("btcl %2, %1; sbbl %0, %0" : "=r" (oldbit), "=m" (*(volatile long *)addr) : "Ir" (nr) : "memory"); - return oldbit != 0; -} - /* * * test_bit - Determine whether a bit is set * @nr: the bit to test diff --git a/code/lab4/kern/mm/memlayout.h b/code/lab4/kern/mm/memlayout.h index 26fbe9f..b6b4094 100644 --- a/code/lab4/kern/mm/memlayout.h +++ b/code/lab4/kern/mm/memlayout.h @@ -98,7 +98,7 @@ struct e820map { * that convert Page to other data types, such as phyical address. * */ struct Page { - atomic_t ref; // page frame's reference counter + int ref; // page frame's reference counter uint32_t flags; // array of flags that describe the status of the page frame unsigned int property; // used in buddy system, stores the order (the X in 2^X) of the continuous memory block int zone_num; // used in buddy system, the No. of zone which the page belongs to diff --git a/code/lab4/kern/mm/pmm.h b/code/lab4/kern/mm/pmm.h index 8b0a9f2..e4b1807 100644 --- a/code/lab4/kern/mm/pmm.h +++ b/code/lab4/kern/mm/pmm.h @@ -122,22 +122,24 @@ pde2page(pde_t pde) { static inline int page_ref(struct Page *page) { - return atomic_read(&(page->ref)); + return page->ref; } static inline void set_page_ref(struct Page *page, int val) { - atomic_set(&(page->ref), val); + page->ref = val; } static inline int page_ref_inc(struct Page *page) { - return atomic_add_return(&(page->ref), 1); + page->ref += 1; + return page->ref; } static inline int page_ref_dec(struct Page *page) { - return atomic_sub_return(&(page->ref), 1); + page->ref -= 1; + return page->ref; } extern char bootstack[], bootstacktop[]; diff --git a/code/lab4/libs/atomic.h b/code/lab4/libs/atomic.h index a3a9525..958be2e 100644 --- a/code/lab4/libs/atomic.h +++ b/code/lab4/libs/atomic.h @@ -3,167 +3,9 @@ /* Atomic operations that C can't guarantee us. Useful for resource counting etc.. */ -typedef struct { - volatile int counter; -} atomic_t; - -static inline int atomic_read(const atomic_t *v) __attribute__((always_inline)); -static inline void atomic_set(atomic_t *v, int i) __attribute__((always_inline)); -static inline void atomic_add(atomic_t *v, int i) __attribute__((always_inline)); -static inline void atomic_sub(atomic_t *v, int i) __attribute__((always_inline)); -static inline bool atomic_sub_test_zero(atomic_t *v, int i) __attribute__((always_inline)); -static inline void atomic_inc(atomic_t *v) __attribute__((always_inline)); -static inline void atomic_dec(atomic_t *v) __attribute__((always_inline)); -static inline bool atomic_inc_test_zero(atomic_t *v) __attribute__((always_inline)); -static inline bool atomic_dec_test_zero(atomic_t *v) __attribute__((always_inline)); -static inline int atomic_add_return(atomic_t *v, int i) __attribute__((always_inline)); -static inline int atomic_sub_return(atomic_t *v, int i) __attribute__((always_inline)); - -/* * - * atomic_read - read atomic variable - * @v: pointer of type atomic_t - * - * Atomically reads the value of @v. - * */ -static inline int -atomic_read(const atomic_t *v) { - return v->counter; -} - -/* * - * atomic_set - set atomic variable - * @v: pointer of type atomic_t - * @i: required value - * - * Atomically sets the value of @v to @i. - * */ -static inline void -atomic_set(atomic_t *v, int i) { - v->counter = i; -} - -/* * - * atomic_add - add integer to atomic variable - * @v: pointer of type atomic_t - * @i: integer value to add - * - * Atomically adds @i to @v. - * */ -static inline void -atomic_add(atomic_t *v, int i) { - asm volatile ("addl %1, %0" : "+m" (v->counter) : "ir" (i)); -} - -/* * - * atomic_sub - subtract integer from atomic variable - * @v: pointer of type atomic_t - * @i: integer value to subtract - * - * Atomically subtracts @i from @v. - * */ -static inline void -atomic_sub(atomic_t *v, int i) { - asm volatile("subl %1, %0" : "+m" (v->counter) : "ir" (i)); -} - -/* * - * atomic_sub_test_zero - subtract value from variable and test result - * @v: pointer of type atomic_t - * @i: integer value to subtract - * - * Atomically subtracts @i from @v and - * returns true if the result is zero, or false for all other cases. - * */ -static inline bool -atomic_sub_test_zero(atomic_t *v, int i) { - unsigned char c; - asm volatile("subl %2, %0; sete %1" : "+m" (v->counter), "=qm" (c) : "ir" (i) : "memory"); - return c != 0; -} - -/* * - * atomic_inc - increment atomic variable - * @v: pointer of type atomic_t - * - * Atomically increments @v by 1. - * */ -static inline void -atomic_inc(atomic_t *v) { - asm volatile("incl %0" : "+m" (v->counter)); -} - -/* * - * atomic_dec - decrement atomic variable - * @v: pointer of type atomic_t - * - * Atomically decrements @v by 1. - * */ -static inline void -atomic_dec(atomic_t *v) { - asm volatile("decl %0" : "+m" (v->counter)); -} - -/* * - * atomic_inc_test_zero - increment and test - * @v: pointer of type atomic_t - * - * Atomically increments @v by 1 and - * returns true if the result is zero, or false for all other cases. - * */ -static inline bool -atomic_inc_test_zero(atomic_t *v) { - unsigned char c; - asm volatile("incl %0; sete %1" : "+m" (v->counter), "=qm" (c) :: "memory"); - return c != 0; -} - -/* * - * atomic_dec_test_zero - decrement and test - * @v: pointer of type atomic_t - * - * Atomically decrements @v by 1 and - * returns true if the result is 0, or false for all other cases. - * */ -static inline bool -atomic_dec_test_zero(atomic_t *v) { - unsigned char c; - asm volatile("decl %0; sete %1" : "+m" (v->counter), "=qm" (c) :: "memory"); - return c != 0; -} - -/* * - * atomic_add_return - add integer and return - * @i: integer value to add - * @v: pointer of type atomic_t - * - * Atomically adds @i to @v and returns @i + @v - * Requires Modern 486+ processor - * */ -static inline int -atomic_add_return(atomic_t *v, int i) { - int __i = i; - asm volatile("xaddl %0, %1" : "+r" (i), "+m" (v->counter) :: "memory"); - return i + __i; -} - -/* * - * atomic_sub_return - subtract integer and return - * @v: pointer of type atomic_t - * @i: integer value to subtract - * - * Atomically subtracts @i from @v and returns @v - @i - * */ -static inline int -atomic_sub_return(atomic_t *v, int i) { - return atomic_add_return(v, -i); -} - static inline void set_bit(int nr, volatile void *addr) __attribute__((always_inline)); static inline void clear_bit(int nr, volatile void *addr) __attribute__((always_inline)); static inline void change_bit(int nr, volatile void *addr) __attribute__((always_inline)); -static inline bool test_and_set_bit(int nr, volatile void *addr) __attribute__((always_inline)); -static inline bool test_and_clear_bit(int nr, volatile void *addr) __attribute__((always_inline)); -static inline bool test_and_change_bit(int nr, volatile void *addr) __attribute__((always_inline)); static inline bool test_bit(int nr, volatile void *addr) __attribute__((always_inline)); /* * @@ -199,42 +41,6 @@ change_bit(int nr, volatile void *addr) { asm volatile ("btcl %1, %0" :"=m" (*(volatile long *)addr) : "Ir" (nr)); } -/* * - * test_and_set_bit - Atomically set a bit and return its old value - * @nr: the bit to set - * @addr: the address to count from - * */ -static inline bool -test_and_set_bit(int nr, volatile void *addr) { - int oldbit; - asm volatile ("btsl %2, %1; sbbl %0, %0" : "=r" (oldbit), "=m" (*(volatile long *)addr) : "Ir" (nr) : "memory"); - return oldbit != 0; -} - -/* * - * test_and_clear_bit - Atomically clear a bit and return its old value - * @nr: the bit to clear - * @addr: the address to count from - * */ -static inline bool -test_and_clear_bit(int nr, volatile void *addr) { - int oldbit; - asm volatile ("btrl %2, %1; sbbl %0, %0" : "=r" (oldbit), "=m" (*(volatile long *)addr) : "Ir" (nr) : "memory"); - return oldbit != 0; -} - -/* * - * test_and_change_bit - Atomically change a bit and return its old value - * @nr: the bit to change - * @addr: the address to count from - * */ -static inline bool -test_and_change_bit(int nr, volatile void *addr) { - int oldbit; - asm volatile ("btcl %2, %1; sbbl %0, %0" : "=r" (oldbit), "=m" (*(volatile long *)addr) : "Ir" (nr) : "memory"); - return oldbit != 0; -} - /* * * test_bit - Determine whether a bit is set * @nr: the bit to test diff --git a/code/lab5/kern/mm/memlayout.h b/code/lab5/kern/mm/memlayout.h index d84bf93..825dd66 100644 --- a/code/lab5/kern/mm/memlayout.h +++ b/code/lab5/kern/mm/memlayout.h @@ -127,7 +127,7 @@ struct e820map { * that convert Page to other data types, such as phyical address. * */ struct Page { - atomic_t ref; // page frame's reference counter + int ref; // page frame's reference counter uint32_t flags; // array of flags that describe the status of the page frame unsigned int property; // used in buddy system, stores the order (the X in 2^X) of the continuous memory block int zone_num; // used in buddy system, the No. of zone which the page belongs to diff --git a/code/lab5/kern/mm/pmm.h b/code/lab5/kern/mm/pmm.h index 1e229a7..c9470fe 100644 --- a/code/lab5/kern/mm/pmm.h +++ b/code/lab5/kern/mm/pmm.h @@ -121,22 +121,24 @@ pde2page(pde_t pde) { static inline int page_ref(struct Page *page) { - return atomic_read(&(page->ref)); + return page->ref; } static inline void set_page_ref(struct Page *page, int val) { - atomic_set(&(page->ref), val); + page->ref = val; } static inline int page_ref_inc(struct Page *page) { - return atomic_add_return(&(page->ref), 1); + page->ref += 1; + return page->ref; } static inline int page_ref_dec(struct Page *page) { - return atomic_sub_return(&(page->ref), 1); + page->ref -= 1; + return page->ref; } extern char bootstack[], bootstacktop[]; diff --git a/code/lab5/kern/mm/vmm.h b/code/lab5/kern/mm/vmm.h index b2abfdd..53f98d1 100644 --- a/code/lab5/kern/mm/vmm.h +++ b/code/lab5/kern/mm/vmm.h @@ -33,7 +33,7 @@ struct mm_struct { pde_t *pgdir; // the PDT of these vma int map_count; // the count of these vma void *sm_priv; // the private data for swap manager - atomic_t mm_count; // the number ofprocess which shared the mm + int mm_count; // the number ofprocess which shared the mm lock_t mm_lock; // mutex for using dup_mmap fun to duplicat the mm }; @@ -64,22 +64,24 @@ bool copy_to_user(struct mm_struct *mm, void *dst, const void *src, size_t len); static inline int mm_count(struct mm_struct *mm) { - return atomic_read(&(mm->mm_count)); + return mm->mm_count; } static inline void set_mm_count(struct mm_struct *mm, int val) { - atomic_set(&(mm->mm_count), val); + mm->mm_count = val; } static inline int mm_count_inc(struct mm_struct *mm) { - return atomic_add_return(&(mm->mm_count), 1); + mm->mm_count += 1; + return mm->mm_count; } static inline int mm_count_dec(struct mm_struct *mm) { - return atomic_sub_return(&(mm->mm_count), 1); + mm->mm_count -= 1; + return mm->mm_count; } static inline void diff --git a/code/lab5/libs/atomic.h b/code/lab5/libs/atomic.h index a3a9525..958be2e 100644 --- a/code/lab5/libs/atomic.h +++ b/code/lab5/libs/atomic.h @@ -3,167 +3,9 @@ /* Atomic operations that C can't guarantee us. Useful for resource counting etc.. */ -typedef struct { - volatile int counter; -} atomic_t; - -static inline int atomic_read(const atomic_t *v) __attribute__((always_inline)); -static inline void atomic_set(atomic_t *v, int i) __attribute__((always_inline)); -static inline void atomic_add(atomic_t *v, int i) __attribute__((always_inline)); -static inline void atomic_sub(atomic_t *v, int i) __attribute__((always_inline)); -static inline bool atomic_sub_test_zero(atomic_t *v, int i) __attribute__((always_inline)); -static inline void atomic_inc(atomic_t *v) __attribute__((always_inline)); -static inline void atomic_dec(atomic_t *v) __attribute__((always_inline)); -static inline bool atomic_inc_test_zero(atomic_t *v) __attribute__((always_inline)); -static inline bool atomic_dec_test_zero(atomic_t *v) __attribute__((always_inline)); -static inline int atomic_add_return(atomic_t *v, int i) __attribute__((always_inline)); -static inline int atomic_sub_return(atomic_t *v, int i) __attribute__((always_inline)); - -/* * - * atomic_read - read atomic variable - * @v: pointer of type atomic_t - * - * Atomically reads the value of @v. - * */ -static inline int -atomic_read(const atomic_t *v) { - return v->counter; -} - -/* * - * atomic_set - set atomic variable - * @v: pointer of type atomic_t - * @i: required value - * - * Atomically sets the value of @v to @i. - * */ -static inline void -atomic_set(atomic_t *v, int i) { - v->counter = i; -} - -/* * - * atomic_add - add integer to atomic variable - * @v: pointer of type atomic_t - * @i: integer value to add - * - * Atomically adds @i to @v. - * */ -static inline void -atomic_add(atomic_t *v, int i) { - asm volatile ("addl %1, %0" : "+m" (v->counter) : "ir" (i)); -} - -/* * - * atomic_sub - subtract integer from atomic variable - * @v: pointer of type atomic_t - * @i: integer value to subtract - * - * Atomically subtracts @i from @v. - * */ -static inline void -atomic_sub(atomic_t *v, int i) { - asm volatile("subl %1, %0" : "+m" (v->counter) : "ir" (i)); -} - -/* * - * atomic_sub_test_zero - subtract value from variable and test result - * @v: pointer of type atomic_t - * @i: integer value to subtract - * - * Atomically subtracts @i from @v and - * returns true if the result is zero, or false for all other cases. - * */ -static inline bool -atomic_sub_test_zero(atomic_t *v, int i) { - unsigned char c; - asm volatile("subl %2, %0; sete %1" : "+m" (v->counter), "=qm" (c) : "ir" (i) : "memory"); - return c != 0; -} - -/* * - * atomic_inc - increment atomic variable - * @v: pointer of type atomic_t - * - * Atomically increments @v by 1. - * */ -static inline void -atomic_inc(atomic_t *v) { - asm volatile("incl %0" : "+m" (v->counter)); -} - -/* * - * atomic_dec - decrement atomic variable - * @v: pointer of type atomic_t - * - * Atomically decrements @v by 1. - * */ -static inline void -atomic_dec(atomic_t *v) { - asm volatile("decl %0" : "+m" (v->counter)); -} - -/* * - * atomic_inc_test_zero - increment and test - * @v: pointer of type atomic_t - * - * Atomically increments @v by 1 and - * returns true if the result is zero, or false for all other cases. - * */ -static inline bool -atomic_inc_test_zero(atomic_t *v) { - unsigned char c; - asm volatile("incl %0; sete %1" : "+m" (v->counter), "=qm" (c) :: "memory"); - return c != 0; -} - -/* * - * atomic_dec_test_zero - decrement and test - * @v: pointer of type atomic_t - * - * Atomically decrements @v by 1 and - * returns true if the result is 0, or false for all other cases. - * */ -static inline bool -atomic_dec_test_zero(atomic_t *v) { - unsigned char c; - asm volatile("decl %0; sete %1" : "+m" (v->counter), "=qm" (c) :: "memory"); - return c != 0; -} - -/* * - * atomic_add_return - add integer and return - * @i: integer value to add - * @v: pointer of type atomic_t - * - * Atomically adds @i to @v and returns @i + @v - * Requires Modern 486+ processor - * */ -static inline int -atomic_add_return(atomic_t *v, int i) { - int __i = i; - asm volatile("xaddl %0, %1" : "+r" (i), "+m" (v->counter) :: "memory"); - return i + __i; -} - -/* * - * atomic_sub_return - subtract integer and return - * @v: pointer of type atomic_t - * @i: integer value to subtract - * - * Atomically subtracts @i from @v and returns @v - @i - * */ -static inline int -atomic_sub_return(atomic_t *v, int i) { - return atomic_add_return(v, -i); -} - static inline void set_bit(int nr, volatile void *addr) __attribute__((always_inline)); static inline void clear_bit(int nr, volatile void *addr) __attribute__((always_inline)); static inline void change_bit(int nr, volatile void *addr) __attribute__((always_inline)); -static inline bool test_and_set_bit(int nr, volatile void *addr) __attribute__((always_inline)); -static inline bool test_and_clear_bit(int nr, volatile void *addr) __attribute__((always_inline)); -static inline bool test_and_change_bit(int nr, volatile void *addr) __attribute__((always_inline)); static inline bool test_bit(int nr, volatile void *addr) __attribute__((always_inline)); /* * @@ -199,42 +41,6 @@ change_bit(int nr, volatile void *addr) { asm volatile ("btcl %1, %0" :"=m" (*(volatile long *)addr) : "Ir" (nr)); } -/* * - * test_and_set_bit - Atomically set a bit and return its old value - * @nr: the bit to set - * @addr: the address to count from - * */ -static inline bool -test_and_set_bit(int nr, volatile void *addr) { - int oldbit; - asm volatile ("btsl %2, %1; sbbl %0, %0" : "=r" (oldbit), "=m" (*(volatile long *)addr) : "Ir" (nr) : "memory"); - return oldbit != 0; -} - -/* * - * test_and_clear_bit - Atomically clear a bit and return its old value - * @nr: the bit to clear - * @addr: the address to count from - * */ -static inline bool -test_and_clear_bit(int nr, volatile void *addr) { - int oldbit; - asm volatile ("btrl %2, %1; sbbl %0, %0" : "=r" (oldbit), "=m" (*(volatile long *)addr) : "Ir" (nr) : "memory"); - return oldbit != 0; -} - -/* * - * test_and_change_bit - Atomically change a bit and return its old value - * @nr: the bit to change - * @addr: the address to count from - * */ -static inline bool -test_and_change_bit(int nr, volatile void *addr) { - int oldbit; - asm volatile ("btcl %2, %1; sbbl %0, %0" : "=r" (oldbit), "=m" (*(volatile long *)addr) : "Ir" (nr) : "memory"); - return oldbit != 0; -} - /* * * test_bit - Determine whether a bit is set * @nr: the bit to test diff --git a/code/lab6/kern/mm/memlayout.h b/code/lab6/kern/mm/memlayout.h index d84bf93..825dd66 100644 --- a/code/lab6/kern/mm/memlayout.h +++ b/code/lab6/kern/mm/memlayout.h @@ -127,7 +127,7 @@ struct e820map { * that convert Page to other data types, such as phyical address. * */ struct Page { - atomic_t ref; // page frame's reference counter + int ref; // page frame's reference counter uint32_t flags; // array of flags that describe the status of the page frame unsigned int property; // used in buddy system, stores the order (the X in 2^X) of the continuous memory block int zone_num; // used in buddy system, the No. of zone which the page belongs to diff --git a/code/lab6/kern/mm/pmm.h b/code/lab6/kern/mm/pmm.h index 1e229a7..c9470fe 100644 --- a/code/lab6/kern/mm/pmm.h +++ b/code/lab6/kern/mm/pmm.h @@ -121,22 +121,24 @@ pde2page(pde_t pde) { static inline int page_ref(struct Page *page) { - return atomic_read(&(page->ref)); + return page->ref; } static inline void set_page_ref(struct Page *page, int val) { - atomic_set(&(page->ref), val); + page->ref = val; } static inline int page_ref_inc(struct Page *page) { - return atomic_add_return(&(page->ref), 1); + page->ref += 1; + return page->ref; } static inline int page_ref_dec(struct Page *page) { - return atomic_sub_return(&(page->ref), 1); + page->ref -= 1; + return page->ref; } extern char bootstack[], bootstacktop[]; diff --git a/code/lab6/kern/mm/vmm.h b/code/lab6/kern/mm/vmm.h index b2abfdd..53f98d1 100644 --- a/code/lab6/kern/mm/vmm.h +++ b/code/lab6/kern/mm/vmm.h @@ -33,7 +33,7 @@ struct mm_struct { pde_t *pgdir; // the PDT of these vma int map_count; // the count of these vma void *sm_priv; // the private data for swap manager - atomic_t mm_count; // the number ofprocess which shared the mm + int mm_count; // the number ofprocess which shared the mm lock_t mm_lock; // mutex for using dup_mmap fun to duplicat the mm }; @@ -64,22 +64,24 @@ bool copy_to_user(struct mm_struct *mm, void *dst, const void *src, size_t len); static inline int mm_count(struct mm_struct *mm) { - return atomic_read(&(mm->mm_count)); + return mm->mm_count; } static inline void set_mm_count(struct mm_struct *mm, int val) { - atomic_set(&(mm->mm_count), val); + mm->mm_count = val; } static inline int mm_count_inc(struct mm_struct *mm) { - return atomic_add_return(&(mm->mm_count), 1); + mm->mm_count += 1; + return mm->mm_count; } static inline int mm_count_dec(struct mm_struct *mm) { - return atomic_sub_return(&(mm->mm_count), 1); + mm->mm_count -= 1; + return mm->mm_count; } static inline void diff --git a/code/lab6/libs/atomic.h b/code/lab6/libs/atomic.h index a3a9525..958be2e 100644 --- a/code/lab6/libs/atomic.h +++ b/code/lab6/libs/atomic.h @@ -3,167 +3,9 @@ /* Atomic operations that C can't guarantee us. Useful for resource counting etc.. */ -typedef struct { - volatile int counter; -} atomic_t; - -static inline int atomic_read(const atomic_t *v) __attribute__((always_inline)); -static inline void atomic_set(atomic_t *v, int i) __attribute__((always_inline)); -static inline void atomic_add(atomic_t *v, int i) __attribute__((always_inline)); -static inline void atomic_sub(atomic_t *v, int i) __attribute__((always_inline)); -static inline bool atomic_sub_test_zero(atomic_t *v, int i) __attribute__((always_inline)); -static inline void atomic_inc(atomic_t *v) __attribute__((always_inline)); -static inline void atomic_dec(atomic_t *v) __attribute__((always_inline)); -static inline bool atomic_inc_test_zero(atomic_t *v) __attribute__((always_inline)); -static inline bool atomic_dec_test_zero(atomic_t *v) __attribute__((always_inline)); -static inline int atomic_add_return(atomic_t *v, int i) __attribute__((always_inline)); -static inline int atomic_sub_return(atomic_t *v, int i) __attribute__((always_inline)); - -/* * - * atomic_read - read atomic variable - * @v: pointer of type atomic_t - * - * Atomically reads the value of @v. - * */ -static inline int -atomic_read(const atomic_t *v) { - return v->counter; -} - -/* * - * atomic_set - set atomic variable - * @v: pointer of type atomic_t - * @i: required value - * - * Atomically sets the value of @v to @i. - * */ -static inline void -atomic_set(atomic_t *v, int i) { - v->counter = i; -} - -/* * - * atomic_add - add integer to atomic variable - * @v: pointer of type atomic_t - * @i: integer value to add - * - * Atomically adds @i to @v. - * */ -static inline void -atomic_add(atomic_t *v, int i) { - asm volatile ("addl %1, %0" : "+m" (v->counter) : "ir" (i)); -} - -/* * - * atomic_sub - subtract integer from atomic variable - * @v: pointer of type atomic_t - * @i: integer value to subtract - * - * Atomically subtracts @i from @v. - * */ -static inline void -atomic_sub(atomic_t *v, int i) { - asm volatile("subl %1, %0" : "+m" (v->counter) : "ir" (i)); -} - -/* * - * atomic_sub_test_zero - subtract value from variable and test result - * @v: pointer of type atomic_t - * @i: integer value to subtract - * - * Atomically subtracts @i from @v and - * returns true if the result is zero, or false for all other cases. - * */ -static inline bool -atomic_sub_test_zero(atomic_t *v, int i) { - unsigned char c; - asm volatile("subl %2, %0; sete %1" : "+m" (v->counter), "=qm" (c) : "ir" (i) : "memory"); - return c != 0; -} - -/* * - * atomic_inc - increment atomic variable - * @v: pointer of type atomic_t - * - * Atomically increments @v by 1. - * */ -static inline void -atomic_inc(atomic_t *v) { - asm volatile("incl %0" : "+m" (v->counter)); -} - -/* * - * atomic_dec - decrement atomic variable - * @v: pointer of type atomic_t - * - * Atomically decrements @v by 1. - * */ -static inline void -atomic_dec(atomic_t *v) { - asm volatile("decl %0" : "+m" (v->counter)); -} - -/* * - * atomic_inc_test_zero - increment and test - * @v: pointer of type atomic_t - * - * Atomically increments @v by 1 and - * returns true if the result is zero, or false for all other cases. - * */ -static inline bool -atomic_inc_test_zero(atomic_t *v) { - unsigned char c; - asm volatile("incl %0; sete %1" : "+m" (v->counter), "=qm" (c) :: "memory"); - return c != 0; -} - -/* * - * atomic_dec_test_zero - decrement and test - * @v: pointer of type atomic_t - * - * Atomically decrements @v by 1 and - * returns true if the result is 0, or false for all other cases. - * */ -static inline bool -atomic_dec_test_zero(atomic_t *v) { - unsigned char c; - asm volatile("decl %0; sete %1" : "+m" (v->counter), "=qm" (c) :: "memory"); - return c != 0; -} - -/* * - * atomic_add_return - add integer and return - * @i: integer value to add - * @v: pointer of type atomic_t - * - * Atomically adds @i to @v and returns @i + @v - * Requires Modern 486+ processor - * */ -static inline int -atomic_add_return(atomic_t *v, int i) { - int __i = i; - asm volatile("xaddl %0, %1" : "+r" (i), "+m" (v->counter) :: "memory"); - return i + __i; -} - -/* * - * atomic_sub_return - subtract integer and return - * @v: pointer of type atomic_t - * @i: integer value to subtract - * - * Atomically subtracts @i from @v and returns @v - @i - * */ -static inline int -atomic_sub_return(atomic_t *v, int i) { - return atomic_add_return(v, -i); -} - static inline void set_bit(int nr, volatile void *addr) __attribute__((always_inline)); static inline void clear_bit(int nr, volatile void *addr) __attribute__((always_inline)); static inline void change_bit(int nr, volatile void *addr) __attribute__((always_inline)); -static inline bool test_and_set_bit(int nr, volatile void *addr) __attribute__((always_inline)); -static inline bool test_and_clear_bit(int nr, volatile void *addr) __attribute__((always_inline)); -static inline bool test_and_change_bit(int nr, volatile void *addr) __attribute__((always_inline)); static inline bool test_bit(int nr, volatile void *addr) __attribute__((always_inline)); /* * @@ -199,42 +41,6 @@ change_bit(int nr, volatile void *addr) { asm volatile ("btcl %1, %0" :"=m" (*(volatile long *)addr) : "Ir" (nr)); } -/* * - * test_and_set_bit - Atomically set a bit and return its old value - * @nr: the bit to set - * @addr: the address to count from - * */ -static inline bool -test_and_set_bit(int nr, volatile void *addr) { - int oldbit; - asm volatile ("btsl %2, %1; sbbl %0, %0" : "=r" (oldbit), "=m" (*(volatile long *)addr) : "Ir" (nr) : "memory"); - return oldbit != 0; -} - -/* * - * test_and_clear_bit - Atomically clear a bit and return its old value - * @nr: the bit to clear - * @addr: the address to count from - * */ -static inline bool -test_and_clear_bit(int nr, volatile void *addr) { - int oldbit; - asm volatile ("btrl %2, %1; sbbl %0, %0" : "=r" (oldbit), "=m" (*(volatile long *)addr) : "Ir" (nr) : "memory"); - return oldbit != 0; -} - -/* * - * test_and_change_bit - Atomically change a bit and return its old value - * @nr: the bit to change - * @addr: the address to count from - * */ -static inline bool -test_and_change_bit(int nr, volatile void *addr) { - int oldbit; - asm volatile ("btcl %2, %1; sbbl %0, %0" : "=r" (oldbit), "=m" (*(volatile long *)addr) : "Ir" (nr) : "memory"); - return oldbit != 0; -} - /* * * test_bit - Determine whether a bit is set * @nr: the bit to test diff --git a/code/lab7/kern/mm/memlayout.h b/code/lab7/kern/mm/memlayout.h index d84bf93..825dd66 100644 --- a/code/lab7/kern/mm/memlayout.h +++ b/code/lab7/kern/mm/memlayout.h @@ -127,7 +127,7 @@ struct e820map { * that convert Page to other data types, such as phyical address. * */ struct Page { - atomic_t ref; // page frame's reference counter + int ref; // page frame's reference counter uint32_t flags; // array of flags that describe the status of the page frame unsigned int property; // used in buddy system, stores the order (the X in 2^X) of the continuous memory block int zone_num; // used in buddy system, the No. of zone which the page belongs to diff --git a/code/lab7/kern/mm/pmm.h b/code/lab7/kern/mm/pmm.h index 1e229a7..c9470fe 100644 --- a/code/lab7/kern/mm/pmm.h +++ b/code/lab7/kern/mm/pmm.h @@ -121,22 +121,24 @@ pde2page(pde_t pde) { static inline int page_ref(struct Page *page) { - return atomic_read(&(page->ref)); + return page->ref; } static inline void set_page_ref(struct Page *page, int val) { - atomic_set(&(page->ref), val); + page->ref = val; } static inline int page_ref_inc(struct Page *page) { - return atomic_add_return(&(page->ref), 1); + page->ref += 1; + return page->ref; } static inline int page_ref_dec(struct Page *page) { - return atomic_sub_return(&(page->ref), 1); + page->ref -= 1; + return page->ref; } extern char bootstack[], bootstacktop[]; diff --git a/code/lab7/kern/mm/vmm.h b/code/lab7/kern/mm/vmm.h index c467dba..f58e489 100644 --- a/code/lab7/kern/mm/vmm.h +++ b/code/lab7/kern/mm/vmm.h @@ -35,7 +35,7 @@ struct mm_struct { pde_t *pgdir; // the PDT of these vma int map_count; // the count of these vma void *sm_priv; // the private data for swap manager - atomic_t mm_count; // the number ofprocess which shared the mm + int mm_count; // the number ofprocess which shared the mm semaphore_t mm_sem; // mutex for using dup_mmap fun to duplicat the mm int locked_by; // the lock owner process's pid @@ -68,22 +68,24 @@ bool copy_to_user(struct mm_struct *mm, void *dst, const void *src, size_t len); static inline int mm_count(struct mm_struct *mm) { - return atomic_read(&(mm->mm_count)); + return mm->mm_count; } static inline void set_mm_count(struct mm_struct *mm, int val) { - atomic_set(&(mm->mm_count), val); + mm->mm_count = val; } static inline int mm_count_inc(struct mm_struct *mm) { - return atomic_add_return(&(mm->mm_count), 1); + mm->mm_count += 1; + return mm->mm_count; } static inline int mm_count_dec(struct mm_struct *mm) { - return atomic_sub_return(&(mm->mm_count), 1); + mm->mm_count -= 1; + return mm->mm_count; } static inline void diff --git a/code/lab7/libs/atomic.h b/code/lab7/libs/atomic.h index a3a9525..958be2e 100644 --- a/code/lab7/libs/atomic.h +++ b/code/lab7/libs/atomic.h @@ -3,167 +3,9 @@ /* Atomic operations that C can't guarantee us. Useful for resource counting etc.. */ -typedef struct { - volatile int counter; -} atomic_t; - -static inline int atomic_read(const atomic_t *v) __attribute__((always_inline)); -static inline void atomic_set(atomic_t *v, int i) __attribute__((always_inline)); -static inline void atomic_add(atomic_t *v, int i) __attribute__((always_inline)); -static inline void atomic_sub(atomic_t *v, int i) __attribute__((always_inline)); -static inline bool atomic_sub_test_zero(atomic_t *v, int i) __attribute__((always_inline)); -static inline void atomic_inc(atomic_t *v) __attribute__((always_inline)); -static inline void atomic_dec(atomic_t *v) __attribute__((always_inline)); -static inline bool atomic_inc_test_zero(atomic_t *v) __attribute__((always_inline)); -static inline bool atomic_dec_test_zero(atomic_t *v) __attribute__((always_inline)); -static inline int atomic_add_return(atomic_t *v, int i) __attribute__((always_inline)); -static inline int atomic_sub_return(atomic_t *v, int i) __attribute__((always_inline)); - -/* * - * atomic_read - read atomic variable - * @v: pointer of type atomic_t - * - * Atomically reads the value of @v. - * */ -static inline int -atomic_read(const atomic_t *v) { - return v->counter; -} - -/* * - * atomic_set - set atomic variable - * @v: pointer of type atomic_t - * @i: required value - * - * Atomically sets the value of @v to @i. - * */ -static inline void -atomic_set(atomic_t *v, int i) { - v->counter = i; -} - -/* * - * atomic_add - add integer to atomic variable - * @v: pointer of type atomic_t - * @i: integer value to add - * - * Atomically adds @i to @v. - * */ -static inline void -atomic_add(atomic_t *v, int i) { - asm volatile ("addl %1, %0" : "+m" (v->counter) : "ir" (i)); -} - -/* * - * atomic_sub - subtract integer from atomic variable - * @v: pointer of type atomic_t - * @i: integer value to subtract - * - * Atomically subtracts @i from @v. - * */ -static inline void -atomic_sub(atomic_t *v, int i) { - asm volatile("subl %1, %0" : "+m" (v->counter) : "ir" (i)); -} - -/* * - * atomic_sub_test_zero - subtract value from variable and test result - * @v: pointer of type atomic_t - * @i: integer value to subtract - * - * Atomically subtracts @i from @v and - * returns true if the result is zero, or false for all other cases. - * */ -static inline bool -atomic_sub_test_zero(atomic_t *v, int i) { - unsigned char c; - asm volatile("subl %2, %0; sete %1" : "+m" (v->counter), "=qm" (c) : "ir" (i) : "memory"); - return c != 0; -} - -/* * - * atomic_inc - increment atomic variable - * @v: pointer of type atomic_t - * - * Atomically increments @v by 1. - * */ -static inline void -atomic_inc(atomic_t *v) { - asm volatile("incl %0" : "+m" (v->counter)); -} - -/* * - * atomic_dec - decrement atomic variable - * @v: pointer of type atomic_t - * - * Atomically decrements @v by 1. - * */ -static inline void -atomic_dec(atomic_t *v) { - asm volatile("decl %0" : "+m" (v->counter)); -} - -/* * - * atomic_inc_test_zero - increment and test - * @v: pointer of type atomic_t - * - * Atomically increments @v by 1 and - * returns true if the result is zero, or false for all other cases. - * */ -static inline bool -atomic_inc_test_zero(atomic_t *v) { - unsigned char c; - asm volatile("incl %0; sete %1" : "+m" (v->counter), "=qm" (c) :: "memory"); - return c != 0; -} - -/* * - * atomic_dec_test_zero - decrement and test - * @v: pointer of type atomic_t - * - * Atomically decrements @v by 1 and - * returns true if the result is 0, or false for all other cases. - * */ -static inline bool -atomic_dec_test_zero(atomic_t *v) { - unsigned char c; - asm volatile("decl %0; sete %1" : "+m" (v->counter), "=qm" (c) :: "memory"); - return c != 0; -} - -/* * - * atomic_add_return - add integer and return - * @i: integer value to add - * @v: pointer of type atomic_t - * - * Atomically adds @i to @v and returns @i + @v - * Requires Modern 486+ processor - * */ -static inline int -atomic_add_return(atomic_t *v, int i) { - int __i = i; - asm volatile("xaddl %0, %1" : "+r" (i), "+m" (v->counter) :: "memory"); - return i + __i; -} - -/* * - * atomic_sub_return - subtract integer and return - * @v: pointer of type atomic_t - * @i: integer value to subtract - * - * Atomically subtracts @i from @v and returns @v - @i - * */ -static inline int -atomic_sub_return(atomic_t *v, int i) { - return atomic_add_return(v, -i); -} - static inline void set_bit(int nr, volatile void *addr) __attribute__((always_inline)); static inline void clear_bit(int nr, volatile void *addr) __attribute__((always_inline)); static inline void change_bit(int nr, volatile void *addr) __attribute__((always_inline)); -static inline bool test_and_set_bit(int nr, volatile void *addr) __attribute__((always_inline)); -static inline bool test_and_clear_bit(int nr, volatile void *addr) __attribute__((always_inline)); -static inline bool test_and_change_bit(int nr, volatile void *addr) __attribute__((always_inline)); static inline bool test_bit(int nr, volatile void *addr) __attribute__((always_inline)); /* * @@ -199,42 +41,6 @@ change_bit(int nr, volatile void *addr) { asm volatile ("btcl %1, %0" :"=m" (*(volatile long *)addr) : "Ir" (nr)); } -/* * - * test_and_set_bit - Atomically set a bit and return its old value - * @nr: the bit to set - * @addr: the address to count from - * */ -static inline bool -test_and_set_bit(int nr, volatile void *addr) { - int oldbit; - asm volatile ("btsl %2, %1; sbbl %0, %0" : "=r" (oldbit), "=m" (*(volatile long *)addr) : "Ir" (nr) : "memory"); - return oldbit != 0; -} - -/* * - * test_and_clear_bit - Atomically clear a bit and return its old value - * @nr: the bit to clear - * @addr: the address to count from - * */ -static inline bool -test_and_clear_bit(int nr, volatile void *addr) { - int oldbit; - asm volatile ("btrl %2, %1; sbbl %0, %0" : "=r" (oldbit), "=m" (*(volatile long *)addr) : "Ir" (nr) : "memory"); - return oldbit != 0; -} - -/* * - * test_and_change_bit - Atomically change a bit and return its old value - * @nr: the bit to change - * @addr: the address to count from - * */ -static inline bool -test_and_change_bit(int nr, volatile void *addr) { - int oldbit; - asm volatile ("btcl %2, %1; sbbl %0, %0" : "=r" (oldbit), "=m" (*(volatile long *)addr) : "Ir" (nr) : "memory"); - return oldbit != 0; -} - /* * * test_bit - Determine whether a bit is set * @nr: the bit to test diff --git a/code/lab8/kern/fs/file.c b/code/lab8/kern/fs/file.c index df7a0a5..7757adb 100755 --- a/code/lab8/kern/fs/file.c +++ b/code/lab8/kern/fs/file.c @@ -27,7 +27,7 @@ fd_array_init(struct file *fd_array) { int fd; struct file *file = fd_array; for (fd = 0; fd < FILES_STRUCT_NENTRY; fd ++, file ++) { - atomic_set(&(file->open_count), 0); + file->open_count = 0; file->status = FD_NONE, file->fd = fd; } } diff --git a/code/lab8/kern/fs/file.h b/code/lab8/kern/fs/file.h index 8b58ba8..46d523c 100755 --- a/code/lab8/kern/fs/file.h +++ b/code/lab8/kern/fs/file.h @@ -20,7 +20,7 @@ struct file { int fd; off_t pos; struct inode *node; - atomic_t open_count; + int open_count; }; void fd_array_init(struct file *fd_array); @@ -43,17 +43,19 @@ int file_mkfifo(const char *name, uint32_t open_flags); static inline int fopen_count(struct file *file) { - return atomic_read(&(file->open_count)); + return file->open_count; } static inline int fopen_count_inc(struct file *file) { - return atomic_add_return(&(file->open_count), 1); + file->open_count += 1; + return file->open_count; } static inline int fopen_count_dec(struct file *file) { - return atomic_sub_return(&(file->open_count), 1); + file->open_count -= 1; + return file->open_count; } #endif /* !__KERN_FS_FILE_H__ */ diff --git a/code/lab8/kern/fs/fs.c b/code/lab8/kern/fs/fs.c index 741b889..a659ce3 100755 --- a/code/lab8/kern/fs/fs.c +++ b/code/lab8/kern/fs/fs.c @@ -38,7 +38,7 @@ files_create(void) { if ((filesp = kmalloc(sizeof(struct files_struct) + FILES_STRUCT_BUFSIZE)) != NULL) { filesp->pwd = NULL; filesp->fd_array = (void *)(filesp + 1); - atomic_set(&(filesp->files_count), 0); + filesp->files_count = 0; sem_init(&(filesp->files_sem), 1); fd_array_init(filesp->fd_array); } diff --git a/code/lab8/kern/fs/fs.h b/code/lab8/kern/fs/fs.h index f9acb36..4301c3a 100755 --- a/code/lab8/kern/fs/fs.h +++ b/code/lab8/kern/fs/fs.h @@ -25,7 +25,7 @@ struct file; struct files_struct { struct inode *pwd; // inode of present working directory struct file *fd_array; // opened files array - atomic_t files_count; // the number of opened files + int files_count; // the number of opened files semaphore_t files_sem; // lock protect sem }; @@ -42,17 +42,19 @@ int dup_files(struct files_struct *to, struct files_struct *from); static inline int files_count(struct files_struct *filesp) { - return atomic_read(&(filesp->files_count)); + return filesp->files_count; } static inline int files_count_inc(struct files_struct *filesp) { - return atomic_add_return(&(filesp->files_count), 1); + filesp->files_count += 1; + return filesp->files_count; } static inline int files_count_dec(struct files_struct *filesp) { - return atomic_sub_return(&(filesp->files_count), 1); + filesp->files_count -= 1; + return filesp->files_count; } #endif /* !__KERN_FS_FS_H__ */ diff --git a/code/lab8/kern/fs/vfs/inode.c b/code/lab8/kern/fs/vfs/inode.c index 277b0f0..ffc873b 100755 --- a/code/lab8/kern/fs/vfs/inode.c +++ b/code/lab8/kern/fs/vfs/inode.c @@ -26,8 +26,8 @@ __alloc_inode(int type) { * */ void inode_init(struct inode *node, const struct inode_ops *ops, struct fs *fs) { - atomic_set(&(node->ref_count), 0); - atomic_set(&(node->open_count), 0); + node->ref_count = 0; + node->open_count = 0; node->in_ops = ops, node->in_fs = fs; vop_ref_inc(node); } @@ -49,7 +49,8 @@ inode_kill(struct inode *node) { * */ int inode_ref_inc(struct inode *node) { - return atomic_add_return(&(node->ref_count), 1); + node->ref_count += 1; + return node->ref_count; } /* * @@ -61,7 +62,9 @@ int inode_ref_dec(struct inode *node) { assert(inode_ref_count(node) > 0); int ref_count, ret; - if ((ref_count = atomic_sub_return(&(node->ref_count), 1)) == 0) { + node->ref_count-= 1; + ref_count = node->ref_count; + if (ref_count == 0) { if ((ret = vop_reclaim(node)) != 0 && ret != -E_BUSY) { cprintf("vfs: warning: vop_reclaim: %e.\n", ret); } @@ -75,7 +78,8 @@ inode_ref_dec(struct inode *node) { * */ int inode_open_inc(struct inode *node) { - return atomic_add_return(&(node->open_count), 1); + node->open_count += 1; + return node->open_count; } /* * @@ -87,7 +91,9 @@ int inode_open_dec(struct inode *node) { assert(inode_open_count(node) > 0); int open_count, ret; - if ((open_count = atomic_sub_return(&(node->open_count), 1)) == 0) { + node->open_count -= 1; + open_count = node->open_count; + if (open_count == 0) { if ((ret = vop_close(node)) != 0) { cprintf("vfs: warning: vop_close: %e.\n", ret); } diff --git a/code/lab8/kern/fs/vfs/inode.h b/code/lab8/kern/fs/vfs/inode.h index 325981a..edc7efa 100755 --- a/code/lab8/kern/fs/vfs/inode.h +++ b/code/lab8/kern/fs/vfs/inode.h @@ -35,8 +35,8 @@ struct inode { inode_type_device_info = 0x1234, inode_type_sfs_inode_info, } in_type; - atomic_t ref_count; - atomic_t open_count; + int ref_count; + int open_count; struct fs *in_fs; const struct inode_ops *in_ops; }; @@ -236,12 +236,12 @@ void inode_check(struct inode *node, const char *opstr); static inline int inode_ref_count(struct inode *node) { - return atomic_read(&(node->ref_count)); + return node->ref_count; } static inline int inode_open_count(struct inode *node) { - return atomic_read(&(node->open_count)); + return node->open_count; } #endif /* !__KERN_FS_VFS_INODE_H__ */ diff --git a/code/lab8/kern/mm/memlayout.h b/code/lab8/kern/mm/memlayout.h index d84bf93..825dd66 100644 --- a/code/lab8/kern/mm/memlayout.h +++ b/code/lab8/kern/mm/memlayout.h @@ -127,7 +127,7 @@ struct e820map { * that convert Page to other data types, such as phyical address. * */ struct Page { - atomic_t ref; // page frame's reference counter + int ref; // page frame's reference counter uint32_t flags; // array of flags that describe the status of the page frame unsigned int property; // used in buddy system, stores the order (the X in 2^X) of the continuous memory block int zone_num; // used in buddy system, the No. of zone which the page belongs to diff --git a/code/lab8/kern/mm/pmm.h b/code/lab8/kern/mm/pmm.h index 1e229a7..c9470fe 100644 --- a/code/lab8/kern/mm/pmm.h +++ b/code/lab8/kern/mm/pmm.h @@ -121,22 +121,24 @@ pde2page(pde_t pde) { static inline int page_ref(struct Page *page) { - return atomic_read(&(page->ref)); + return page->ref; } static inline void set_page_ref(struct Page *page, int val) { - atomic_set(&(page->ref), val); + page->ref = val; } static inline int page_ref_inc(struct Page *page) { - return atomic_add_return(&(page->ref), 1); + page->ref += 1; + return page->ref; } static inline int page_ref_dec(struct Page *page) { - return atomic_sub_return(&(page->ref), 1); + page->ref -= 1; + return page->ref; } extern char bootstack[], bootstacktop[]; diff --git a/code/lab8/kern/mm/vmm.h b/code/lab8/kern/mm/vmm.h index 3296df6..61b6f88 100644 --- a/code/lab8/kern/mm/vmm.h +++ b/code/lab8/kern/mm/vmm.h @@ -35,7 +35,7 @@ struct mm_struct { pde_t *pgdir; // the PDT of these vma int map_count; // the count of these vma void *sm_priv; // the private data for swap manager - atomic_t mm_count; // the number ofprocess which shared the mm + int mm_count; // the number ofprocess which shared the mm semaphore_t mm_sem; // mutex for using dup_mmap fun to duplicat the mm int locked_by; // the lock owner process's pid @@ -69,22 +69,24 @@ bool copy_string(struct mm_struct *mm, char *dst, const char *src, size_t maxn); static inline int mm_count(struct mm_struct *mm) { - return atomic_read(&(mm->mm_count)); + return mm->mm_count; } static inline void set_mm_count(struct mm_struct *mm, int val) { - atomic_set(&(mm->mm_count), val); + mm->mm_count = val; } static inline int mm_count_inc(struct mm_struct *mm) { - return atomic_add_return(&(mm->mm_count), 1); + mm->mm_count += 1; + return mm->mm_count; } static inline int mm_count_dec(struct mm_struct *mm) { - return atomic_sub_return(&(mm->mm_count), 1); + mm->mm_count -= 1; + return mm->mm_count; } static inline void diff --git a/code/lab8/libs/atomic.h b/code/lab8/libs/atomic.h index a3a9525..2cc394c 100644 --- a/code/lab8/libs/atomic.h +++ b/code/lab8/libs/atomic.h @@ -3,167 +3,9 @@ /* Atomic operations that C can't guarantee us. Useful for resource counting etc.. */ -typedef struct { - volatile int counter; -} atomic_t; - -static inline int atomic_read(const atomic_t *v) __attribute__((always_inline)); -static inline void atomic_set(atomic_t *v, int i) __attribute__((always_inline)); -static inline void atomic_add(atomic_t *v, int i) __attribute__((always_inline)); -static inline void atomic_sub(atomic_t *v, int i) __attribute__((always_inline)); -static inline bool atomic_sub_test_zero(atomic_t *v, int i) __attribute__((always_inline)); -static inline void atomic_inc(atomic_t *v) __attribute__((always_inline)); -static inline void atomic_dec(atomic_t *v) __attribute__((always_inline)); -static inline bool atomic_inc_test_zero(atomic_t *v) __attribute__((always_inline)); -static inline bool atomic_dec_test_zero(atomic_t *v) __attribute__((always_inline)); -static inline int atomic_add_return(atomic_t *v, int i) __attribute__((always_inline)); -static inline int atomic_sub_return(atomic_t *v, int i) __attribute__((always_inline)); - -/* * - * atomic_read - read atomic variable - * @v: pointer of type atomic_t - * - * Atomically reads the value of @v. - * */ -static inline int -atomic_read(const atomic_t *v) { - return v->counter; -} - -/* * - * atomic_set - set atomic variable - * @v: pointer of type atomic_t - * @i: required value - * - * Atomically sets the value of @v to @i. - * */ -static inline void -atomic_set(atomic_t *v, int i) { - v->counter = i; -} - -/* * - * atomic_add - add integer to atomic variable - * @v: pointer of type atomic_t - * @i: integer value to add - * - * Atomically adds @i to @v. - * */ -static inline void -atomic_add(atomic_t *v, int i) { - asm volatile ("addl %1, %0" : "+m" (v->counter) : "ir" (i)); -} - -/* * - * atomic_sub - subtract integer from atomic variable - * @v: pointer of type atomic_t - * @i: integer value to subtract - * - * Atomically subtracts @i from @v. - * */ -static inline void -atomic_sub(atomic_t *v, int i) { - asm volatile("subl %1, %0" : "+m" (v->counter) : "ir" (i)); -} - -/* * - * atomic_sub_test_zero - subtract value from variable and test result - * @v: pointer of type atomic_t - * @i: integer value to subtract - * - * Atomically subtracts @i from @v and - * returns true if the result is zero, or false for all other cases. - * */ -static inline bool -atomic_sub_test_zero(atomic_t *v, int i) { - unsigned char c; - asm volatile("subl %2, %0; sete %1" : "+m" (v->counter), "=qm" (c) : "ir" (i) : "memory"); - return c != 0; -} - -/* * - * atomic_inc - increment atomic variable - * @v: pointer of type atomic_t - * - * Atomically increments @v by 1. - * */ -static inline void -atomic_inc(atomic_t *v) { - asm volatile("incl %0" : "+m" (v->counter)); -} - -/* * - * atomic_dec - decrement atomic variable - * @v: pointer of type atomic_t - * - * Atomically decrements @v by 1. - * */ -static inline void -atomic_dec(atomic_t *v) { - asm volatile("decl %0" : "+m" (v->counter)); -} - -/* * - * atomic_inc_test_zero - increment and test - * @v: pointer of type atomic_t - * - * Atomically increments @v by 1 and - * returns true if the result is zero, or false for all other cases. - * */ -static inline bool -atomic_inc_test_zero(atomic_t *v) { - unsigned char c; - asm volatile("incl %0; sete %1" : "+m" (v->counter), "=qm" (c) :: "memory"); - return c != 0; -} - -/* * - * atomic_dec_test_zero - decrement and test - * @v: pointer of type atomic_t - * - * Atomically decrements @v by 1 and - * returns true if the result is 0, or false for all other cases. - * */ -static inline bool -atomic_dec_test_zero(atomic_t *v) { - unsigned char c; - asm volatile("decl %0; sete %1" : "+m" (v->counter), "=qm" (c) :: "memory"); - return c != 0; -} - -/* * - * atomic_add_return - add integer and return - * @i: integer value to add - * @v: pointer of type atomic_t - * - * Atomically adds @i to @v and returns @i + @v - * Requires Modern 486+ processor - * */ -static inline int -atomic_add_return(atomic_t *v, int i) { - int __i = i; - asm volatile("xaddl %0, %1" : "+r" (i), "+m" (v->counter) :: "memory"); - return i + __i; -} - -/* * - * atomic_sub_return - subtract integer and return - * @v: pointer of type atomic_t - * @i: integer value to subtract - * - * Atomically subtracts @i from @v and returns @v - @i - * */ -static inline int -atomic_sub_return(atomic_t *v, int i) { - return atomic_add_return(v, -i); -} - static inline void set_bit(int nr, volatile void *addr) __attribute__((always_inline)); static inline void clear_bit(int nr, volatile void *addr) __attribute__((always_inline)); static inline void change_bit(int nr, volatile void *addr) __attribute__((always_inline)); -static inline bool test_and_set_bit(int nr, volatile void *addr) __attribute__((always_inline)); -static inline bool test_and_clear_bit(int nr, volatile void *addr) __attribute__((always_inline)); -static inline bool test_and_change_bit(int nr, volatile void *addr) __attribute__((always_inline)); static inline bool test_bit(int nr, volatile void *addr) __attribute__((always_inline)); /* * @@ -199,6 +41,18 @@ change_bit(int nr, volatile void *addr) { asm volatile ("btcl %1, %0" :"=m" (*(volatile long *)addr) : "Ir" (nr)); } +/* * + * test_bit - Determine whether a bit is set + * @nr: the bit to test + * @addr: the address to count from + * */ +static inline bool +test_bit(int nr, volatile void *addr) { + int oldbit; + asm volatile ("btl %2, %1; sbbl %0,%0" : "=r" (oldbit) : "m" (*(volatile long *)addr), "Ir" (nr)); + return oldbit != 0; +} + /* * * test_and_set_bit - Atomically set a bit and return its old value * @nr: the bit to set @@ -222,30 +76,5 @@ test_and_clear_bit(int nr, volatile void *addr) { asm volatile ("btrl %2, %1; sbbl %0, %0" : "=r" (oldbit), "=m" (*(volatile long *)addr) : "Ir" (nr) : "memory"); return oldbit != 0; } - -/* * - * test_and_change_bit - Atomically change a bit and return its old value - * @nr: the bit to change - * @addr: the address to count from - * */ -static inline bool -test_and_change_bit(int nr, volatile void *addr) { - int oldbit; - asm volatile ("btcl %2, %1; sbbl %0, %0" : "=r" (oldbit), "=m" (*(volatile long *)addr) : "Ir" (nr) : "memory"); - return oldbit != 0; -} - -/* * - * test_bit - Determine whether a bit is set - * @nr: the bit to test - * @addr: the address to count from - * */ -static inline bool -test_bit(int nr, volatile void *addr) { - int oldbit; - asm volatile ("btl %2, %1; sbbl %0,%0" : "=r" (oldbit) : "m" (*(volatile long *)addr), "Ir" (nr)); - return oldbit != 0; -} - #endif /* !__LIBS_ATOMIC_H__ */