diff --git a/programs/system/launch/trunk/config.inc b/programs/system/launch/trunk/config.inc new file mode 100644 index 0000000000..dc70bf9760 --- /dev/null +++ b/programs/system/launch/trunk/config.inc @@ -0,0 +1 @@ +__CPU_type fix p5 diff --git a/programs/system/launch/trunk/gpl2.txt b/programs/system/launch/trunk/gpl2.txt deleted file mode 100755 index d511905c16..0000000000 --- a/programs/system/launch/trunk/gpl2.txt +++ /dev/null @@ -1,339 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - 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 Lesser 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) - - 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., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year 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 Lesser General -Public License instead of this License. diff --git a/programs/system/launch/trunk/history.txt b/programs/system/launch/trunk/history.txt index d99f539414..0a50ccf84a 100755 --- a/programs/system/launch/trunk/history.txt +++ b/programs/system/launch/trunk/history.txt @@ -1,4 +1,6 @@ ==================== Русский ==================== +0.1.80 (0.2 beta) - vkos + + Оповещение всех заинтересованных (входящих в группу launch_reactive) приложений через Kobra 0.1.5 - 25.10.2009 - vkos * Использование функции get_option_str из libini (последней ревизии) вместо самостоятельного разбора * Переход на новые имена при импорте (совместимость с библиотеками) @@ -17,6 +19,8 @@ + Реализовано чтение конфигурации и запуск программы (без аргументов) ==================== English ==================== +0.1.80 (0.2 beta) - vkos + + notification all intrested (members of launch_reactive group) applications via Kobra 0.1.5 - 25.10.2009 - vkos * Using function get_option_str from libini (last revision) instead of independent parsing * New import names (compatibility with libraries) diff --git a/programs/system/launch/trunk/ipc.inc b/programs/system/launch/trunk/ipc.inc new file mode 100644 index 0000000000..a8b0a9bd33 --- /dev/null +++ b/programs/system/launch/trunk/ipc.inc @@ -0,0 +1,32 @@ +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Copyright (C) Vasiliy Kosenko (vkos), 2009 ;; +;; 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 3 ;; +;; 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, see . ;; +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; This is set of functions to work with IPC in KolibriOS ;; +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +IPC_init: + push eax + mov eax, dword [IPC_area] + mov dword [eax], 1 + mov dword [eax+4], 8 + + stdcall event_add_mask, 0x40 + + pop eax + + ret + +IPC_area: + dd 0 diff --git a/programs/system/launch/trunk/kobra.inc b/programs/system/launch/trunk/kobra.inc new file mode 100644 index 0000000000..2511a221a8 --- /dev/null +++ b/programs/system/launch/trunk/kobra.inc @@ -0,0 +1,96 @@ +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Copyright (C) Vasiliy Kosenko (vkos), 2009 ;; +;; Kobra 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 3 ;; +;; of the License, or (at your option) any later version. ;; +;; ;; +;; Kobra 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 Kobra. ;; +;; If not, see . ;; +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; This is set of functions to work with Kobra daemon ;; +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +define KOBRA_MESSAGE_MAX_LEN 0x100 + +define KOBRA_CMD_REGISTER 'R' +define KOBRA_CMD_JOIN 'J' +define KOBRA_CMD_UNJOIN 'U' +define KOBRA_CMD_SEND 'S' + +define KOBRA_MESSAGE_LAUNCH_STATE 1 + +kobra_register: + mov eax, kobra_message_area + mov byte [eax], KOBRA_CMD_REGISTER + + stdcall thread_find_by_name, kobra_thread_name + + test eax, eax + je .error + + mov dword [kobra_tid], eax ;; Save tid + + mov ecx, eax + + mcall 60, 2, , kobra_message_area, 1 + + test eax, eax + je .return + +.error: + inc eax + +.return: + ret + +;; void kobra_send_message(char *group, void *message, int length); +kobra_send_message: + push ebp + mov ebp, esp + + cld + + mov edi, kobra_message_area + mov al, KOBRA_CMD_SEND + stosb + + mov esi, dword [ebp+8] + +.copy_group_cycle: + mov al, byte [esi] + test al, al + jz .copy_group_end + movsb + jmp .copy_group_cycle + +.copy_group_end: + +; xor al, al + stosb + + mov esi, dword [ebp+12] + mov ecx, dword [ebp+16] + rep movsb + + lea eax, [edi-kobra_message_area] + + mcall 60, 2, dword [kobra_tid], kobra_message_area, eax + + leave + + ret 12 + +kobra_tid: + dd 0 + +kobra_message_area: + rb KOBRA_MESSAGE_MAX_LEN + +kobra_thread_name: + db "kobra", 0, 0, 0, 0, 0, 0 diff --git a/programs/system/launch/trunk/launch.asm b/programs/system/launch/trunk/launch.asm index 02f265b6fa..245057e213 100755 --- a/programs/system/launch/trunk/launch.asm +++ b/programs/system/launch/trunk/launch.asm @@ -1,7 +1,7 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Copyright (C) Vasiliy Kosenko (vkos), 2009 ;; ;; Launch 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 ;; +;; General Public License as published by the Free Software Foundation, either version 3 ;; ;; of the License, or (at your option) any later version. ;; ;; ;; ;; Launch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without ;; @@ -20,7 +20,7 @@ format binary APP_NAME fix 'Launch' -APP_VERSION fix '0.1.5' +APP_VERSION fix '0.1.60' use32 org 0x0 @@ -43,12 +43,18 @@ define DEBUG_MAX_LEN 8 define DEBUG_DEFAULT 0 define BUFF_SIZE 1024 -include '../../../proc32.inc' -include '../../../macros.inc' +include 'proc32.inc' +include 'macros.inc' include 'libio.inc' include 'mem.inc' include 'dll.inc' +purge mov + +include 'thread.inc' +include 'ipc.inc' +include 'kobra.inc' + ;;-------------------------------------------------------------------------------------------------- ;; Basic initialization START: @@ -111,7 +117,7 @@ read_ini_debug: ;; Read debug options jmp .con_init .console_err: - mov dword [debug_option], 0 + mov byte [debug_option], 0 jmp .ok .con_init: @@ -123,15 +129,14 @@ read_ini_debug: ;; Read debug options .read_level: invoke ini.get_int, etc_cfg, cfg_debug, cfg_level, 0 invoke ini.get_int, path, cfg_debug, cfg_level, eax - mov dword [debug_level], eax + mov byte [debug_level], al .ok: -; read_ini_kobra: -; invoke ini.get_str, etc_cfg, cfg_kobra, cfg_use, kobra_use, KOBRA_USE_MAX_LEN, KOBRA_USE_DEFAULT -; invoke ini.get_str, path, cfg_kobra, cfg_use, kobra_use, KOBRA_USE_MAX_LEN, kobra_use -; -; ;; Now convert string option to acceptable type +read_ini_kobra: + invoke ini.get_bool, etc_cfg, cfg_kobra, cfg_use, 0 + invoke ini.get_bool, path, cfg_kobra, cfg_use, eax + mov byte [kobra_use], al ;;-------------------------------------------------------------------------------------------------- ;; Parse command line options @@ -182,11 +187,11 @@ search_file: ; dec al test al, al je .prn_stp - mov eax, dword [debug_level] - or eax, eax + mov al, byte [debug_level] + or al, al je .prn_stp - dec eax - or eax, eax + dec al + or al, al je .prn_1 .prn_1: cinvoke con.printf, message_dbg_not_found, buff @@ -238,14 +243,14 @@ search_file: ;;-------------------------------------------------------------------------------------------------- ;; Exit exit: - push eax + mov dword [tid], eax ;; If console is present we should write some info mov al, byte [debug_option] cmp al, DEBUG_CONSOLE - jne .close + jne .kobra .write_console: - pop eax + mov eax, dword [tid] test eax, eax jz .write_error .write_launched: @@ -257,12 +262,40 @@ exit: .wr_end: invoke con.exit, 0 +.kobra: + mov al, byte [kobra_use] + test al, al + je .close + +.register: + mov dword [IPC_area], buff + call IPC_init +; jnz .close + + mov dword [thread_find_buff], another_buff + + call kobra_register + + test eax, eax + jnz .close + + ;; Prepare message + mov dword [kobra_message], KOBRA_MESSAGE_LAUNCH_STATE + + mov eax, dword [tid] + mov dword [kobra_message+4], eax + +.kobra_send: + stdcall kobra_send_message, kobra_group_launch_reactive, kobra_message, 8 + .close: mcall -1 ;; End of code ;;-------------------------------------------------------------------------------------------------- +;;-------------------------------------------------------------------------------------------------- +;; Imports align 16 importTable: @@ -276,7 +309,8 @@ import libini, \ \; ini.set_int ,'ini_set_int', \ \; ini.get_color ,'ini_get_color', \ \; ini.set_color ,'ini_set_color', \ - ini.get_option_str ,'ini_get_option_str';, \ + ini.get_option_str ,'ini_get_option_str', \ + ini.get_bool ,'ini_get_bool';,\ ;import libio, \ ; file_find_first,'file_find_first', \ @@ -302,6 +336,8 @@ import conlib,\ con.printf, 'con_printf' ;,\ ; con.write_asciiz, 'con_write_asciiz' +;;-------------------------------------------------------------------------------------------------- +;; Data align 16 APP_DATA: @@ -317,11 +353,7 @@ message_error: db 'File (%s) not found!', 0 message_ok: - db '%s loaded succesfully. PID: %d (0x%X)' - -;; Empty string -empty_str: - db 0 + db '%s loaded succesfully. PID: %d (0x%X)', 0 ;; Configuration path etc_cfg: @@ -331,7 +363,7 @@ cfg_name: cfg_ext: db '.cfg', 0 -;; String in config file +;; Strings in config file cfg_main: db 'main', 0 cfg_path: @@ -340,6 +372,10 @@ cfg_debug: db 'debug', 0 cfg_level: db 'level', 0 +cfg_kobra: + db 'kobra', 0 +cfg_use: + db 'use', 0 ;; List of debug modes for parsing debug option debug_strings: @@ -352,19 +388,32 @@ debug_no: debug_console: db 'console', 0 -; modes_nums: -; debug_no_num: -; db 1 -; -; debug_console_num: -; db 2 - -debug_level: - dd 0 - -debug_kobra: +;; Empty string +empty_str: db 0 +kobra_group_launch_reactive: + db 'launch_reactive', 0 + +;;-------------------------------------------------------------------------------------------------- +;; Configuration options +debug_level: + db 0 + +; debug_kobra: +; db 0 + +;; debug option (bool) +debug_option: + db 0 + +kobra_use: + db 0 + +;;-------------------------------------------------------------------------------------------------- +tid: + dd 0 + LaunchStruct FileInfoRun args: db 0 @@ -380,14 +429,16 @@ path: search_path: rb PATH_MAX_LEN -;; debug option as number -debug_option: - dd 0 - ;; Buffer buff: rb BUFF_SIZE +another_buff: + rb 0x1000 + +kobra_message: + rb 0x100 + rb 0x1000 ;; 4 Kb stack APP_STACK: MEM_END: diff --git a/programs/system/launch/trunk/launch.cfg b/programs/system/launch/trunk/launch.cfg index 5d4d572285..8ed09b82ef 100755 --- a/programs/system/launch/trunk/launch.cfg +++ b/programs/system/launch/trunk/launch.cfg @@ -5,8 +5,22 @@ path=/sys/;/sys/utils/;/sys/3d/;/sys/demos/;/sys/develop/;/sys/fm/;/sys/games/;/ [debug] # debug: one of no, console. -debug=console -#debug=no - -# level: 0 - show only ok/error messages, 1 - show for each directory +debug=console +#debug=no + +# level: 0 - show only ok/error messages, 1 - show for each directory level=1 + +# Debug kobra messages? (only if kobra using is enabled) (this is not working now) +kobra=yes + +[kobra] +# Register&use Kobra or not +use=yes + +# Next options aren't used now +# Main group +group=launch + +# Send messages? +send=yes diff --git a/programs/system/launch/trunk/readme.txt b/programs/system/launch/trunk/readme.txt index d007d80599..ed981e510f 100755 --- a/programs/system/launch/trunk/readme.txt +++ b/programs/system/launch/trunk/readme.txt @@ -1,26 +1,33 @@ ==================== Русский ==================== -Версия: 0.1.5 +Версия: 0.1.80 (0.2 beta) Launch - программа для запуска приложения из директорий поиска. При запуске читает файл launch.cfg в /sys/etc, затем в директории запуска. После этого смотрит параметры командной строки. Приоритет параметров - по порядку считывания. Из параметров командной строки пока реализовано только имя программы и аргументы, передаваемые ей. +При включённом использовании Kobra все заинтересованные (входящие в группу launch_reactive) приложения оповещаются +в случае успешного запуска (посылается сообщение dword 1 dword tid, tid - идентификатор запущенного процесса). Настройки: main.path - путь к директориям поиска debug.debug - опции отладки (no - нет отладки или console - вывод через консоль) debug.level - уровень отладки (0 - только сообщение удачно/неудачно, 1 - выводить сообщение для каждой директории) +kobra.use - использование Kobra + ПРЕДУПРЕЖДЕНИЕ: для работы нужна libini не старее ревизии #1235. ==================== English ==================== -Version: 0.1.5 +Version: 0.1.80 (0.2 beta) Launch is a programme that launches applications from search dirictories. On the start it reads file launch.cfg in /sys/etc and in current dirictory. Than it reads command line arguments. Priority of arguments is as reading. -Now there are few command line arguments: the name of application and its arguments. +Now there are only few command line arguments: the name of application and its arguments. +If using Kobra is enabled all intrested (members of launch_reactive group) applications are notified if +application is launched (sending message dword 1 dword tid, tid - identifier of launched process). Configuration: main.path - path to search dirictories debug.debug - debug options (no or console) debug.level - debug level (0 - show only ok/error messages, 1 - show for each directory) +kobra.use - using of Kobra ATTENTION: you need libini from at least #1235 revision. \ No newline at end of file diff --git a/programs/system/launch/trunk/thread.inc b/programs/system/launch/trunk/thread.inc new file mode 100644 index 0000000000..0171a87fc4 --- /dev/null +++ b/programs/system/launch/trunk/thread.inc @@ -0,0 +1,81 @@ +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Copyright (C) Vasiliy Kosenko (vkos), 2009 ;; +;; 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 3 ;; +;; 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, see . ;; +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +thread_find_by_name: + cld + + push ebp + mov ebp, esp + + push ebx ecx + + push 1 ;; initial slot + + mov ebx, dword [thread_find_buff] + + push 0 + +.cycle: + mcall 9 ;; Get thread info + mov dword [esp], eax ;; number of slots + + cmp word [ebx+0x32], 9 + je .next + +.cmpstr: + mov ecx, 11 + + mov esi, dword [thread_find_buff] + add esi, 0xA ;; ESI = address of thread name in list + + mov edi, dword [ebp+8] ;; EDI = address of thread name to find + + repe cmpsb + je .found + +.next: + mov ecx, dword [esp+4] + inc ecx + cmp ecx, dword [esp] + jg .not_found + mov dword [esp+4], ecx + jmp .cycle + +.found: + mov eax, dword [ebx+30] ;; return TID + + jmp .exit + +.not_found: + xor eax, eax + +.exit: + pop ecx ebx + + leave + + ret 4 + +thread_find_buff: + dd 0 + +event_add_mask: + xchg eax, dword [esp+4] + or dword [event_mask], eax + mcall 40, dword [event_mask] + xchg eax, dword [esp+4] + ret 4 + +event_mask: + dd 0