Message ID | 149391398239.11711.11765687670724805864.stgit@localhost.localdomain |
---|---|
State | New |
Series | "Nested pid namespaces support" |
Headers | show
Delivered-To: criupatchwork@gmail.com Received: from gmail-imap.l.google.com [64.233.162.108] by patchwork.criu.org with IMAP (fetchmail-6.3.26) for <root@localhost> (single-drop); Thu, 04 May 2017 18:32:17 +0200 (CEST) Received: by 10.100.181.168 with SMTP id r37csp620356pjb; Thu, 4 May 2017 09:32:15 -0700 (PDT) X-Received: by 10.25.201.139 with SMTP id z133mr1329023lff.35.1493915535401; Thu, 04 May 2017 09:32:15 -0700 (PDT) Return-Path: <criu-bounces@openvz.org> Received: from mail.openvz.org (mail.openvz.org. [195.214.232.140]) by mx.google.com with ESMTPS id a67si1374887lfb.168.2017.05.04.09.32.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 May 2017 09:32:15 -0700 (PDT) Received-SPF: pass (google.com: domain of criu-bounces@openvz.org designates 195.214.232.140 as permitted sender) client-ip=195.214.232.140; Authentication-Results: mx.google.com; spf=pass (google.com: domain of criu-bounces@openvz.org designates 195.214.232.140 as permitted sender) smtp.mailfrom=criu-bounces@openvz.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=virtuozzo.com Received: from mail.openvz.org (localhost [127.0.0.1]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id v44GTadQ001522; Thu, 4 May 2017 09:32:02 -0700 Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01lp0214.outbound.protection.outlook.com [213.199.154.214]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id v44G6bfx001135 for <criu@openvz.org>; Thu, 4 May 2017 09:06:38 -0700 Authentication-Results: openvz.org; dkim=none (message not signed) header.d=none; openvz.org; dmarc=none action=none header.from=virtuozzo.com; Received: from localhost.localdomain (195.214.232.6) by HE1PR0802MB2281.eurprd08.prod.outlook.com (2603:10a6:3:c4::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1075.11; Thu, 4 May 2017 16:06:23 +0000 From: Kirill Tkhai <ktkhai@virtuozzo.com> To: <criu@openvz.org>, <ktkhai@virtuozzo.com>, <avagin@virtuozzo.com>, <ptikhomirov@virtuozzo.com>, <xemul@virtuozzo.com> Date: Thu, 4 May 2017 19:06:22 +0300 Message-ID: <149391398239.11711.11765687670724805864.stgit@localhost.localdomain> In-Reply-To: <149391383130.11711.10688749526056073163.stgit@localhost.localdomain> References: <149391383130.11711.10688749526056073163.stgit@localhost.localdomain> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: VI1PR08CA0017.eurprd08.prod.outlook.com (2a01:111:e400:597a::27) To HE1PR0802MB2281.eurprd08.prod.outlook.com (2603:10a6:3:c4::11) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4bfe6b9d-c48e-43e8-afb0-08d493078331 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201703131423075)(201703031133081); SRVR:HE1PR0802MB2281; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0802MB2281; 3:Zs9ss+Aw635JiuUhBEDrSAVSg5XKaN8QsmKhFgU3VsVJas4BdgDjtGvhUP5mtUHIGUAPf3edhEJ4f076EY/iOjiMzsIvXNZgYN31Y8jtXf5LgBPJ8GFlKyCQ3VweMIoxBDfF88/j+Gef89j7b1MZ9PSSswSiwalNX1VPYuv9QGtOljWn+IAR9G1fb71Dls3EBnXumo29V/oXk10e4VG7bWLYTrQsrSyCRYf+LwVlp1vvXkspi2u0IsSY6wpAP5pr2SOyAqIXM1Bt3eB5ovC4aEDbBkFYTT7l8aze67WwmbnHfgHmjfrN6tmXbLJsomDq5Wxkf5+oGIfIHYnoDoR34A==; 25:cEa+s9/v7OXIYuDiuRyYQgbR7FlOvd8rxU5r4xJiU+f7LZI0JDDXpf3dALblQW7ewFzNkMkH9Jvoedr4yVu3jOy5TMPGZbYntV1l6bI2YioDJcB1HqfRKITFfoe8xi5zJ+RYCd2TM9pv5rtobq2FkCqViQLaB4IXNsi71QD5dv7A1VU2JSKlXD158kMNaIhwPNUf6ze4vxQllaNjlgDbn5GtZzSqdj3By0kk16laUuJ/g15jYyUMBmMPbDupKmCCFO1uY+2WE2JPgtMvFD4ZVT2OKNTnh3D+eCoDkADrltB1+iCbmkSFnIfh8Eom4KhK6tjPkBpjSNpgbyPb1E/GdEWXM4GrshZo+Dq7X7O7+6ETK80u+kbKviK/hZJ/6YFgZxGcR5ScWpikTwEao60aH7Gm+STDga2bzKpiMCtBuPy2fG4f8mPQmFtbwu/yQwhC990Q9N8zR7hu6PQ94KPRj7b6tS9Rqte0MZWMeKoMo3k= X-Microsoft-Exchange-Diagnostics: 1; HE1PR0802MB2281; 31:k4a1oGPbLs2TcqPsms8MwU9xEain+Ft+Xe1OGNYN2PcwbE/edZQxLGofzqjosLdpjilyCSPhz5ie3Skqa40q4V3VQXFgYP2bPBGVl6z6IYG7u47EDqfhPLr435l7Do850kKGEuwtxEKa38g+qTWcc7PRhA9OgEgWFecexS7n36v73s8+7KkXXzccPDK2ioh/ucfgU5FE4JWLqo1GcEM/YqMPZNYZ2xbXd8nmEc7nUwmWVEWsN5k6BE+i10p1vVvo3CFwagMeQu+HRb0fvM+wyg==; 20:4su0eXAUrAredPdLmycKVeVnrigXINV88wYF3ZZaFA8I3GrRtPSw3qCTBqCsJAdHDfwrV/go2JtGZZQ+fGDJ9Es0AXoYVYlC5Y+GNVpH2px8YoShom9N42KZrvCnpwFEMvShhKAAZfE+yIlEiL4pGUpgfcEs/Y3cEqTlRGLWW8Gmc3SW6nlyXbpUe/4CTV9H670zEWUYiBletaH15cZYhuDbnExs9mXAqKmJfu9CSQuKZtIyjkW9G+QRkWQtJFccnvSb6Wt77uRaTkY65jtcM//EBZ7Iqj1KiI8fzZrlSjwU/PIIenf37GhbFTTtQCwVQptOz0LViVVjRFFqxQs+d+pFCE4PX90rpspsCt5rSYMNxr72e8uDOzIaImWKX3nlcxUq/Mvftqwox8B0pA0AyN/2+x/xZ7ef10K91gH8/Ng= X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(9101524173)(601004)(2401047)(8121501046)(10201501046)(3002001)(93006095)(93001095); SRVR:HE1PR0802MB2281; BCL:0; PCL:0; RULEID:; SRVR:HE1PR0802MB2281; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0802MB2281; 4:Bbp9QWWhHx8vFUAdyaZ9zvmhrQoGaLtvsWjX+ekMB3TFz8erCsT0X4Zrodwh4M85a5x7X0sT7cceI1w36g8/1LqLabIAaPweNW0++AVPMCmyUnU5i8xDK7BRe7Yc5FMYSrlsjZ7flXFFzc7jvoT8vCO/3qPJZoeF4Fck3PpUHG/sDEbEbLKZDi7yvtkdlU061iOe8C35h4Z3MItNuYg4/00jPWO7kuhWH7kdrwdga+ibw5lYA7St7UyA6t5VDd+9SjfZ6flYsx510IFB9T73aGpsuI/+JT/oH9dRMgEs2UwJXzR93JUl/aXQBB90lvs0vZR7Iob109mrljyvJcxx9Iw48/qtzDVSOGDQ67MOgz6r8y7uFFxJoMosBYZenF73kKe5+ZNcdtacKBN2e5S0w6Qhb07/e+c3xkTRvQabaYxEa3B5Hdah+pgEFcRYXMWC; 23:byLUEciOiPH0m9Et9X6aDU0dsRH85EzJLAhuTa4nIz2LNBYhiXjn/40YsH0tiv0mYgtUcN5FtBpwAudXwkyLi9a1D3XkACiP7xPD100bBwmjszdpNtlOKjyA1skoRr117Pspn5cRBlojX5XYWc2JBA== X-Forefront-Antispam-Report: SFV:SKI; SFS:; DIR:INB; SFP:; SCL:-1; SRVR:HE1PR0802MB2281; H:localhost.localdomain; FPR:; SPF:None; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0802MB2281; 6:3qdPn6pZ1XHApnuQo3A1kNPLMZtAUcb9XhJEkKsfRMnvzi58DJ7xGLFOn8vuUiF5tpFm0oItmWq4hCY085BNXvaF8YLnk5gDoAJXS1jfNpKtXEBnqRC/OS/vF5LGc/6q0XBxrRW+V516lTRcXJ24PPZqNlNS/pRm0KbszSu4erF/tIla20UT/thGVTqrEsQxK8bpCUbDXJL6W0g5KiMaY5K+mX9tkzbjAIvNQPPjs+kGQ4Wzs33pjKtsxePTEA9qXH83k075GbQa2E7FblsOAHBS+NVpHID0UYRam440Gg8I1BlBe4rpFpSwbaFBLbjfaGaadPe7soeFoy4SZ6C8fEGX6Y8un6vhpWKlhMuPKys91EuvrQtuZtQ2lPjtReF1HMVq9brza1QEZjjGG+85Pw==; 5:LQR9bMoNwJ3z3cjhl9Uffug9DeL+wz3idVbUoEZFTb9Ogi2fu/hxG/tbjTnDQqSyqa86+ZJhvhg80pFPt51lINe4TMaT5KCI/tMYYAl+w+4cZw5YsJJTmjJYSEh0u//a5qQckvoTf0fMAP2glQjONQ==; 24:61q9/g2arph0cfr13P5J9r5/m9Eh9jiKU7/UikAHVCR3NL4Uh5xE8RuT7NbZPh9TbyMh9+RQO8z3A7WNJktpuUGF3lkfiXz4/lAsKWi1bf0= SpamDiagnosticOutput: 1:0 X-Microsoft-Exchange-Diagnostics: 1; HE1PR0802MB2281; 7:AP9e18WSdVbtdZuf1rbmEtVsCVewgWH5NIcL6/EyciWpSw2NhXejzJoF0Ag1CVcPxoXZwpipjhG9zuPIQOLzB4MUj+UdLtr2jEaqCz/GSwXta6i7oiLKcSyU3s6rUGvUGilgVGe+V74hCbPzRGHMZZeywIt7eyCaz4OZgX8CGi16gyq1A2vt+NPgfrSWzgoU1I7Ctm/sQjN9UISMWwUQRUy8rU4WXzGKPmhY8ydC4/eSWomqSDm4qXyxaen46dkQ+vP8rVgjg1UuMulbCkGiDUvpQpOQgyN4ZswJGudBskUSBW5eeCBqj1amVYlG9pG2jB5KiyR68Ydt4l9vtCk4lA==; 20:Dj9mdWXYKUzx073Q84twVbSJPurHixI6/bYONTX7TH5B5Gx0tMOK03MLluzNanbWxBstHsCh5H0/okntSAuPEfHZSy4uYYYd5V2O5LY4hV4AaWw4EWB45WxnVcLrdRcBWrg096N0LfNXkzJGJRSW+5LFG1KAPHITFegKwzJ7fbI= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 May 2017 16:06:23.4232 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0802MB2281 X-MS-Exchange-CrossPremises-OriginalClientIPAddress: 195.214.232.6 X-MS-Exchange-CrossPremises-AuthSource: HE1PR0802MB2281.eurprd08.prod.outlook.com X-MS-Exchange-CrossPremises-AuthAs: Internal X-MS-Exchange-CrossPremises-AuthMechanism: 06 X-MS-Exchange-CrossPremises-TransportTrafficType: Email X-MS-Exchange-CrossPremises-TransportTrafficSubType: X-MS-Exchange-CrossPremises-SCL: -1 X-MS-Exchange-CrossPremises-Antispam-ScanContext: DIR:Originating; SFV:SKI; SKIP:0; X-MS-Exchange-CrossPremises-Processed-By-Journaling: Journal Agent X-OrganizationHeadersPreserved: HE1PR0802MB2281.eurprd08.prod.outlook.com Subject: [CRIU] [PATCH v4 10/41] pstree: Introduce PID_SIZE() helper X-BeenThere: criu@openvz.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: CRIU development <criu.openvz.org> List-Unsubscribe: <https://lists.openvz.org/mailman/options/criu>, <mailto:criu-request@openvz.org?subject=unsubscribe> List-Archive: <http://lists.openvz.org/pipermail/criu/> List-Post: <mailto:criu@openvz.org> List-Help: <mailto:criu-request@openvz.org?subject=help> List-Subscribe: <https://lists.openvz.org/mailman/listinfo/criu>, <mailto:criu-request@openvz.org?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: criu-bounces@openvz.org Errors-To: criu-bounces@openvz.org |
diff --git a/criu/include/pstree.h b/criu/include/pstree.h index 313d85666..313b77458 100644 --- a/criu/include/pstree.h +++ b/criu/include/pstree.h @@ -37,6 +37,8 @@ struct pstree_item { #define vpgid(item) (item->pgid->ns[0].virt) #define vtid(item, i) (item->threads[i]->ns[0].virt) +#define PID_SIZE(level) (sizeof(struct pid) + (level-1) * sizeof(((struct pid *)NULL)->ns[0])) + enum { FDS_EVENT_BIT = 0, }; diff --git a/criu/pstree.c b/criu/pstree.c index 315f533ba..8e8064009 100644 --- a/criu/pstree.c +++ b/criu/pstree.c @@ -208,7 +208,7 @@ struct pstree_item *__alloc_pstree_item(bool rst, int level) struct pstree_item *item; int sz, p_sz; - p_sz = sizeof(struct pid) + (level - 1) * sizeof(((struct pid *)NULL)->ns[0]); + p_sz = PID_SIZE(level); if (!rst) { sz = sizeof(*item) + sizeof(struct dmp_info); item = xzalloc(sz);
We will use this expression in more places. Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com> --- criu/include/pstree.h | 2 ++ criu/pstree.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-)