diff --git a/configure.ac b/configure.ac index efa4018..9efd17d 100644 --- a/configure.ac +++ b/configure.ac @@ -20,7 +20,7 @@ dnl ----------------- CONFIGURE --------------------- -AC_INIT([sgpemv2],[0.3],[matteo@member.fsf.org]) +AC_INIT([sgpemv2],[1.0],[matteo@member.fsf.org]) if test -f "`pwd`/configure.ac"; then AC_MSG_FAILURE([ diff --git a/plugins/pyloader/configure.ac b/plugins/pyloader/configure.ac index 5459be9..1a06b02 100644 --- a/plugins/pyloader/configure.ac +++ b/plugins/pyloader/configure.ac @@ -20,17 +20,17 @@ dnl ----------------- CONFIGURE --------------------- -AC_INIT([sgpemv2-pyloader],[0.1],[matteo@member.fsf.org]) +AC_INIT([sgpemv2-pyloader],[1.0],[matteo@member.fsf.org]) if test -f "`pwd`/configure.ac"; then AC_MSG_FAILURE([ - ** This seems to be the pkg root directory. + ** This seems to be the pkg root directory. ** Compiling here your sources is considered ** as unpolite as exploring your nose with ** your pinky whilst attending a wedding party. - ** Please create a new dir as described in - ** the README file, and then run configure - ** into it. If you think you've got it right, + ** Please create a new dir as described in + ** the README file, and then run configure + ** into it. If you think you've got it right, ** please inform the mantainer of this error! ** He'll thoroughfully bash his head on the wall.], -1 ) diff --git a/plugins/pyloader/po/POTFILES.in b/plugins/pyloader/po/POTFILES.in index 6aae4a6..d421ad0 100644 --- a/plugins/pyloader/po/POTFILES.in +++ b/plugins/pyloader/po/POTFILES.in @@ -1,4 +1,3 @@ src/plugin.cc src/python_cpu_policy.cc src/python_cpu_policy_manager.cc -src/testsuite/test-python_loader.cc diff --git a/plugins/xmlsave/configure.ac b/plugins/xmlsave/configure.ac index fd14186..d57e932 100644 --- a/plugins/xmlsave/configure.ac +++ b/plugins/xmlsave/configure.ac @@ -20,17 +20,17 @@ dnl ----------------- CONFIGURE --------------------- -AC_INIT([sgpemv2-xmlsave],[0.1],[matteo@member.fsf.org]) +AC_INIT([sgpemv2-xmlsave],[1.0],[matteo@member.fsf.org]) if test -f "`pwd`/configure.ac"; then AC_MSG_FAILURE([ - ** This seems to be the pkg root directory. + ** This seems to be the pkg root directory. ** Compiling here your sources is considered ** as unpolite as exploring your nose with ** your pinky whilst attending a wedding party. - ** Please create a new dir as described in - ** the README file, and then run configure - ** into it. If you think you've got it right, + ** Please create a new dir as described in + ** the README file, and then run configure + ** into it. If you think you've got it right, ** please inform the mantainer of this error! ** He'll thoroughfully bash his head on the wall.], -1 ) diff --git a/plugins/xmlsave/po/POTFILES.in b/plugins/xmlsave/po/POTFILES.in index 5fb4fe7..c0a7408 100644 --- a/plugins/xmlsave/po/POTFILES.in +++ b/plugins/xmlsave/po/POTFILES.in @@ -1,5 +1,4 @@ src/plugin.cc -src/testsuite/test-xml_serializer.cc src/xml_serializer.cc src/xml_serializer_factory.cc src/xml_visitor.cc diff --git a/po/POTFILES.in b/po/POTFILES.in index 841e2bf..365069b 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,4 +1,4 @@ -# List of source files which contain translatable strings. +src/add_request_dialog.cc src/backend/concrete_environment.cc src/backend/concrete_history.cc src/backend/concrete_simulation.cc @@ -6,6 +6,7 @@ src/backend/cpu_policies_gatekeeper.cc src/backend/cpu_policy.cc src/backend/cpu_policy_exception.cc src/backend/cpu_policy_manager.cc +src/backend/default_resource_policy_manager.cc src/backend/dynamic_process.cc src/backend/dynamic_request.cc src/backend/dynamic_resource.cc @@ -31,6 +32,7 @@ src/backend/request.cc src/backend/resource.cc src/backend/resource_policies_gatekeeper.cc src/backend/resource_policy.cc +src/backend/resource_policy_lifo.cc src/backend/resource_policy_manager.cc src/backend/schedulable.cc src/backend/scheduler.cc @@ -39,6 +41,7 @@ src/backend/serializer_error.cc src/backend/serializers_gatekeeper.cc src/backend/serialize_visitor.cc src/backend/simulation.cc +src/backend/simulation_observer.cc src/backend/static_process.cc src/backend/static_request.cc src/backend/static_resource.cc @@ -51,11 +54,16 @@ src/backend/thread.cc src/backend/user_interrupt_exception.cc src/cairo_elements.cc src/cairo_widget.cc +src/configure_policy_dialog.cc src/graphical_preferences_editor.cc src/gui_builder.cc +src/holt_widget.cc src/main.cc src/parse_opts.cc +src/resources_widget.cc +src/schedulable_state_widget.cc src/schedulables_tree_widget.cc +src/simulation_controller.cc src/simulation_widget.cc src/templates/deletor.tcc src/templates/parameter.tcc @@ -63,12 +71,4 @@ src/templates/prova.cc src/templates/sequences.tcc src/templates/singleton.tcc src/templates/smartp.tcc -src/testsuite/stubs/history.cc -src/testsuite/stubs/policy_manager.cc -src/testsuite/stubs/prrpolicy.cc -src/testsuite/test-global_preferences_serialization.cc -src/testsuite/test-history.cc -src/testsuite/test-key_file.cc -src/testsuite/test-parse_command.cc -src/testsuite/test-stepforward.cc src/text_simulation.cc diff --git a/po/sgpemv2.pot b/po/sgpemv2.pot index 2ac5d68..105d5c6 100644 --- a/po/sgpemv2.pot +++ b/po/sgpemv2.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: matteo@member.fsf.org\n" -"POT-Creation-Date: 2006-08-18 01:35+0200\n" +"POT-Creation-Date: 2006-09-05 11:35+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,32 +16,107 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: src/backend/concrete_simulation.cc:180 +#: src/add_request_dialog.cc:94 +msgid "key" +msgstr "" + +#: src/add_request_dialog.cc:95 +msgid "resource" +msgstr "" + +#: src/add_request_dialog.cc:96 +msgid "length" +msgstr "" + +#: src/backend/concrete_simulation.cc:232 msgid "unable to change policy and to restore the previous: " msgstr "" -#: src/backend/concrete_simulation.cc:186 +#: src/backend/concrete_simulation.cc:238 msgid "unable to change policy: " msgstr "" -#: src/backend/string_utils.cc:88 src/backend/string_utils.cc:120 +#: src/backend/string_utils.cc:52 src/backend/string_utils.cc:88 msgid "too few or too many tokens" msgstr "" -#: src/backend/string_utils.cc:110 +#: src/backend/string_utils.cc:75 msgid "incorrect number format" msgstr "" -#: src/backend/string_utils.cc:142 +#: src/backend/string_utils.cc:111 msgid "incorrect boolean" msgstr "" -#: src/graphical_preferences_editor.cc:144 -#: src/graphical_preferences_editor.cc:173 +#: src/configure_policy_dialog.cc:61 +msgid "Policy description" +msgstr "" + +#: src/configure_policy_dialog.cc:74 +msgid "Integer values" +msgstr "" + +#: src/configure_policy_dialog.cc:92 +msgid "Floating point values" +msgstr "" + +#: src/configure_policy_dialog.cc:109 +msgid "Alphanumerical values" +msgstr "" + +#: src/configure_policy_dialog.cc:124 +msgid "No options to configure for this policy" +msgstr "" + +#: src/graphical_preferences_editor.cc:312 +#: src/graphical_preferences_editor.cc:345 msgid "Select a directory to add" msgstr "" -#: src/gui_builder.cc:137 +#: src/gui_builder.cc:132 src/gui_builder.cc:175 src/gui_builder.cc:245 +msgid "ERROR: No registered serializer available" +msgstr "" + +#: src/gui_builder.cc:137 src/gui_builder.cc:180 src/gui_builder.cc:250 +#: src/text_simulation.cc:375 src/text_simulation.cc:381 +#: src/text_simulation.cc:399 src/text_simulation.cc:463 +#: src/text_simulation.cc:469 src/text_simulation.cc:487 +#: src/text_simulation.cc:800 src/text_simulation.cc:1488 +#: src/text_simulation.cc:1525 +msgid "ERROR: " +msgstr "" + +#: src/gui_builder.cc:271 src/gui_builder.cc:294 +msgid "" +"No CPU policy is currently selected.\n" +"Please choose one before trying to configure it." +msgstr "" + +#: src/gui_builder.cc:278 src/gui_builder.cc:301 +msgid "Configuring CPU Policy " +msgstr "" + +#: src/gui_builder.cc:355 +msgid "Selected CPU policy " +msgstr "" + +#: src/gui_builder.cc:363 +msgid "Impossible to select this CPU Policy.\n" +msgstr "" + +#: src/gui_builder.cc:369 +msgid "No CPU policy selected. Please select one." +msgstr "" + +#: src/gui_builder.cc:417 +msgid "Current resource policy deselected." +msgstr "" + +#: src/gui_builder.cc:419 +msgid "Selected resource policy " +msgstr "" + +#: src/gui_builder.cc:559 msgid "Filename to open: " msgstr "" @@ -67,123 +142,248 @@ msgid "" "computer" msgstr "" -#: src/parse_opts.cc:136 +#: src/parse_opts.cc:112 +msgid "Error while loading preferences" +msgstr "" + +#: src/parse_opts.cc:142 msgid "" " [II] To see a list of commands available,\n" " [II] please type \"help\" and hit the ENTER key." msgstr "" -#: src/parse_opts.cc:160 +#: src/parse_opts.cc:166 msgid "Bad invocation: " msgstr "" -#: src/parse_opts.cc:161 +#: src/parse_opts.cc:167 msgid "Use the `-?' or `--help' option to see the help" msgstr "" -#: src/text_simulation.cc:108 -msgid "ERROR: this command requires at least " +#: src/resources_widget.cc:64 +msgid "resources" msgstr "" -#: src/text_simulation.cc:108 -msgid " arguments\n" +#: src/schedulable_state_widget.cc:66 +msgid "Future" +msgstr "" + +#: src/schedulable_state_widget.cc:70 +msgid "Ready" +msgstr "" + +#: src/schedulable_state_widget.cc:74 +msgid "Running" +msgstr "" + +#: src/schedulable_state_widget.cc:78 +msgid "Blocked" +msgstr "" + +#: src/schedulable_state_widget.cc:82 +msgid "Terminated" +msgstr "" + +#: src/schedulables_tree_widget.cc:65 +msgid "schedulables" +msgstr "" + +#: src/schedulables_tree_widget.cc:170 +msgid "Add Process" +msgstr "" + +#: src/schedulables_tree_widget.cc:173 +msgid "Add Thread" +msgstr "" + +#: src/schedulables_tree_widget.cc:176 +msgid "Add Request" +msgstr "" + +#: src/schedulables_tree_widget.cc:179 +msgid "Edit Process" +msgstr "" + +#: src/schedulables_tree_widget.cc:182 +msgid "Edit Thread" +msgstr "" + +#: src/schedulables_tree_widget.cc:185 +msgid "Edit Request" +msgstr "" + +#: src/schedulables_tree_widget.cc:188 +msgid "Remove Process" +msgstr "" + +#: src/schedulables_tree_widget.cc:191 +msgid "Remove Thread" +msgstr "" + +#: src/schedulables_tree_widget.cc:194 +msgid "Remove Request" +msgstr "" + +#: src/schedulables_tree_widget.cc:639 +msgid ", arrives at: " +msgstr "" + +#: src/schedulables_tree_widget.cc:640 +msgid ", base priority: " +msgstr "" + +#: src/schedulables_tree_widget.cc:641 +msgid ", elapsed time: " +msgstr "" + +#: src/schedulables_tree_widget.cc:642 +msgid ", current priority: " +msgstr "" + +#: src/schedulables_tree_widget.cc:658 +msgid "at " +msgstr "" + +#: src/simulation_controller.cc:191 +msgid "The selected user CPU policy stopped before returning:\n" +msgstr "" + +#: src/simulation_controller.cc:198 +msgid "" +"The selected user CPU policy was malformed and failed to sort the queue:\n" +msgstr "" + +#: src/simulation_controller.cc:210 +msgid " [EE] Fatal error. Impossible to deactivate the policy in " +msgstr "" + +#: src/simulation_controller.cc:211 +msgid " [EE] " +msgstr "" + +#: src/simulation_controller.cc:218 +msgid "No active policy selected:\n" +msgstr "" + +#: src/simulation_controller.cc:225 +msgid "Unexpected error:\n" msgstr "" #: src/text_simulation.cc:114 +msgid "ERROR: this command requires at least " +msgstr "" + +#: src/text_simulation.cc:114 +msgid " arguments\n" +msgstr "" + +#: src/text_simulation.cc:120 msgid "WARNING: some arguments will be ignored\n" msgstr "" -#: src/text_simulation.cc:124 +#: src/text_simulation.cc:130 msgid "" "WARNING: Simulation was not recently saved. If you continue some changes to " "the simulation might be lost.\n" msgstr "" -#: src/text_simulation.cc:129 +#: src/text_simulation.cc:135 msgid "Continue? [y/n] " msgstr "" -#: src/text_simulation.cc:137 +#: src/text_simulation.cc:143 msgid "n" msgstr "" -#: src/text_simulation.cc:139 +#: src/text_simulation.cc:145 msgid "y" msgstr "" -#: src/text_simulation.cc:242 +#: src/text_simulation.cc:244 msgid "ERROR: Provided value is out of range\n" msgstr "" -#: src/text_simulation.cc:248 +#: src/text_simulation.cc:250 msgid "ERROR: Please provide a valid numeric value\n" msgstr "" -#: src/text_simulation.cc:257 +#: src/text_simulation.cc:259 msgid "ERROR: This is a mandatory attribute; you MUST provide a valid value!\n" msgstr "" -#: src/text_simulation.cc:293 src/text_simulation.cc:345 +#: src/text_simulation.cc:291 src/text_simulation.cc:338 msgid "ERROR: This is a mandatory atribute; you MUST provide a valid value!\n" msgstr "" -#: src/text_simulation.cc:339 +#: src/text_simulation.cc:332 msgid "ERROR: Please provide a valid boolean value ('true' or 'false')\n" msgstr "" -#: src/text_simulation.cc:367 src/text_simulation.cc:373 -#: src/text_simulation.cc:391 src/text_simulation.cc:695 -#: src/text_simulation.cc:1386 src/text_simulation.cc:1423 -msgid "ERROR: " -msgstr "" - -#: src/text_simulation.cc:369 src/text_simulation.cc:393 +#: src/text_simulation.cc:377 src/text_simulation.cc:401 +#: src/text_simulation.cc:465 src/text_simulation.cc:489 msgid "" "\n" "Simulation is now stopped\n" msgstr "" -#: src/text_simulation.cc:375 +#: src/text_simulation.cc:383 src/text_simulation.cc:471 msgid "" "\n" "Simulation is now stopped, and the current policy will be deactivated\n" msgstr "" -#: src/text_simulation.cc:384 +#: src/text_simulation.cc:392 src/text_simulation.cc:480 msgid "FATAL ERROR: unable to deactivate the policy: " msgstr "" -#: src/text_simulation.cc:424 +#: src/text_simulation.cc:405 src/text_simulation.cc:493 +msgid "UNKNOWN ERROR: " +msgstr "" + +#: src/text_simulation.cc:439 +msgid "ERROR: provided instant is out of range.\n" +msgstr "" + +#: src/text_simulation.cc:446 +msgid "ERROR: provided instant is not a valid integer\n" +msgstr "" + +#: src/text_simulation.cc:451 +msgid "ERROR: the instant is not within range.\n" +msgstr "" + +#: src/text_simulation.cc:520 msgid "ERROR: No policy actually selected for the simulation\n" msgstr "" -#: src/text_simulation.cc:430 +#: src/text_simulation.cc:526 msgid "Please provide a value for each attribute:\n" msgstr "" -#: src/text_simulation.cc:431 +#: src/text_simulation.cc:527 msgid "" "Mandatory arguments are marked with an asterisk (*)\n" "\n" msgstr "" -#: src/text_simulation.cc:433 +#: src/text_simulation.cc:529 msgid "Integer arguments:\n" msgstr "" -#: src/text_simulation.cc:453 +#: src/text_simulation.cc:549 msgid "" "\n" "Floating-point arguments:\n" msgstr "" -#: src/text_simulation.cc:475 +#: src/text_simulation.cc:571 msgid "" "\n" "String arguments:\n" msgstr "" -#: src/text_simulation.cc:507 +#: src/text_simulation.cc:603 msgid "" "Avaiable commands:\n" "RUN\n" @@ -204,7 +404,7 @@ msgid "" "ex. `HELP RUN` shows help about the command RUN\n" msgstr "" -#: src/text_simulation.cc:513 +#: src/text_simulation.cc:609 msgid "" "-- RUN COMMAND --\n" "Starts the simulation. It can be continuous or step-by-step depending on the " @@ -216,20 +416,26 @@ msgid "" "running. The scheduler activity begins at instant 1.\n" msgstr "" -#: src/text_simulation.cc:522 +#: src/text_simulation.cc:618 msgid "" "-- STOP COMMAND --\n" "Stops the simulation. The next call to RUN will bring the simulation to the " "first instant and start it.\n" msgstr "" -#: src/text_simulation.cc:525 +#: src/text_simulation.cc:621 msgid "" "-- PAUSE COMMAND --\n" "Pauses the simulation. The next call to RUN will continue it.\n" msgstr "" -#: src/text_simulation.cc:528 +#: src/text_simulation.cc:624 +msgid "" +"-- JUMPTO COMMAND --\n" +"Pauses the simulation and jumps to the specified instant.\n" +msgstr "" + +#: src/text_simulation.cc:626 msgid "" "-- CONFIGURE-CPU-POLICY COMMAND --\n" "Configure parameters exposed by the cpu policy.\n" @@ -238,27 +444,27 @@ msgid "" "without modifying their source code.\n" msgstr "" -#: src/text_simulation.cc:532 +#: src/text_simulation.cc:630 msgid "" "-- HELP COMMAND --\n" "The help you're reading.\n" msgstr "" -#: src/text_simulation.cc:534 +#: src/text_simulation.cc:632 msgid "" "-- GET COMMAND --\n" "Syntax: GET \n" "\twhere may be simulation-tick or continuous.\n" msgstr "" -#: src/text_simulation.cc:537 +#: src/text_simulation.cc:635 msgid "" "-- SET COMMAND --\n" "Syntax: SET [=] \n" "\twhere may be simulation-tick, continuous or cpu-policy.\n" msgstr "" -#: src/text_simulation.cc:540 +#: src/text_simulation.cc:638 msgid "" "-- SHOW COMMAND --\n" "Displays the name of the entities (if available) and other informations " @@ -274,7 +480,7 @@ msgid "" "ids follow the same logic of the previous commands\n" msgstr "" -#: src/text_simulation.cc:551 +#: src/text_simulation.cc:649 msgid "" "-- ADD COMMAND --\n" "Adds an entity by using a questionary-like approach.\n" @@ -289,7 +495,7 @@ msgid "" "follow the same logic of the previous commands\n" msgstr "" -#: src/text_simulation.cc:561 +#: src/text_simulation.cc:659 msgid "" "-- REMOVE COMMAND --\n" "Removes an entity.\n" @@ -306,7 +512,7 @@ msgid "" "where the numeric ids follow the same logic of the previous commands\n" msgstr "" -#: src/text_simulation.cc:571 +#: src/text_simulation.cc:669 msgid "" "-- SAVE COMMAND --\n" "Saves the simulation.\n" @@ -314,7 +520,7 @@ msgid "" "Syntax: SAVE \n" msgstr "" -#: src/text_simulation.cc:574 +#: src/text_simulation.cc:672 msgid "" "-- LOAD COMMAND --\n" "Loads the simulation.\n" @@ -322,236 +528,228 @@ msgid "" "Syntax: LOAD \n" msgstr "" -#: src/text_simulation.cc:577 +#: src/text_simulation.cc:675 msgid "" "-- QUIT COMMAND --\n" "Gently closes the program.\n" msgstr "" -#: src/text_simulation.cc:579 +#: src/text_simulation.cc:677 msgid "ERROR: Sorry, no help available for this command.\n" msgstr "" -#: src/text_simulation.cc:590 +#: src/text_simulation.cc:688 msgid "" "\n" "Bye.\n" "\n" msgstr "" -#: src/text_simulation.cc:617 +#: src/text_simulation.cc:715 msgid "" "ERROR: invalid attribute name. Accepted are: simulation-tick, continuous\n" msgstr "" -#: src/text_simulation.cc:652 +#: src/text_simulation.cc:750 msgid "ERROR: you must provide a valid unsigned integer value\n" msgstr "" -#: src/text_simulation.cc:691 +#: src/text_simulation.cc:796 msgid "ERROR: invalid unsigned integer or not a valid policy index\n" msgstr "" -#: src/text_simulation.cc:711 +#: src/text_simulation.cc:817 msgid "ERROR: you must provide a valid boolean value ('true' or 'false')\n" msgstr "" -#: src/text_simulation.cc:715 +#: src/text_simulation.cc:821 msgid "" "ERROR: invalid attribute name. Accepted are: simulation-tick, cpu-policy, " "continuous\n" msgstr "" -#: src/text_simulation.cc:746 src/text_simulation.cc:947 -#: src/text_simulation.cc:1163 +#: src/text_simulation.cc:852 src/text_simulation.cc:1053 +#: src/text_simulation.cc:1265 msgid "ERROR: invalid argument\n" msgstr "" -#: src/text_simulation.cc:793 +#: src/text_simulation.cc:899 msgid "ERROR: provided process identifier is not a valid integer\n" msgstr "" -#: src/text_simulation.cc:798 +#: src/text_simulation.cc:904 msgid "ERROR: this process identifier does not belong to an existing process\n" msgstr "" -#: src/text_simulation.cc:829 src/text_simulation.cc:867 -#: src/text_simulation.cc:1009 src/text_simulation.cc:1058 -#: src/text_simulation.cc:1104 src/text_simulation.cc:1187 -#: src/text_simulation.cc:1224 src/text_simulation.cc:1260 -#: src/text_simulation.cc:1300 src/text_simulation.cc:1343 +#: src/text_simulation.cc:935 src/text_simulation.cc:973 +#: src/text_simulation.cc:1111 src/text_simulation.cc:1160 +#: src/text_simulation.cc:1206 src/text_simulation.cc:1289 +#: src/text_simulation.cc:1326 src/text_simulation.cc:1362 +#: src/text_simulation.cc:1402 src/text_simulation.cc:1445 msgid "ERROR: provided identifier(s) not a valid integer\n" msgstr "" -#: src/text_simulation.cc:834 src/text_simulation.cc:872 -#: src/text_simulation.cc:1014 src/text_simulation.cc:1063 -#: src/text_simulation.cc:1109 src/text_simulation.cc:1192 -#: src/text_simulation.cc:1229 src/text_simulation.cc:1265 -#: src/text_simulation.cc:1305 src/text_simulation.cc:1348 +#: src/text_simulation.cc:940 src/text_simulation.cc:978 +#: src/text_simulation.cc:1116 src/text_simulation.cc:1165 +#: src/text_simulation.cc:1211 src/text_simulation.cc:1294 +#: src/text_simulation.cc:1331 src/text_simulation.cc:1367 +#: src/text_simulation.cc:1407 src/text_simulation.cc:1450 msgid "ERROR: the identifier(s) do not belong to an existing entity\n" msgstr "" -#: src/text_simulation.cc:912 +#: src/text_simulation.cc:1018 msgid "FIXME: Not implemented\n" msgstr "" -#: src/text_simulation.cc:927 +#: src/text_simulation.cc:1033 msgid "WARNING: Simulation is not stopped, it will be automatically stopped\n" msgstr "" -#: src/text_simulation.cc:957 src/text_simulation.cc:975 -#: src/text_simulation.cc:1018 +#: src/text_simulation.cc:1063 src/text_simulation.cc:1081 +#: src/text_simulation.cc:1120 msgid "name" msgstr "" -#: src/text_simulation.cc:958 src/text_simulation.cc:1020 +#: src/text_simulation.cc:1064 src/text_simulation.cc:1122 msgid "arrival time" msgstr "" -#: src/text_simulation.cc:959 src/text_simulation.cc:1650 +#: src/text_simulation.cc:1065 src/text_simulation.cc:1750 msgid "priority" msgstr "" -#: src/text_simulation.cc:976 -msgid "pre-emptable?" -msgstr "" - -#: src/text_simulation.cc:977 +#: src/text_simulation.cc:1082 msgid "places" msgstr "" -#: src/text_simulation.cc:978 -msgid "availability" -msgstr "" - -#: src/text_simulation.cc:1019 +#: src/text_simulation.cc:1121 msgid "cpu time" msgstr "" -#: src/text_simulation.cc:1021 +#: src/text_simulation.cc:1123 msgid "base priority" msgstr "" -#: src/text_simulation.cc:1067 +#: src/text_simulation.cc:1169 msgid "instant" msgstr "" -#: src/text_simulation.cc:1113 +#: src/text_simulation.cc:1215 msgid "resource key" msgstr "" -#: src/text_simulation.cc:1114 +#: src/text_simulation.cc:1216 msgid "duration" msgstr "" -#: src/text_simulation.cc:1123 +#: src/text_simulation.cc:1225 msgid "ERROR: invalid resource identifier\n" msgstr "" -#: src/text_simulation.cc:1145 +#: src/text_simulation.cc:1247 msgid "WARNING: Simulation is not stopped, it will be automatically stopped" msgstr "" -#: src/text_simulation.cc:1220 +#: src/text_simulation.cc:1322 msgid "invalid resource id" msgstr "" -#: src/text_simulation.cc:1382 src/text_simulation.cc:1419 +#: src/text_simulation.cc:1484 src/text_simulation.cc:1521 msgid "ERROR: No registered serializer available\n" msgstr "" -#: src/text_simulation.cc:1489 +#: src/text_simulation.cc:1592 msgid "ERROR: command not supported\n" msgstr "" -#: src/text_simulation.cc:1507 -msgid "RUNNING @" +#: src/text_simulation.cc:1610 +msgid ">> RUNNING <<" msgstr "" -#: src/text_simulation.cc:1510 +#: src/text_simulation.cc:1613 msgid "READY" msgstr "" -#: src/text_simulation.cc:1513 +#: src/text_simulation.cc:1616 msgid "BLOCKED" msgstr "" -#: src/text_simulation.cc:1516 src/text_simulation.cc:1540 +#: src/text_simulation.cc:1619 src/text_simulation.cc:1643 msgid "FUTURE" msgstr "" -#: src/text_simulation.cc:1519 +#: src/text_simulation.cc:1622 msgid "TERMINATED" msgstr "" -#: src/text_simulation.cc:1534 +#: src/text_simulation.cc:1637 msgid "UNALLOCABLE" msgstr "" -#: src/text_simulation.cc:1537 +#: src/text_simulation.cc:1640 msgid "ALLOCATED" msgstr "" -#: src/text_simulation.cc:1543 +#: src/text_simulation.cc:1646 msgid "EXHAUSTED" msgstr "" -#: src/text_simulation.cc:1546 +#: src/text_simulation.cc:1649 msgid "ALLOCABLE" msgstr "" -#: src/text_simulation.cc:1573 +#: src/text_simulation.cc:1673 msgid "READY QUEUE: { " msgstr "" -#: src/text_simulation.cc:1581 +#: src/text_simulation.cc:1681 msgid " ~ " msgstr "" -#: src/text_simulation.cc:1584 +#: src/text_simulation.cc:1684 msgid "}" msgstr "" -#: src/text_simulation.cc:1598 +#: src/text_simulation.cc:1698 msgid "RESOURCES:" msgstr "" -#: src/text_simulation.cc:1604 +#: src/text_simulation.cc:1704 msgid ", with " msgstr "" -#: src/text_simulation.cc:1605 +#: src/text_simulation.cc:1705 msgid " places" msgstr "" -#: src/text_simulation.cc:1610 +#: src/text_simulation.cc:1710 msgid "queue: { " msgstr "" -#: src/text_simulation.cc:1626 +#: src/text_simulation.cc:1726 msgid " }" msgstr "" -#: src/text_simulation.cc:1644 +#: src/text_simulation.cc:1744 msgid "PROCESSES:" msgstr "" -#: src/text_simulation.cc:1646 +#: src/text_simulation.cc:1746 msgid "state" msgstr "" -#: src/text_simulation.cc:1647 +#: src/text_simulation.cc:1747 msgid "arrival" msgstr "" -#: src/text_simulation.cc:1648 +#: src/text_simulation.cc:1748 msgid "requiring" msgstr "" -#: src/text_simulation.cc:1649 +#: src/text_simulation.cc:1749 msgid "elapsed" msgstr "" -#: src/text_simulation.cc:1651 +#: src/text_simulation.cc:1751 msgid "resource_id" msgstr ""