Browse Source

intermediate changes
ref:13079fed9f411a27e64e93afcdee28791690f38b

arcadia-devtools 3 years ago
parent
commit
a5f2f1cbd6
2 changed files with 70 additions and 0 deletions
  1. 67 0
      build/ya.conf.json
  2. 3 0
      library/cpp/coroutine/engine/impl.h

+ 67 - 0
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)"
         },
@@ -1680,6 +1683,16 @@
                     },
                     "default": true
                 },
+                {
+                    "host": {
+                        "os": "LINUX"
+                    },
+                    "target": {
+                        "os": "IOSSIM",
+                        "arch": "arm64"
+                    },
+                    "default": true
+                },
                 {
                     "host": {
                         "os": "LINUX"
@@ -1790,6 +1803,16 @@
                     },
                     "default": true
                 },
+                {
+                    "host": {
+                        "os": "DARWIN"
+                    },
+                    "target": {
+                        "os": "IOSSIM",
+                        "arch": "arm64"
+                    },
+                    "default": true
+                },
                 {
                     "host": {
                         "os": "DARWIN",
@@ -1900,6 +1923,17 @@
                     },
                     "default": true
                 },
+                {
+                    "host": {
+                        "os": "DARWIN",
+                        "arch": "arm64"
+                    },
+                    "target": {
+                        "os": "IOSSIM",
+                        "arch": "arm64"
+                    },
+                    "default": true
+                },
                 {
                     "host": {
                         "os": "LINUX"
@@ -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": [

+ 3 - 0
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;