Raymond Toy pushed to branch master at cmucl / cmucl

Commits:

5 changed files:

Changes:

  • src/code/os.lisp
    ... ... @@ -15,7 +15,7 @@
    15 15
     
    
    16 16
     (in-package "SYSTEM")
    
    17 17
     (use-package "EXTENSIONS")
    
    18
    -(intl:textdomain "cmucl-linux-os")
    
    18
    +(intl:textdomain "cmucl-os")
    
    19 19
     
    
    20 20
     (export '(get-page-size))
    
    21 21
     
    
    ... ... @@ -33,3 +33,27 @@
    33 33
         maybe-page-size))
    
    34 34
     
    
    35 35
     
    
    36
    +;;; GET-SYSTEM-INFO  --  Interface
    
    37
    +;;;
    
    38
    +;;;    Return system time, user time (in usec) and number of page
    
    39
    +;;;    faults.
    
    40
    +;;;
    
    41
    +(defun get-system-info ()
    
    42
    +  _N"Get system information consisting of the user time (in usec), the
    
    43
    +  system time (in usec) and the number of major page faults."
    
    44
    +  (alien:with-alien ((utime unix:int64-t 0)
    
    45
    +		     (stime unix:int64-t 0)
    
    46
    +		     (major-fault c-call:long 0))
    
    47
    +    (let ((rc (alien:alien-funcall
    
    48
    +	       (alien:extern-alien "os_get_system_info"
    
    49
    +				   (function c-call:int
    
    50
    +					     (* unix:int64-t)
    
    51
    +					     (* unix:int64-t)
    
    52
    +					     (* c-call:long)))
    
    53
    +	       (alien:addr utime)
    
    54
    +	       (alien:addr stime)
    
    55
    +	       (alien:addr major-fault))))
    
    56
    +      (when (minusp rc)
    
    57
    +	(error (intl:gettext "Unix system call getrusage failed: ~A.")
    
    58
    +	       (unix:get-unix-error-msg utime)))
    
    59
    +      (values utime stime major-fault))))

  • src/code/unix.lisp
    ... ... @@ -2921,28 +2921,3 @@
    2921 2921
     	    (extern-alien "os_get_locale_codeset"
    
    2922 2922
     			  (function (* char))))
    
    2923 2923
     	c-string))
    2924
    -
    
    2925
    -;;; GET-SYSTEM-INFO  --  Interface
    
    2926
    -;;;
    
    2927
    -;;;    Return system time, user time (in usec) and number of page
    
    2928
    -;;;    faults.
    
    2929
    -;;;
    
    2930
    -(defun get-system-info ()
    
    2931
    -  "Get system information consisting of the user time (in usec), the
    
    2932
    -  system time (in usec) and the number of major page faults."
    
    2933
    -  (with-alien ((utime int64-t 0)
    
    2934
    -	       (stime int64-t 0)
    
    2935
    -	       (major-fault c-call:long 0))
    
    2936
    -    (let ((rc (alien-funcall
    
    2937
    -	       (extern-alien "os_get_system_info"
    
    2938
    -			     (function c-call:int
    
    2939
    -				       (* int64-t)
    
    2940
    -				       (* int64-t)
    
    2941
    -				       (* c-call:long)))
    
    2942
    -	       (addr utime)
    
    2943
    -	       (addr stime)
    
    2944
    -	       (addr major-fault))))
    
    2945
    -      (when (minusp rc)
    
    2946
    -	(error (intl:gettext "Unix system call getrusage failed: ~A.")
    
    2947
    -	       (unix:get-unix-error-msg utime)))
    
    2948
    -      (values utime stime major-fault))))

  • src/i18n/locale/cmucl-linux-os.pot
    ... ... @@ -19,14 +19,6 @@ msgstr ""
    19 19
     msgid "Getpagesize failed: ~A"
    
    20 20
     msgstr ""
    
    21 21
     
    
    22
    -#: src/code/os.lisp
    
    23
    -msgid "Return the system page size"
    
    24
    -msgstr ""
    
    25
    -
    
    26
    -#: src/code/os.lisp
    
    27
    -msgid "get-page-size failed: ~A"
    
    28
    -msgstr ""
    
    29
    -
    
    30 22
     #: src/code/signal.lisp
    
    31 23
     msgid "Stack fault on coprocessor"
    
    32 24
     msgstr ""
    

  • src/i18n/locale/cmucl-os.pot
    1
    +#@ cmucl-os
    
    2
    +
    
    3
    +# SOME DESCRIPTIVE TITLE
    
    4
    +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR
    
    5
    +#
    
    6
    +#, fuzzy
    
    7
    +msgid ""
    
    8
    +msgstr ""
    
    9
    +"Project-Id-Version: PACKAGE VERSION\n"
    
    10
    +"Report-Msgid-Bugs-To: \n"
    
    11
    +"PO-Revision-Date: YEAR-MO-DA HO:MI +ZONE\n"
    
    12
    +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
    
    13
    +"Language-Team: LANGUAGE <LL@li.org>\n"
    
    14
    +"MIME-Version: 1.0\n"
    
    15
    +"Content-Type: text/plain; charset=UTF-8\n"
    
    16
    +"Content-Transfer-Encoding: 8bit\n"
    
    17
    +
    
    18
    +#: src/code/os.lisp
    
    19
    +msgid "Return the system page size"
    
    20
    +msgstr ""
    
    21
    +
    
    22
    +#: src/code/os.lisp
    
    23
    +msgid "get-page-size failed: ~A"
    
    24
    +msgstr ""
    
    25
    +
    
    26
    +#: src/code/os.lisp
    
    27
    +msgid ""
    
    28
    +"Get system information consisting of the user time (in usec), the\n"
    
    29
    +"  system time (in usec) and the number of major page faults."
    
    30
    +msgstr ""
    
    31
    +
    
    32
    +#: src/code/os.lisp
    
    33
    +msgid "Unix system call getrusage failed: ~A."
    
    34
    +msgstr ""
    
    35
    +

  • src/i18n/locale/cmucl-unix.pot
    ... ... @@ -1444,13 +1444,3 @@ msgstr ""
    1444 1444
     msgid "Get the codeset from the locale"
    
    1445 1445
     msgstr ""
    
    1446 1446
     
    1447
    -#: src/code/unix.lisp
    
    1448
    -msgid ""
    
    1449
    -"Get system information consisting of the user time (in usec), the\n"
    
    1450
    -"  system time (in usec) and the number of major page faults."
    
    1451
    -msgstr ""
    
    1452
    -
    
    1453
    -#: src/code/unix.lisp
    
    1454
    -msgid "Unix system call getrusage failed: ~A."
    
    1455
    -msgstr ""
    
    1456
    -