diff options
| author | arcadia-devtools <arcadia-devtools@yandex-team.ru> | 2022-02-21 22:53:39 +0300 |
|---|---|---|
| committer | arcadia-devtools <arcadia-devtools@yandex-team.ru> | 2022-02-21 22:53:39 +0300 |
| commit | a5f2f1cbd679aaa6434f0da7dce2d1028ea03451 (patch) | |
| tree | b568b8889aead8fd12e04a732613c91b7891725e | |
| parent | bf42c5aeae0f02b264dd56bdb7f1a5b23e677297 (diff) | |
| download | ydb-a5f2f1cbd679aaa6434f0da7dce2d1028ea03451.tar.gz | |
intermediate changes
ref:13079fed9f411a27e64e93afcdee28791690f38b
| -rw-r--r-- | build/ya.conf.json | 67 | ||||
| -rw-r--r-- | library/cpp/coroutine/engine/impl.h | 3 |
2 files changed, 70 insertions, 0 deletions
diff --git a/build/ya.conf.json b/build/ya.conf.json index 7b44fccb67..cf65f42abf 100644 --- a/build/ya.conf.json +++ b/build/ya.conf.json @@ -296,6 +296,9 @@ "news": { "description": "Run news team tools" }, + "saas2": { + "description": "Run saas2 cli" + }, "go": { "description": "Run go tool (1.17.7)" }, @@ -1685,6 +1688,16 @@ "os": "LINUX" }, "target": { + "os": "IOSSIM", + "arch": "arm64" + }, + "default": true + }, + { + "host": { + "os": "LINUX" + }, + "target": { "os": "YOCTO", "arch": "armv7a" }, @@ -1792,6 +1805,16 @@ }, { "host": { + "os": "DARWIN" + }, + "target": { + "os": "IOSSIM", + "arch": "arm64" + }, + "default": true + }, + { + "host": { "os": "DARWIN", "arch": "arm64" }, @@ -1902,6 +1925,17 @@ }, { "host": { + "os": "DARWIN", + "arch": "arm64" + }, + "target": { + "os": "IOSSIM", + "arch": "arm64" + }, + "default": true + }, + { + "host": { "os": "LINUX" }, "target": { @@ -4778,6 +4812,28 @@ } ] }, + "saas2": { + "tools": { + "saas2": { + "bottle": "saas2", + "executable": "saas2" + } + }, + "platforms": [ + { + "host": { + "os": "LINUX" + }, + "default": true + }, + { + "host": { + "os": "DARWIN" + }, + "default": true + } + ] + }, "golang_1_17_7": { "tools": { "golang": { @@ -7376,6 +7432,17 @@ ] } }, + "saas2": { + "formula": { + "sandbox_id": 1222768210, + "match": "saas2" + }, + "executable": { + "saas2": [ + "saas2" + ] + } + }, "golang_1.17.7": { "formula": { "sandbox_id": [ diff --git a/library/cpp/coroutine/engine/impl.h b/library/cpp/coroutine/engine/impl.h index 283a96ecf1..3795fdcec1 100644 --- a/library/cpp/coroutine/engine/impl.h +++ b/library/cpp/coroutine/engine/impl.h @@ -95,6 +95,9 @@ public: return Scheduled_; } + /// \param this корутина, которая будет ждать + /// \param c корутина, которую будем ждать + /// \param deadLine максимальное время ожидания bool Join(TCont* c, TInstant deadLine = TInstant::Max()) noexcept; void ReSchedule() noexcept; |