Skip to content

Commit 508b721

Browse files
committed
gh-1610 fio.rst: fiber.ipc -> fiber.cond() or fiber.channel()
1 parent 16167a6 commit 508b721

File tree

3 files changed

+13
-12
lines changed
  • doc/reference/reference_lua
  • locale
    • reference/reference_lua
    • ru/LC_MESSAGES/reference/reference_lua

3 files changed

+13
-12
lines changed

doc/reference/reference_lua/fio.rst

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -926,7 +926,7 @@ functions.
926926

927927
.. code-block:: tarantoolsession
928928
929-
ibuf = require('buffer').ibuf()
929+
tarantool> ibuf = require('buffer').ibuf()
930930
---
931931
...
932932
@@ -948,7 +948,8 @@ functions.
948948
``fh:read`` and ``fh:write`` affect the seek position within the
949949
file, and this must be taken into account when working on the same
950950
file from multiple fibers. It is possible to limit or prevent file
951-
access from other fibers with ``fiber.ipc``.
951+
access from other fibers with :ref:`fiber.cond() <fiber-cond>` or
952+
:ref:`fiber.channel() <fiber-channel>`.
952953

953954
:param userdata fh: file-handle as returned by ``fio.open()``.
954955
:param buffer: where to read into (if the format is
@@ -970,7 +971,7 @@ functions.
970971

971972
.. code-block:: tarantoolsession
972973
973-
ibuf = require('buffer').ibuf()
974+
tarantool> ibuf = require('buffer').ibuf()
974975
---
975976
...
976977
@@ -996,7 +997,8 @@ functions.
996997
``fh:read`` and ``fh:write`` affect the seek position within the
997998
file, and this must be taken into account when working on the same
998999
file from multiple fibers. It is possible to limit or prevent file
999-
access from other fibers with ``fiber.ipc``.
1000+
access from other fibers with :ref:`fiber.cond() <fiber-cond>` or
1001+
:ref:`fiber.channel() <fiber-channel>`.
10001002

10011003
:param userdata fh: file-handle as returned by ``fio.open()``
10021004
:param string new-string: value to write (if the format is ``write(new-string)``)
@@ -1021,7 +1023,7 @@ functions.
10211023
---
10221024
- true
10231025
...
1024-
ibuf = require('buffer').ibuf()
1026+
tarantool> ibuf = require('buffer').ibuf()
10251027
---
10261028
...
10271029
tarantool> fh:write(ibuf, 1)

locale/reference/reference_lua/fio.pot

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -839,7 +839,7 @@ msgstr ""
839839
msgid "If the format is ``pwrite(buffer, count, offset)`` then the buffer contents are written to the file, for ``count`` bytes. Buffers can be acquired with :ref:`buffer.ibuf <buffer-module>`."
840840
msgstr ""
841841

842-
msgid "ibuf = require('buffer').ibuf()\n"
842+
msgid "tarantool> ibuf = require('buffer').ibuf()\n"
843843
"---\n"
844844
"...\n"
845845
"\n"
@@ -852,7 +852,7 @@ msgstr ""
852852
msgid "Perform non-random-access read on a file. For details type ``man 2 read`` or ``man 2 write``."
853853
msgstr ""
854854

855-
msgid "``fh:read`` and ``fh:write`` affect the seek position within the file, and this must be taken into account when working on the same file from multiple fibers. It is possible to limit or prevent file access from other fibers with ``fiber.ipc``."
855+
msgid "``fh:read`` and ``fh:write`` affect the seek position within the file, and this must be taken into account when working on the same file from multiple fibers. It is possible to limit or prevent file access from other fibers with :ref:`fiber.cond() <fiber-cond>` or :ref:`fiber.channel() <fiber-channel>`."
856856
msgstr ""
857857

858858
msgid "where to read into (if the format is ``read(buffer, count)``)"
@@ -867,7 +867,7 @@ msgstr ""
867867
msgid "If the format is ``read(buffer, count)`` then return the data to the buffer. Buffers can be acquired with :ref:`buffer.ibuf <buffer-module>`."
868868
msgstr ""
869869

870-
msgid "ibuf = require('buffer').ibuf()\n"
870+
msgid "tarantool> ibuf = require('buffer').ibuf()\n"
871871
"---\n"
872872
"...\n"
873873
"\n"
@@ -900,7 +900,7 @@ msgid "tarantool> fh:write(\"new data\")\n"
900900
"---\n"
901901
"- true\n"
902902
"...\n"
903-
"ibuf = require('buffer').ibuf()\n"
903+
"tarantool> ibuf = require('buffer').ibuf()\n"
904904
"---\n"
905905
"...\n"
906906
"tarantool> fh:write(ibuf, 1)\n"

locale/ru/LC_MESSAGES/reference/reference_lua/fio.po

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -174,12 +174,11 @@ msgstr ":ref:`fio.rename() <fio-rename>`"
174174
msgid "Rename a file or directory"
175175
msgstr "Переименование файла или директории"
176176

177-
#, fuzzy
178177
msgid ":ref:`fio.utime() <fio-utime>`"
179-
msgstr ":ref:`os.time() <os-time>`"
178+
msgstr ":ref:`fio.utime() <fio-utime>`"
180179

181180
msgid "Change file update time"
182-
msgstr ""
181+
msgstr "Изменение времени обновления файла"
183182

184183
msgid ":ref:`fio.copyfile() <fio-copyfile>`"
185184
msgstr ":ref:`fio.copyfile() <fio-copyfile>`"

0 commit comments

Comments
 (0)