diff --git a/configure.ac b/configure.ac index ace655d..692247a 100644 --- a/configure.ac +++ b/configure.ac @@ -20,7 +20,7 @@ dnl ----------------- CONFIGURE --------------------- -AC_INIT([sgpemv2],[1.0],[matteo@member.fsf.org]) +AC_INIT([sgpemv2],[1.0.1],[matteo@member.fsf.org]) if test -f "`pwd`/configure.ac"; then AC_MSG_FAILURE([ @@ -65,7 +65,6 @@ AC_CHECK_CXXFLAG([CXXFLAGS], [Wall]) AC_CHECK_CXXFLAG([CXXFLAGS], [pedantic]) AC_CHECK_CXXFLAG([CXXFLAGS], [Wextra]) AC_CHECK_CXXFLAG([CXXFLAGS], [Wno-long-long]) -AC_CHECK_CXXFLAG([CXXFLAGS], [fvisibility-inlines-hidden]) AC_CHECK_LDFLAG([LDFLAGS],[--as-needed]) dnl see if we've to enable debug flags @@ -90,6 +89,8 @@ AC_ARG_ENABLE([visibility-support], AC_MSG_CHECKING([whether to use new GCC visibility attributes]) if test "x$enable_gcc_visibility" = "xno"; then CPPFLAGS="${CPPFLAGS} -DDISABLE_VISIBILITY_SUPPORT" +else + AC_CHECK_CXXFLAG([CXXFLAGS], [fvisibility-inlines-hidden]) fi AC_MSG_RESULT([$enable_gcc_visibility]) @@ -137,7 +138,8 @@ AC_MSG_RESULT([$compile_tests]) AM_CONDITIONAL([COND_TESTS], [test "$compile_tests" = "yes"]) dnl output files -AC_CONFIG_FILES([config/Doxyfile config/sgpemv2.pc config/sgpemv2-uninstalled.pc]) +AC_CONFIG_FILES([config/Doxyfile config/sgpemv2.pc \ + config/sgpemv2-uninstalled.pc data/sgpemv2.desktop]) AC_CONFIG_HEADERS([config.h:config.h.in]) # force include of configuration header in every compilation unit diff --git a/data/sgpemv2.desktop b/data/sgpemv2.desktop.in similarity index 86% rename from data/sgpemv2.desktop rename to data/sgpemv2.desktop.in index 219dac9..0ebb97a 100644 --- a/data/sgpemv2.desktop +++ b/data/sgpemv2.desktop.in @@ -2,9 +2,9 @@ Encoding=UTF-8 Type=Application -Version=0.9 +Version=@PACKAGE_VERSION@ Name=SGPEMv2 -Categories=Education;Engineering;GTK +Categories=Education;Engineering;GTK; GenericName=Process Scheduling Simulator GenericName[it]=Simulatore della Gestione dei Processi diff --git a/distro/deb/build.sh b/distro/deb/build.sh index 45b70a0..45c9cc8 100755 --- a/distro/deb/build.sh +++ b/distro/deb/build.sh @@ -2,7 +2,7 @@ curdir="$(pwd)" -if [ "${1}" == "" ]; then +if [ "${1}" = "" ]; then echo "You need to pass the control file as the first parameter of this script." echo "Usage: ./build.sh " exit -1 diff --git a/distro/deb/control-file-v1.0 b/distro/deb/control-file-v1.0 index 0fd85bd..7001ccc 100644 --- a/distro/deb/control-file-v1.0 +++ b/distro/deb/control-file-v1.0 @@ -4,7 +4,7 @@ Section: misc Priority: optional Architecture: i386 Pre-Depends: libstdc++6 -Depends: libgtkmm-2.4-1c2a, libglademm-2.4-1c2a, libxml2 (>= 2.6.10), libcairo, python (>= 2.3) +Depends: libgtkmm-2.4-1c2a, libglademm-2.4-1c2a, libxml2 (>= 2.6.10), libcairo, python (>= 2.3), python (<< 2.5) Installed-Size: @SIZE@ Maintainer: Marco Trevisan Provides: sgpemv2 diff --git a/distro/deb/control-file-v1.0.1 b/distro/deb/control-file-v1.0.1 new file mode 100644 index 0000000..783f256 --- /dev/null +++ b/distro/deb/control-file-v1.0.1 @@ -0,0 +1,22 @@ +Package: sgpemv2 +Version: 1.0.1 +Section: misc +Priority: optional +Architecture: i386 +Pre-Depends: libstdc++6 +Depends: libgtkmm-2.4-1c2a, libglademm-2.4-1c2a, libxml2 (>= 2.6.10), libcairo, python (>= 2.3) +Installed-Size: @SIZE@ +Maintainer: Marco Trevisan +Provides: sgpemv2 +Description: A graphical process management simulator with educational purposes. + . + SGPEM is an Italian acronym, standing for "Simulatore della Gestione + dei Processi in un Elaboratore Multiprogrammato" (in English, "Process + Management Simulator for a Multitasking Computer"). It was initially + developed for use inside the "Operating Systems" teaching, part of the + Computer Science course of the University of Padova, Italy. + . + The aim of SGPEM is to provide an easy-to-use environment for simulating + process scheduling policies, and for assigning resources in a multitasking + computer. SGPEMv2 is an educational software, and it can help students + to better understand the functionality of operating systems. diff --git a/doc/sgpem2dman.texi b/doc/sgpem2dman.texi index e317211..959899c 100644 --- a/doc/sgpem2dman.texi +++ b/doc/sgpem2dman.texi @@ -1257,7 +1257,7 @@ Here there's a quick reference about such commands: @table @samp -@item svn checkout @emph{http://svn.thgnet.it/swe/drafts} +@item svn checkout @emph{http://svn.gna.org/svn/sgpemv2/trunk} Downloads a copy of the current @samp{drafts/} directory contents. Checking out the root repository dir (@samp{swe/}) may result, in near future, to a @strong{big} download, as diff --git a/doc/sgpem2uman.texi b/doc/sgpem2uman.texi index b6169e9..5c654d3 100644 --- a/doc/sgpem2uman.texi +++ b/doc/sgpem2uman.texi @@ -17,7 +17,7 @@ This is SGPEMv2 User Manual (version @value{VERSION}, @value{UPDATED}). -Copyright @copyright{} 2005-2006 University of Padova, dept. of Pure +Copyright @copyright{} 2005-2007 University of Padova, dept. of Pure and Applied Mathematics Permission is granted to copy, distribute and/or modify this document @@ -89,13 +89,15 @@ Free Documentation License''. @unnumbered History @table @strong +@item 2007, March 5th @r{-- Matteo Settenvini} +Updated subsection ``The Schedulables/Requests tree'' @item 2006, September 12th @r{--- Luca Vezzaro} -Updated section "From the commandline" +Updated section ``From the commandline'' @item 2006, September 9th @r{--- Luca Vezzaro} -Written documentation for section "The Schedulables/Requests tree" -and section "The Resources list" +Written documentation for section ``The Schedulables/Requests tree'' +and section ``The Resources list'' @item 2006, September 8th @r{--- Luca Vezzaro} -Written documentation for section "Overall view of the main window" +Written documentation for section ``Overall view of the main window'' @item 2006, September 8th @r{--- Matteo Settenvini} Update chapters about building and installation. Rewrite some of the chapter about extending SGPEMv2 with custom CPU policies, and add a @@ -160,8 +162,8 @@ help students to better understand the functionality of operating systems. We recommend that you read the manual following the the structure that we layed out for it. You will be gently led trough Installation, Configuration and Usage of SGPEMv2. -If you find yourself in trouble reading the manual, please don't hesitate to contact us at -@email{swe@@thgnet.it}. +If you find yourself in trouble reading the manual, please don't hesitate to contact us via +@url{https://mail.gna.org/listinfo/sgpemv2-devel}. @c % -------------------------------------------------- @@ -171,7 +173,7 @@ If you find yourself in trouble reading the manual, please don't hesitate to con @cindex reporting We welcome bug reports and suggestions for any aspect of the SGPEM v2 system, program in general, -documentation, installation... anything. Please email us at @email{swe@@thgnet.it}. +documentation, installation... anything. Please contact us via @url{https://mail.gna.org/listinfo/sgpemv2-devel}. For bug reporters, include enough information for us to reproduce the problem. In general: @itemize @item @@ -763,6 +765,10 @@ add threads or requests you must select a process or a thread, respectively. To remove or edit an entity simply select it, and the popup menu will contain the remove or edit operation specific for that entity. +Note also that adding a process, since version 1.0.1, automatically +adds also a ``Main'' thread. This is for your convenience: you're +still able to modify/delete it if you want. + Anyway, these functionalities are only useful for a stopped simulation. While the simulation is not in a stopped state, a lot of dynamic information is displayed by the widget. diff --git a/plugins/pyloader/configure.ac b/plugins/pyloader/configure.ac index 808693e..5b75fe1 100644 --- a/plugins/pyloader/configure.ac +++ b/plugins/pyloader/configure.ac @@ -25,15 +25,15 @@ 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. - ** Compiling here your sources is considered - ** as unpolite as exploring your nose with - ** your pinky whilst attending a wedding party. + ** 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 inform the mantainer of this error! - ** He'll thoroughfully bash his head on the wall.], - -1 ) + ** please inform the mantainer of this error! + ** He'll thoroughfully bash his head on the wall.], + -1 ) fi AC_GNU_SOURCE @@ -42,7 +42,7 @@ AC_CONFIG_AUX_DIR(config) AC_CANONICAL_TARGET dnl starting automake -AM_INIT_AUTOMAKE([dejagnu dist-bzip2 subdir-objects]) +AM_INIT_AUTOMAKE([dist-bzip2 subdir-objects]) dnl gettext & libtool AC_PROG_LIBTOOL @@ -77,6 +77,22 @@ else AC_CHECK_CXXFLAG([CXXFLAGS], [DNDEBUG]) fi + +dnl see if we have to enable visibility support +AC_ARG_ENABLE([visibility-support], + AS_HELP_STRING([--enable-visibility-support], + [enable the new GCC visibility support; requires GCC >= 4.0 to work.]), + [enable_gcc_visibility="$enableval"], + [enable_gcc_visibility="no"]) +AC_MSG_CHECKING([whether to use new GCC visibility attributes]) +if test "x$enable_gcc_visibility" = "xno"; then + CPPFLAGS="${CPPFLAGS} -DDISABLE_VISIBILITY_SUPPORT" +else + AC_CHECK_CXXFLAG([CXXFLAGS], [fvisibility-inlines-hidden]) +fi +AC_MSG_RESULT([$enable_gcc_visibility]) + + AC_PROG_INSTALL dnl make diff --git a/plugins/pyloader/m4/ac_python_devel.m4 b/plugins/pyloader/m4/ac_python_devel.m4 index 39da07f..959f44e 100644 --- a/plugins/pyloader/m4/ac_python_devel.m4 +++ b/plugins/pyloader/m4/ac_python_devel.m4 @@ -32,7 +32,7 @@ dnl @author Rafael Laboissiere dnl @author Andrew Collier dnl @author Matteo Settenvini dnl @author Horst Knorr -dnl @version 2006-02-05 +dnl @version 2008-01-16 dnl @license GPLWithACException AC_DEFUN([AC_PYTHON_DEVEL],[ @@ -134,49 +134,66 @@ $ac_distutils_result]) if test -z "$PYTHON_LDFLAGS"; then # (makes two attempts to ensure we've got a version number # from the interpreter) - py_version=`$PYTHON -c "from distutils.sysconfig import *; \ + ac_python_version=`$PYTHON -c "from distutils.sysconfig import *; \ from string import join; \ print join(get_config_vars('VERSION'))"` - if test "$py_version" == "[None]"; then + if test "$ac_python_version" = "[None]"; then if test -n "$PYTHON_VERSION"; then - py_version=$PYTHON_VERSION + ac_python_version=$PYTHON_VERSION else - py_version=`$PYTHON -c "import sys; \ + ac_python_version=`$PYTHON -c "import sys; \ print sys.version[[:3]]"` fi fi + + # First, the library directory: + ac_python_libdir=`$PYTHON -c \ + "import distutils.sysconfig,string; \ + print string.join(filter(None, \ + distutils.sysconfig.get_config_vars('LIBDIR')))"` - PYTHON_LDFLAGS=`$PYTHON -c "from distutils.sysconfig import *; \ - from string import join; \ - print '-L' + get_python_lib(0,1);"` + # Before checking for libpythonX.Y, we need to know + # the extension the OS we're on uses for libraries: + ac_python_soext=`$PYTHON -c \ + "import distutils.sysconfig, string; \ + print string.join(filter(None, \ + distutils.sysconfig.get_config_vars('SO')))"` + + # Now, for the library: + ac_python_soname=`$PYTHON -c \ + "import distutils.sysconfig,string; \ + print string.join(filter(None, \ + distutils.sysconfig.get_config_vars('LDLIBRARY')))"` - # We could have a versioned library, or an unversioned one, - # even if the second case is discouraged. So, let's check for - # the versioned one first, and fallback on the second later. - LIBS="$ac_save_LIBS $PYTHON_LDFLAGS" - CPPFLAGS="$ac_save_CPPFLAGS $PYTHON_CPPFLAGS" + # Strip away extension from the end to canonicalize its name: + ac_python_library=`echo "$ac_python_soname" | sed "s/${ac_python_soext}$//"` + + # This small piece shamelessly adapted from PostgreSQL python macro; + # credits goes to momjian, I think. I'd like to put the right name + # in the credits, if someone can point me in the right direction... ? + # + if test -n "$ac_python_libdir" -a -n "$ac_python_library" \ + -a x"$ac_python_library" != x"$ac_python_soname" + then + # use the official shared library + ac_python_library=`echo "$ac_python_library" | sed "s/^lib//"` + PYTHON_LDFLAGS="-L$ac_python_libdir -l$ac_python_library" + else + # old way: use libpython from python_configdir + ac_python_libdir=`$PYTHON -c \ + "from distutils.sysconfig import get_python_lib as f; \ + import os; \ + print os.path.join(f(plat_specific=1,standard_lib=1),'config');"` + PYTHON_LDFLAGS="-L$ac_python_libdir -lpython$ac_python_version" + fi - AC_LANG_PUSH([C]) - AC_CHECK_LIB([python$py_version], [Py_Initialize], - [PYTHON_LDFLAGS="$PYTHON_LDFLAGS -lpython$py_version"], - AC_CHECK_LIB([python], [Py_Initialize], - [PYTHON_LDFLAGS="$PYTHON_LDFLAGS -lpython"], - [PYTHON_LDFLAGS=""]) - ) - AC_LANG_POP - - if test -z "$PYTHON_LDFLAGS"; then - AC_MSG_ERROR([ - Could not link test program to Python. Maybe the main Python library has been - installed in some non-standard library path. If so, pass it to configure, - via the LDFLAGS environment variable. - Example: ./configure LDFLAGS="-L/usr/non-standard-path/python/lib" - ]) - fi - - CPPFLAGS="$ac_save_CPPFLAGS" - LIBS="$ac_save_LIBS" - fi + if test -z "PYTHON_LDFLAGS"; then + AC_MSG_ERROR([ + Cannot determine location of your Python DSO. Please check it was installed with + dynamic libraries enabled, or try setting PYTHON_LDFLAGS by hand. + ]) + fi + fi AC_MSG_RESULT([$PYTHON_LDFLAGS]) AC_SUBST([PYTHON_LDFLAGS]) @@ -231,14 +248,16 @@ $ac_distutils_result]) AC_MSG_RESULT([$pythonexists]) - if test ! "$pythonexists" = "yes"; then + if test ! "$pythonexists" = "yes"; then AC_MSG_ERROR([ + Could not link test program to Python. Maybe the main Python library has been + installed in some non-standard library path. If so, pass it to configure, + via the LDFLAGS environment variable. + Example: ./configure LDFLAGS="-L/usr/non-standard-path/python/lib" ============================================================================ ERROR! You probably have to install the development version of the Python package for your distribution. The exact name of this package varies among them. - Take also a look to config.log. If everything looks all right, please - report the problem to the macro maintainer. ============================================================================ ]) PYTHON_VERSION="" diff --git a/plugins/xmlsave/configure.ac b/plugins/xmlsave/configure.ac index f79859a..8d723c5 100644 --- a/plugins/xmlsave/configure.ac +++ b/plugins/xmlsave/configure.ac @@ -25,15 +25,15 @@ 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. - ** Compiling here your sources is considered - ** as unpolite as exploring your nose with - ** your pinky whilst attending a wedding party. + ** 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 inform the mantainer of this error! - ** He'll thoroughfully bash his head on the wall.], - -1 ) + ** please inform the mantainer of this error! + ** He'll thoroughfully bash his head on the wall.], + -1 ) fi AC_GNU_SOURCE @@ -61,7 +61,6 @@ AC_CHECK_CXXFLAG([CXXFLAGS], [Wall]) AC_CHECK_CXXFLAG([CXXFLAGS], [pedantic]) AC_CHECK_CXXFLAG([CXXFLAGS], [Wextra]) AC_CHECK_CXXFLAG([CXXFLAGS], [Wno-long-long]) -AC_CHECK_CXXFLAG([CXXFLAGS], [fvisibility-inlines-hidden]) AC_CHECK_LDFLAG([LDFLAGS], [--as-needed]) dnl see if we've to enable debug flags @@ -77,6 +76,22 @@ else AC_CHECK_CXXFLAG([CXXFLAGS], [DNDEBUG]) fi + +dnl see if we have to enable visibility support +AC_ARG_ENABLE([visibility-support], + AS_HELP_STRING([--enable-visibility-support], + [enable the new GCC visibility support; requires GCC >= 4.0 to work.]), + [enable_gcc_visibility="$enableval"], + [enable_gcc_visibility="no"]) +AC_MSG_CHECKING([whether to use new GCC visibility attributes]) +if test "x$enable_gcc_visibility" = "xno"; then + CPPFLAGS="${CPPFLAGS} -DDISABLE_VISIBILITY_SUPPORT" +else + AC_CHECK_CXXFLAG([CXXFLAGS], [fvisibility-inlines-hidden]) +fi +AC_MSG_RESULT([$enable_gcc_visibility]) + + AC_PROG_INSTALL dnl make diff --git a/po/sgpemv2.pot b/po/sgpemv2.pot index f6a940b..72d2a2a 100644 --- a/po/sgpemv2.pot +++ b/po/sgpemv2.pot @@ -1,5 +1,5 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR University of Padova, dept. of Pure and Applied Mathematics +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # @@ -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-09-18 02:44+0200\n" +"POT-Creation-Date: 2008-02-19 11:33+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,489 +16,509 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: src/gui_builder.cc:176 src/gui_builder.cc:299 +#. open file dialog... +#: ../src/gui_builder.cc:176 ../src/gui_builder.cc:299 msgid "Please choose a file" msgstr "" -#: src/gui_builder.cc:196 src/gui_builder.cc:313 +#: ../src/gui_builder.cc:196 ../src/gui_builder.cc:313 msgid "Any files" msgstr "" -#: src/gui_builder.cc:208 src/gui_builder.cc:258 src/gui_builder.cc:332 +#: ../src/gui_builder.cc:208 ../src/gui_builder.cc:258 +#: ../src/gui_builder.cc:332 msgid "File: " msgstr "" -#: src/gui_builder.cc:208 +#: ../src/gui_builder.cc:208 msgid " loaded." msgstr "" -#: src/gui_builder.cc:215 src/gui_builder.cc:263 src/gui_builder.cc:339 +#: ../src/gui_builder.cc:215 ../src/gui_builder.cc:263 +#: ../src/gui_builder.cc:339 msgid "" "No serializer available.\n" "There's no registered serializer. Please check the loaded plugins." msgstr "" -#: src/gui_builder.cc:218 src/gui_builder.cc:266 src/gui_builder.cc:342 +#: ../src/gui_builder.cc:218 ../src/gui_builder.cc:266 +#: ../src/gui_builder.cc:342 msgid "ERROR: No registered serializer available" msgstr "" -#: src/gui_builder.cc:224 src/gui_builder.cc:272 src/gui_builder.cc:348 -#: src/text_simulation.cc:399 src/text_simulation.cc:405 -#: src/text_simulation.cc:424 src/text_simulation.cc:490 -#: src/text_simulation.cc:496 src/text_simulation.cc:515 -#: src/text_simulation.cc:863 src/text_simulation.cc:885 -#: src/text_simulation.cc:1601 src/text_simulation.cc:1638 +#: ../src/gui_builder.cc:224 ../src/gui_builder.cc:272 +#: ../src/gui_builder.cc:348 ../src/text_simulation.cc:399 +#: ../src/text_simulation.cc:405 ../src/text_simulation.cc:424 +#: ../src/text_simulation.cc:490 ../src/text_simulation.cc:496 +#: ../src/text_simulation.cc:515 ../src/text_simulation.cc:863 +#: ../src/text_simulation.cc:885 ../src/text_simulation.cc:1601 +#: ../src/text_simulation.cc:1638 msgid "ERROR: " msgstr "" -#: src/gui_builder.cc:258 src/gui_builder.cc:332 +#: ../src/gui_builder.cc:258 ../src/gui_builder.cc:332 msgid " saved." msgstr "" -#: src/gui_builder.cc:371 src/gui_builder.cc:399 +#: ../src/gui_builder.cc:371 ../src/gui_builder.cc:399 msgid "" "No CPU policy is currently selected.\n" "Please choose one before trying to configure it." msgstr "" -#: src/gui_builder.cc:377 src/gui_builder.cc:406 +#: ../src/gui_builder.cc:377 ../src/gui_builder.cc:406 msgid "Configuring CPU Policy " msgstr "" -#: src/gui_builder.cc:465 +#: ../src/gui_builder.cc:465 msgid "Selected CPU policy " msgstr "" -#: src/gui_builder.cc:473 +#: ../src/gui_builder.cc:473 msgid "Impossible to select this CPU Policy.\n" msgstr "" -#: src/gui_builder.cc:479 +#. If we got here, no policy is selected. +#: ../src/gui_builder.cc:479 msgid "No CPU policy selected. Please select one." msgstr "" -#: src/gui_builder.cc:527 +#: ../src/gui_builder.cc:527 msgid "Current resource policy deselected." msgstr "" -#: src/gui_builder.cc:529 +#: ../src/gui_builder.cc:529 msgid "Selected resource policy " msgstr "" -#: src/gui_builder.cc:553 +#: ../src/gui_builder.cc:553 msgid "" "Want to save?\n" "You'll lose your changes if you don't." msgstr "" -#: src/gui_builder.cc:744 +#. FIXME: to be written. +#. Debug line (erase me when done): +#: ../src/gui_builder.cc:744 msgid "Filename to open: " msgstr "" -#: src/parse_opts.cc:69 +#: ../src/parse_opts.cc:69 msgid "starts the program in command line mode" msgstr "" -#: src/parse_opts.cc:70 +#: ../src/parse_opts.cc:70 msgid "adds this directory to the default modules search path" msgstr "" -#: src/parse_opts.cc:71 +#: ../src/parse_opts.cc:71 msgid "adds this directory to default plugin search path" msgstr "" -#: src/parse_opts.cc:72 +#: ../src/parse_opts.cc:72 msgid "a list of savefiles; only the first will be opened" msgstr "" -#: src/parse_opts.cc:92 +#. Create context +#: ../src/parse_opts.cc:92 msgid "" "SGPEMv2, a graphical simulator for process scheduling in a multitasking " "computer" msgstr "" -#: src/parse_opts.cc:113 +#: ../src/parse_opts.cc:113 msgid "Error while loading preferences" msgstr "" -#: src/parse_opts.cc:143 +#: ../src/parse_opts.cc:143 msgid "" " [II] To see a list of commands available,\n" " [II] please type \"help\" and hit the ENTER key." msgstr "" -#: src/parse_opts.cc:167 +#: ../src/parse_opts.cc:168 msgid "Bad invocation: " msgstr "" -#: src/parse_opts.cc:168 +#: ../src/parse_opts.cc:169 msgid "Use the `-?' or `--help' option to see the help" msgstr "" -#: src/ready_queue_widget.cc:37 +#: ../src/ready_queue_widget.cc:37 msgid "Ready queue: { " msgstr "" -#: src/ready_queue_widget.cc:38 +#: ../src/ready_queue_widget.cc:38 msgid " } at instant " msgstr "" -#: src/simulation_controller.cc:194 src/jump_to_dialog.cc:106 +#. Show the user a dialog +#: ../src/simulation_controller.cc:194 ../src/jump_to_dialog.cc:106 msgid "The selected user CPU policy stopped before returning:\n" msgstr "" -#: src/simulation_controller.cc:201 src/jump_to_dialog.cc:113 +#. Show user a dialog +#: ../src/simulation_controller.cc:201 ../src/jump_to_dialog.cc:113 msgid "" "The selected user CPU policy was malformed and failed to sort the queue:\n" msgstr "" -#: src/simulation_controller.cc:213 src/jump_to_dialog.cc:125 +#. Fatal error. We should never get here. +#: ../src/simulation_controller.cc:213 ../src/jump_to_dialog.cc:125 msgid " [EE] Fatal error. Impossible to deactivate the policy in " msgstr "" -#: src/simulation_controller.cc:214 src/jump_to_dialog.cc:126 +#: ../src/simulation_controller.cc:214 ../src/jump_to_dialog.cc:126 msgid " [EE] " msgstr "" -#: src/simulation_controller.cc:221 src/jump_to_dialog.cc:132 +#: ../src/simulation_controller.cc:221 ../src/jump_to_dialog.cc:132 msgid "No active policy selected:\n" msgstr "" -#: src/simulation_controller.cc:228 src/jump_to_dialog.cc:139 +#: ../src/simulation_controller.cc:228 ../src/jump_to_dialog.cc:139 msgid "Unexpected error:\n" msgstr "" -#: src/add_request_dialog.cc:95 +#: ../src/add_request_dialog.cc:95 msgid "key" msgstr "" -#: src/add_request_dialog.cc:96 +#: ../src/add_request_dialog.cc:96 msgid "resource" msgstr "" -#: src/add_request_dialog.cc:97 src/text_simulation.cc:1329 +#: ../src/add_request_dialog.cc:97 ../src/text_simulation.cc:1329 msgid "duration" msgstr "" -#: src/graphical_preferences_editor.cc:305 -#: src/graphical_preferences_editor.cc:355 +#: ../src/graphical_preferences_editor.cc:305 +#: ../src/graphical_preferences_editor.cc:355 msgid "Select a directory to add" msgstr "" -#: src/backend/global_preferences.cc:90 +#: ../src/backend/global_preferences.cc:90 msgid "Unable to obtain Application Data directory" msgstr "" -#: src/backend/concrete_history.cc:402 +#: ../src/backend/concrete_history.cc:402 msgid "History::add_thread() : Parent process not part of this History" msgstr "" -#: src/backend/concrete_history.cc:438 +#: ../src/backend/concrete_history.cc:438 msgid "History::add_request() : Parent process not part of this History" msgstr "" -#: src/backend/concrete_history.cc:440 +#: ../src/backend/concrete_history.cc:440 msgid "History::add_request() : Parent thread not part of this History" msgstr "" -#: src/backend/concrete_history.cc:473 +#: ../src/backend/concrete_history.cc:473 msgid "History::add_subrequest() : Parent process not part of this History" msgstr "" -#: src/backend/concrete_history.cc:475 +#: ../src/backend/concrete_history.cc:475 msgid "History::add_subrequest() : Parent thread not part of this History" msgstr "" -#: src/backend/concrete_history.cc:477 +#: ../src/backend/concrete_history.cc:477 msgid "History::add_subrequest() : Parent request not part of this History" msgstr "" -#: src/backend/concrete_simulation.cc:235 +#: ../src/backend/concrete_simulation.cc:235 msgid "unable to change policy and to restore the previous: " msgstr "" -#: src/backend/concrete_simulation.cc:241 +#: ../src/backend/concrete_simulation.cc:241 msgid "unable to change policy: " msgstr "" -#: src/backend/resource_policies_gatekeeper.cc:88 +#: ../src/backend/resource_policies_gatekeeper.cc:88 msgid "No active policy associated with this history is available." msgstr "" -#: src/backend/string_utils.cc:62 src/backend/string_utils.cc:102 +#: ../src/backend/string_utils.cc:62 ../src/backend/string_utils.cc:102 msgid "too few or too many tokens" msgstr "" -#: src/backend/string_utils.cc:85 +#: ../src/backend/string_utils.cc:85 msgid "incorrect number format" msgstr "" -#: src/backend/string_utils.cc:125 +#: ../src/backend/string_utils.cc:125 msgid "incorrect boolean" msgstr "" -#: src/backend/resource_policy_lifo.cc:78 +#: ../src/backend/resource_policy_lifo.cc:78 msgid "" "A resource policy which allows a request to be immediately allocated if " "there is enough space." msgstr "" -#: src/backend/resource_policy_lifo.cc:84 +#: ../src/backend/resource_policy_lifo.cc:84 msgid "Last In, First Out" msgstr "" -#: src/schedulables_tree_widget.cc:65 +#: ../src/schedulables_tree_widget.cc:65 msgid "Arrival" msgstr "" -#: src/schedulables_tree_widget.cc:69 +#: ../src/schedulables_tree_widget.cc:69 msgid "Entity" msgstr "" -#: src/schedulables_tree_widget.cc:73 +#: ../src/schedulables_tree_widget.cc:73 msgid "State" msgstr "" -#: src/schedulables_tree_widget.cc:178 +#: ../src/schedulables_tree_widget.cc:178 msgid "Add Process" msgstr "" -#: src/schedulables_tree_widget.cc:181 +#: ../src/schedulables_tree_widget.cc:181 msgid "Add Thread" msgstr "" -#: src/schedulables_tree_widget.cc:184 +#: ../src/schedulables_tree_widget.cc:184 msgid "Add Request" msgstr "" -#: src/schedulables_tree_widget.cc:187 +#: ../src/schedulables_tree_widget.cc:187 msgid "Edit Process" msgstr "" -#: src/schedulables_tree_widget.cc:190 +#: ../src/schedulables_tree_widget.cc:190 msgid "Edit Thread" msgstr "" -#: src/schedulables_tree_widget.cc:193 +#: ../src/schedulables_tree_widget.cc:193 msgid "Edit Request" msgstr "" -#: src/schedulables_tree_widget.cc:196 +#: ../src/schedulables_tree_widget.cc:196 msgid "Remove Process" msgstr "" -#: src/schedulables_tree_widget.cc:199 +#: ../src/schedulables_tree_widget.cc:199 msgid "Remove Thread" msgstr "" -#: src/schedulables_tree_widget.cc:202 +#: ../src/schedulables_tree_widget.cc:202 msgid "Remove Request" msgstr "" -#: src/schedulables_tree_widget.cc:615 +#: ../src/schedulables_tree_widget.cc:397 +msgid "Main" +msgstr "" + +#: ../src/schedulables_tree_widget.cc:597 msgid "ERROR" msgstr "" -#: src/schedulables_tree_widget.cc:646 +#: ../src/schedulables_tree_widget.cc:628 msgid "ERROR" msgstr "" -#: src/schedulables_tree_widget.cc:664 +#: ../src/schedulables_tree_widget.cc:646 msgid " (" msgstr "" -#: src/schedulables_tree_widget.cc:665 +#: ../src/schedulables_tree_widget.cc:647 msgid "/" msgstr "" -#: src/schedulables_tree_widget.cc:666 +#: ../src/schedulables_tree_widget.cc:648 msgid ", current priority: " msgstr "" -#: src/schedulables_tree_widget.cc:681 +#: ../src/schedulables_tree_widget.cc:663 msgid "request:" msgstr "" -#: src/schedulables_tree_widget.cc:740 +#: ../src/schedulables_tree_widget.cc:722 msgid "RUNNING" msgstr "" -#: src/schedulables_tree_widget.cc:743 src/text_simulation.cc:1726 +#: ../src/schedulables_tree_widget.cc:725 ../src/text_simulation.cc:1726 msgid "READY" msgstr "" -#: src/schedulables_tree_widget.cc:746 src/text_simulation.cc:1729 +#: ../src/schedulables_tree_widget.cc:728 ../src/text_simulation.cc:1729 msgid "BLOCKED" msgstr "" -#: src/schedulables_tree_widget.cc:749 src/schedulables_tree_widget.cc:778 -#: src/text_simulation.cc:1732 src/text_simulation.cc:1756 +#: ../src/schedulables_tree_widget.cc:731 +#: ../src/schedulables_tree_widget.cc:760 ../src/text_simulation.cc:1732 +#: ../src/text_simulation.cc:1756 msgid "FUTURE" msgstr "" -#: src/schedulables_tree_widget.cc:752 src/text_simulation.cc:1735 +#: ../src/schedulables_tree_widget.cc:734 ../src/text_simulation.cc:1735 msgid "TERMINATED" msgstr "" -#: src/schedulables_tree_widget.cc:755 src/schedulables_tree_widget.cc:784 +#: ../src/schedulables_tree_widget.cc:737 +#: ../src/schedulables_tree_widget.cc:766 msgid "@@@ ERROR @@@" msgstr "" -#: src/schedulables_tree_widget.cc:769 src/text_simulation.cc:1753 +#: ../src/schedulables_tree_widget.cc:751 ../src/text_simulation.cc:1753 msgid "ALLOCATED" msgstr "" -#: src/schedulables_tree_widget.cc:772 src/text_simulation.cc:1762 +#: ../src/schedulables_tree_widget.cc:754 ../src/text_simulation.cc:1762 msgid "ALLOCABLE" msgstr "" -#: src/schedulables_tree_widget.cc:775 src/text_simulation.cc:1750 +#: ../src/schedulables_tree_widget.cc:757 ../src/text_simulation.cc:1750 msgid "UNALLOCABLE" msgstr "" -#: src/schedulables_tree_widget.cc:781 src/text_simulation.cc:1759 +#: ../src/schedulables_tree_widget.cc:763 ../src/text_simulation.cc:1759 msgid "EXHAUSTED" msgstr "" -#: src/simulation_widget.cc:140 +#: ../src/simulation_widget.cc:140 msgid "" "Nothing to see here... add some processes! Right-click on the Schedulables " "view in this window." msgstr "" -#: src/holt_container_window.cc:39 +#. This just sets the title of our new window. +#: ../src/holt_container_window.cc:39 msgid "Holt Graph" msgstr "" -#: src/text_simulation.cc:129 +#: ../src/text_simulation.cc:129 msgid "ERROR: this command requires at least " msgstr "" -#: src/text_simulation.cc:129 +#: ../src/text_simulation.cc:129 msgid " arguments\n" msgstr "" -#: src/text_simulation.cc:135 +#: ../src/text_simulation.cc:135 msgid "WARNING: some arguments will be ignored\n" msgstr "" -#: src/text_simulation.cc:145 +#: ../src/text_simulation.cc:145 msgid "" "WARNING: Simulation was not recently saved. If you continue some changes to " "the simulation might be lost.\n" msgstr "" -#: src/text_simulation.cc:151 +#: ../src/text_simulation.cc:151 msgid "Continue? [y/n] " msgstr "" -#: src/text_simulation.cc:159 +#: ../src/text_simulation.cc:159 msgid "n" msgstr "" -#: src/text_simulation.cc:161 +#: ../src/text_simulation.cc:161 msgid "y" msgstr "" -#: src/text_simulation.cc:261 +#: ../src/text_simulation.cc:261 msgid "ERROR: Provided value is out of range\n" msgstr "" -#: src/text_simulation.cc:267 +#: ../src/text_simulation.cc:267 msgid "ERROR: Please provide a valid numeric value\n" msgstr "" -#: src/text_simulation.cc:276 +#: ../src/text_simulation.cc:276 msgid "ERROR: This is a mandatory attribute; you MUST provide a valid value!\n" msgstr "" -#: src/text_simulation.cc:311 src/text_simulation.cc:360 +#: ../src/text_simulation.cc:311 ../src/text_simulation.cc:360 msgid "ERROR: This is a mandatory atribute; you MUST provide a valid value!\n" msgstr "" -#: src/text_simulation.cc:353 +#: ../src/text_simulation.cc:353 msgid "ERROR: Please provide a valid boolean value ('true' or 'false')\n" msgstr "" -#: src/text_simulation.cc:401 src/text_simulation.cc:426 -#: src/text_simulation.cc:492 src/text_simulation.cc:517 +#: ../src/text_simulation.cc:401 ../src/text_simulation.cc:426 +#: ../src/text_simulation.cc:492 ../src/text_simulation.cc:517 msgid "" "\n" "Simulation is now stopped\n" msgstr "" -#: src/text_simulation.cc:407 src/text_simulation.cc:498 +#: ../src/text_simulation.cc:407 ../src/text_simulation.cc:498 msgid "" "\n" "Simulation is now stopped, and the current policy will be deactivated\n" msgstr "" -#: src/text_simulation.cc:417 src/text_simulation.cc:508 +#. should never happen +#: ../src/text_simulation.cc:417 ../src/text_simulation.cc:508 msgid "FATAL ERROR: unable to deactivate the policy: " msgstr "" -#: src/text_simulation.cc:430 src/text_simulation.cc:521 +#: ../src/text_simulation.cc:430 ../src/text_simulation.cc:521 msgid "UNKNOWN ERROR: " msgstr "" -#: src/text_simulation.cc:465 +#: ../src/text_simulation.cc:465 msgid "ERROR: provided instant is out of range.\n" msgstr "" -#: src/text_simulation.cc:473 +#: ../src/text_simulation.cc:473 msgid "ERROR: provided instant is not a valid integer\n" msgstr "" -#: src/text_simulation.cc:478 +#: ../src/text_simulation.cc:478 msgid "ERROR: the instant is not within range.\n" msgstr "" -#: src/text_simulation.cc:556 +#: ../src/text_simulation.cc:556 msgid "Please provide a value for each attribute:\n" msgstr "" -#: src/text_simulation.cc:557 +#: ../src/text_simulation.cc:557 msgid "" "Mandatory arguments are marked with an asterisk (*)\n" "\n" msgstr "" -#: src/text_simulation.cc:560 +#: ../src/text_simulation.cc:560 msgid "Nothing to configure for this policy.\n" msgstr "" -#: src/text_simulation.cc:563 +#: ../src/text_simulation.cc:563 msgid "Integer arguments:\n" msgstr "" -#: src/text_simulation.cc:583 +#: ../src/text_simulation.cc:583 msgid "" "\n" "Floating-point arguments:\n" msgstr "" -#: src/text_simulation.cc:599 +#: ../src/text_simulation.cc:599 msgid "" "\n" "String arguments:\n" msgstr "" -#: src/text_simulation.cc:629 +#: ../src/text_simulation.cc:629 msgid "ERROR: No CPU policy actually selected for the simulation\n" msgstr "" -#: src/text_simulation.cc:638 +#: ../src/text_simulation.cc:638 msgid "ERROR: No resource policy actually selected for the simulation\n" msgstr "" -#: src/text_simulation.cc:643 +#: ../src/text_simulation.cc:643 msgid "ERROR: Nothing to configure for " msgstr "" -#: src/text_simulation.cc:659 +#: ../src/text_simulation.cc:659 msgid "" -"Avaiable commands:\n" +"Available commands:\n" "RUN\n" "STOP\n" "PAUSE\n" @@ -517,7 +537,7 @@ msgid "" "ex. `HELP RUN` shows help about the command RUN\n" msgstr "" -#: src/text_simulation.cc:665 +#: ../src/text_simulation.cc:665 msgid "" "-- RUN COMMAND --\n" "Starts the simulation. It can be continuous or step-by-step depending on the " @@ -529,26 +549,26 @@ msgid "" "running. The scheduler activity begins at instant 1.\n" msgstr "" -#: src/text_simulation.cc:674 +#: ../src/text_simulation.cc:674 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:677 +#: ../src/text_simulation.cc:677 msgid "" "-- PAUSE COMMAND --\n" "Pauses the simulation. The next call to RUN will continue it.\n" msgstr "" -#: src/text_simulation.cc:680 +#: ../src/text_simulation.cc:680 msgid "" "-- JUMPTO COMMAND --\n" "Pauses the simulation and jumps to the specified instant.\n" msgstr "" -#: src/text_simulation.cc:682 +#: ../src/text_simulation.cc:682 msgid "" "-- CONFIGURE COMMAND --\n" "Configures a configurable entity.\n" @@ -559,20 +579,20 @@ msgid "" "modifying their source code.\n" msgstr "" -#: src/text_simulation.cc:688 +#: ../src/text_simulation.cc:688 msgid "" "-- HELP COMMAND --\n" "The help you're reading.\n" msgstr "" -#: src/text_simulation.cc:690 +#: ../src/text_simulation.cc:690 msgid "" "-- GET COMMAND --\n" "Syntax: GET \n" "\twhere may be simulation-tick or continuous.\n" msgstr "" -#: src/text_simulation.cc:693 +#: ../src/text_simulation.cc:693 msgid "" "-- SET COMMAND --\n" "Syntax: SET [=] \n" @@ -580,7 +600,7 @@ msgid "" "resource-policy.\n" msgstr "" -#: src/text_simulation.cc:696 +#: ../src/text_simulation.cc:696 msgid "" "-- SHOW COMMAND --\n" "Displays the name of the entities (if available) and other informations " @@ -597,7 +617,7 @@ msgid "" "`SHOW statistics`\n" msgstr "" -#: src/text_simulation.cc:708 +#: ../src/text_simulation.cc:708 msgid "" "-- ADD COMMAND --\n" "Adds an entity by using a questionary-like approach.\n" @@ -612,7 +632,7 @@ msgid "" "follow the same logic of the previous commands\n" msgstr "" -#: src/text_simulation.cc:718 +#: ../src/text_simulation.cc:718 msgid "" "-- REMOVE COMMAND --\n" "Removes an entity.\n" @@ -629,7 +649,7 @@ msgid "" "where the numeric ids follow the same logic of the previous commands\n" msgstr "" -#: src/text_simulation.cc:728 +#: ../src/text_simulation.cc:728 msgid "" "-- SAVE COMMAND --\n" "Saves the simulation.\n" @@ -637,7 +657,7 @@ msgid "" "Syntax: SAVE \n" msgstr "" -#: src/text_simulation.cc:731 +#: ../src/text_simulation.cc:731 msgid "" "-- LOAD COMMAND --\n" "Loads the simulation.\n" @@ -645,218 +665,221 @@ msgid "" "Syntax: LOAD \n" msgstr "" -#: src/text_simulation.cc:734 +#: ../src/text_simulation.cc:734 msgid "" "-- QUIT COMMAND --\n" "Gently closes the program.\n" msgstr "" -#: src/text_simulation.cc:736 +#: ../src/text_simulation.cc:736 msgid "ERROR: Sorry, no help available for this command.\n" msgstr "" -#: src/text_simulation.cc:748 +#: ../src/text_simulation.cc:748 msgid "" "\n" "Bye.\n" "\n" msgstr "" -#: src/text_simulation.cc:775 src/text_simulation.cc:905 +#: ../src/text_simulation.cc:775 ../src/text_simulation.cc:905 msgid "ERROR: invalid attribute name.\n" msgstr "" -#: src/text_simulation.cc:843 +#: ../src/text_simulation.cc:843 msgid "ERROR: you must provide a valid unsigned integer value\n" msgstr "" -#: src/text_simulation.cc:855 +#: ../src/text_simulation.cc:855 msgid " scheduling policy selected.\n" msgstr "" -#: src/text_simulation.cc:859 +#: ../src/text_simulation.cc:859 msgid "" "ERROR: invalid unsigned integer or not a valid scheduling policy index\n" msgstr "" -#: src/text_simulation.cc:877 +#: ../src/text_simulation.cc:877 msgid " resource policy selected.\n" msgstr "" -#: src/text_simulation.cc:881 +#: ../src/text_simulation.cc:881 msgid "ERROR: invalid unsigned integer or not a valid resource policy index\n" msgstr "" -#: src/text_simulation.cc:901 +#: ../src/text_simulation.cc:901 msgid "ERROR: you must provide a valid boolean value ('true' or 'false')\n" msgstr "" -#: src/text_simulation.cc:937 src/text_simulation.cc:1166 -#: src/text_simulation.cc:1378 +#: ../src/text_simulation.cc:937 ../src/text_simulation.cc:1166 +#: ../src/text_simulation.cc:1378 msgid "ERROR: invalid argument\n" msgstr "" -#: src/text_simulation.cc:984 +#: ../src/text_simulation.cc:984 msgid "ERROR: provided process identifier is not a valid integer\n" msgstr "" -#: src/text_simulation.cc:989 +#: ../src/text_simulation.cc:989 msgid "ERROR: this process identifier does not belong to an existing process\n" msgstr "" -#: src/text_simulation.cc:1020 src/text_simulation.cc:1058 -#: src/text_simulation.cc:1224 src/text_simulation.cc:1273 -#: src/text_simulation.cc:1319 src/text_simulation.cc:1402 -#: src/text_simulation.cc:1439 src/text_simulation.cc:1475 -#: src/text_simulation.cc:1515 src/text_simulation.cc:1558 +#: ../src/text_simulation.cc:1020 ../src/text_simulation.cc:1058 +#: ../src/text_simulation.cc:1224 ../src/text_simulation.cc:1273 +#: ../src/text_simulation.cc:1319 ../src/text_simulation.cc:1402 +#: ../src/text_simulation.cc:1439 ../src/text_simulation.cc:1475 +#: ../src/text_simulation.cc:1515 ../src/text_simulation.cc:1558 msgid "ERROR: provided identifier(s) not a valid integer\n" msgstr "" -#: src/text_simulation.cc:1025 src/text_simulation.cc:1063 -#: src/text_simulation.cc:1229 src/text_simulation.cc:1278 -#: src/text_simulation.cc:1324 src/text_simulation.cc:1407 -#: src/text_simulation.cc:1444 src/text_simulation.cc:1480 -#: src/text_simulation.cc:1520 src/text_simulation.cc:1563 +#: ../src/text_simulation.cc:1025 ../src/text_simulation.cc:1063 +#: ../src/text_simulation.cc:1229 ../src/text_simulation.cc:1278 +#: ../src/text_simulation.cc:1324 ../src/text_simulation.cc:1407 +#: ../src/text_simulation.cc:1444 ../src/text_simulation.cc:1480 +#: ../src/text_simulation.cc:1520 ../src/text_simulation.cc:1563 msgid "ERROR: the identifier(s) do not belong to an existing entity\n" msgstr "" -#: src/text_simulation.cc:1146 +#: ../src/text_simulation.cc:1146 msgid "WARNING: Simulation is not stopped, it will be automatically stopped\n" msgstr "" -#: src/text_simulation.cc:1176 src/text_simulation.cc:1194 -#: src/text_simulation.cc:1233 +#: ../src/text_simulation.cc:1176 ../src/text_simulation.cc:1194 +#: ../src/text_simulation.cc:1233 msgid "name" msgstr "" -#: src/text_simulation.cc:1177 src/text_simulation.cc:1235 +#: ../src/text_simulation.cc:1177 ../src/text_simulation.cc:1235 msgid "arrival time" msgstr "" -#: src/text_simulation.cc:1178 src/text_simulation.cc:1859 +#: ../src/text_simulation.cc:1178 ../src/text_simulation.cc:1859 msgid "priority" msgstr "" -#: src/text_simulation.cc:1195 +#: ../src/text_simulation.cc:1195 msgid "places" msgstr "" -#: src/text_simulation.cc:1234 +#: ../src/text_simulation.cc:1234 msgid "cpu time" msgstr "" -#: src/text_simulation.cc:1236 +#: ../src/text_simulation.cc:1236 msgid "base priority" msgstr "" -#: src/text_simulation.cc:1282 +#: ../src/text_simulation.cc:1282 msgid "instant" msgstr "" -#: src/text_simulation.cc:1328 +#: ../src/text_simulation.cc:1328 msgid "resource key" msgstr "" -#: src/text_simulation.cc:1338 +#: ../src/text_simulation.cc:1338 msgid "ERROR: invalid resource identifier\n" msgstr "" -#: src/text_simulation.cc:1360 +#: ../src/text_simulation.cc:1360 msgid "WARNING: Simulation is not stopped, it will be automatically stopped" msgstr "" -#: src/text_simulation.cc:1435 +#: ../src/text_simulation.cc:1435 msgid "invalid resource id" msgstr "" -#: src/text_simulation.cc:1597 src/text_simulation.cc:1634 +#: ../src/text_simulation.cc:1597 ../src/text_simulation.cc:1634 msgid "ERROR: No registered serializer available\n" msgstr "" -#: src/text_simulation.cc:1705 +#: ../src/text_simulation.cc:1705 msgid "ERROR: command not supported\n" msgstr "" -#: src/text_simulation.cc:1723 +#: ../src/text_simulation.cc:1723 msgid ">> RUNNING <<" msgstr "" -#: src/text_simulation.cc:1784 +#. Print ready queue +#: ../src/text_simulation.cc:1784 msgid "READY QUEUE: { " msgstr "" -#: src/text_simulation.cc:1792 +#: ../src/text_simulation.cc:1792 msgid " ~ " msgstr "" -#: src/text_simulation.cc:1795 +#: ../src/text_simulation.cc:1795 msgid "}" msgstr "" -#: src/text_simulation.cc:1806 +#. Write the queue of requests for each resource +#: ../src/text_simulation.cc:1806 msgid "RESOURCES:" msgstr "" -#: src/text_simulation.cc:1812 +#: ../src/text_simulation.cc:1812 msgid ", with " msgstr "" -#: src/text_simulation.cc:1813 +#: ../src/text_simulation.cc:1813 msgid " places" msgstr "" -#: src/text_simulation.cc:1818 +#: ../src/text_simulation.cc:1818 msgid "queue: { " msgstr "" -#: src/text_simulation.cc:1834 +#: ../src/text_simulation.cc:1834 msgid " }" msgstr "" -#: src/text_simulation.cc:1853 +#: ../src/text_simulation.cc:1853 msgid "PROCESSES:" msgstr "" -#: src/text_simulation.cc:1855 +#: ../src/text_simulation.cc:1855 msgid "state" msgstr "" -#: src/text_simulation.cc:1856 +#: ../src/text_simulation.cc:1856 msgid "arrival" msgstr "" -#: src/text_simulation.cc:1857 +#: ../src/text_simulation.cc:1857 msgid "requiring" msgstr "" -#: src/text_simulation.cc:1858 +#: ../src/text_simulation.cc:1858 msgid "elapsed" msgstr "" -#: src/text_simulation.cc:1860 +#: ../src/text_simulation.cc:1860 msgid "resource_id" msgstr "" -#: src/resources_widget.cc:66 +#: ../src/resources_widget.cc:66 msgid "resources" msgstr "" -#: src/configure_policy_dialog.cc:61 +#. Insert policy description +#: ../src/configure_policy_dialog.cc:61 msgid "Policy description" msgstr "" -#: src/configure_policy_dialog.cc:74 +#: ../src/configure_policy_dialog.cc:74 msgid "Integer values" msgstr "" -#: src/configure_policy_dialog.cc:92 +#: ../src/configure_policy_dialog.cc:92 msgid "Floating point values" msgstr "" -#: src/configure_policy_dialog.cc:109 +#: ../src/configure_policy_dialog.cc:109 msgid "Alphanumerical values" msgstr "" -#: src/configure_policy_dialog.cc:124 +#: ../src/configure_policy_dialog.cc:124 msgid "No options to configure for this policy" msgstr "" diff --git a/src/backend/scheduler.cc b/src/backend/scheduler.cc index f27d53c..a9fe215 100644 --- a/src/backend/scheduler.cc +++ b/src/backend/scheduler.cc @@ -1,4 +1,4 @@ -// src/backend/scheduler.cc - Copyright 2005, 2006, University +// src/backend/scheduler.cc - Copyright 2005-2007 University // of Padova, dept. of Pure and Applied // Mathematics // diff --git a/src/parse_opts.cc b/src/parse_opts.cc index 424376c..9ef35d0 100644 --- a/src/parse_opts.cc +++ b/src/parse_opts.cc @@ -1,4 +1,4 @@ -// src/parseopts.cc - Copyright 2005, 2006, University +// src/parseopts.cc - Copyright 2005-2007, University // of Padova, dept. of Pure and Applied // Mathematics // @@ -98,14 +98,14 @@ parse_options(int argc, char** argv) try { - // Parse options, initialising the Gtk::Main at the same time + // Parse options, initialising the Gtk at the same time + gboolean gui_initializable = gtk_init_check(&argc, &argv); context.parse(argc, argv); GlobalPreferences& prefs = GlobalPreferences::get_instance(); try { prefs.load_configrc(); - } catch (std::exception e) { @@ -131,7 +131,7 @@ parse_options(int argc, char** argv) vector managers = CPUPoliciesGatekeeper::get_instance().get_registered(); - if (no_gui_enabled) + if (no_gui_enabled || !gui_initializable) { // We don't return to main, instead we // initialize the command line version @@ -154,10 +154,11 @@ parse_options(int argc, char** argv) } else { + Gtk::Main main(argc, argv); GuiBuilder* gui = new GuiBuilder(); if (fnames.begin() != fnames.end()) gui->open_file(*fnames.begin()); - Gtk::Main::run(gui->get_initial_window()); + main.run(gui->get_initial_window()); delete gui; } diff --git a/src/schedulables_tree_widget.cc b/src/schedulables_tree_widget.cc index 5caad1e..a6a0c29 100644 --- a/src/schedulables_tree_widget.cc +++ b/src/schedulables_tree_widget.cc @@ -1,4 +1,4 @@ -// src/schedulables_tree_widget.cc - Copyright 2005, 2006, University +// src/schedulables_tree_widget.cc - Copyright 2005-2007, University // of Padova, dept. of Pure and Applied // Mathematics // diff --git a/src/text_simulation.cc b/src/text_simulation.cc index 71ad883..b684ea0 100644 --- a/src/text_simulation.cc +++ b/src/text_simulation.cc @@ -1,4 +1,4 @@ -// src/text_simulation.cc - Copyright 2005, 2006, University +// src/text_simulation.cc - Copyright 2005-2007, University // of Padova, dept. of Pure and Applied // Mathematics //