Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 8B59D200D24 for ; Tue, 10 Oct 2017 07:31:07 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 89EE81609E0; Tue, 10 Oct 2017 05:31:07 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id A7ED51609CE for ; Tue, 10 Oct 2017 07:31:06 +0200 (CEST) Received: (qmail 4755 invoked by uid 500); 10 Oct 2017 05:31:05 -0000 Mailing-List: contact commits-help@mnemonic.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@mnemonic.incubator.apache.org Delivered-To: mailing list commits@mnemonic.incubator.apache.org Received: (qmail 4746 invoked by uid 99); 10 Oct 2017 05:31:05 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 10 Oct 2017 05:31:05 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id BE0421A2D8C for ; Tue, 10 Oct 2017 05:31:04 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.222 X-Spam-Level: X-Spam-Status: No, score=-4.222 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.001, SPF_PASS=-0.001] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id 40f-e-xuyIg9 for ; Tue, 10 Oct 2017 05:31:02 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id CE1AE5F4DC for ; Tue, 10 Oct 2017 05:31:01 +0000 (UTC) Received: (qmail 4727 invoked by uid 99); 10 Oct 2017 05:31:01 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 10 Oct 2017 05:31:01 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0A203F5D50; Tue, 10 Oct 2017 05:30:59 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: garyw@apache.org To: commits@mnemonic.incubator.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: incubator-mnemonic git commit: MNEMONIC-376: Support shrinkable durable memory service Date: Tue, 10 Oct 2017 05:30:59 +0000 (UTC) archived-at: Tue, 10 Oct 2017 05:31:07 -0000 Repository: incubator-mnemonic Updated Branches: refs/heads/master 70a9c0f46 -> 67f074a20 MNEMONIC-376: Support shrinkable durable memory service Project: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/commit/67f074a2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/tree/67f074a2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/diff/67f074a2 Branch: refs/heads/master Commit: 67f074a20b0452cfde71572d7377687f750fc34a Parents: 70a9c0f Author: paleyss Authored: Sat Oct 7 22:48:36 2017 -0700 Committer: paleyss Committed: Mon Oct 9 21:34:59 2017 -0700 ---------------------------------------------------------------------- .../org/apache/mnemonic/CommonAllocator.java | 10 +++++++++ .../mnemonic/NonVolatileMemAllocator.java | 22 ++++++++++++++++++-- .../org/apache/mnemonic/SysMemAllocator.java | 22 ++++++++++++++++++-- .../apache/mnemonic/VolatileMemAllocator.java | 22 ++++++++++++++++++-- .../service/memory/MemoryServiceFeature.java | 3 ++- 5 files changed, 72 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/blob/67f074a2/mnemonic-core/src/main/java/org/apache/mnemonic/CommonAllocator.java ---------------------------------------------------------------------- diff --git a/mnemonic-core/src/main/java/org/apache/mnemonic/CommonAllocator.java b/mnemonic-core/src/main/java/org/apache/mnemonic/CommonAllocator.java index 5325d86..1e0cdf5 100644 --- a/mnemonic-core/src/main/java/org/apache/mnemonic/CommonAllocator.java +++ b/mnemonic-core/src/main/java/org/apache/mnemonic/CommonAllocator.java @@ -55,6 +55,16 @@ public abstract class CommonAllocator> implements A public abstract long expand(long size); /** + * shrink this memory pool + * + * @param size + * specify the size to shrink + * + * @return the real size shrinked + */ + public abstract long shrink(long size); + + /** * set a reclaimer to reclaim memory buffer * * @param reclaimer http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/blob/67f074a2/mnemonic-core/src/main/java/org/apache/mnemonic/NonVolatileMemAllocator.java ---------------------------------------------------------------------- diff --git a/mnemonic-core/src/main/java/org/apache/mnemonic/NonVolatileMemAllocator.java b/mnemonic-core/src/main/java/org/apache/mnemonic/NonVolatileMemAllocator.java index 8d8f7bc..4058139 100644 --- a/mnemonic-core/src/main/java/org/apache/mnemonic/NonVolatileMemAllocator.java +++ b/mnemonic-core/src/main/java/org/apache/mnemonic/NonVolatileMemAllocator.java @@ -31,6 +31,7 @@ import java.nio.ByteBuffer; import static org.apache.mnemonic.service.memory.MemoryServiceFeature.EXPANDABLE; import static org.apache.mnemonic.service.memory.MemoryServiceFeature.QUERYABLE; +import static org.apache.mnemonic.service.memory.MemoryServiceFeature.SHRINKABLE; /** * manage a big native persistent memory pool through underlying memory service. @@ -728,10 +729,27 @@ public class NonVolatileMemAllocator extends RestorableAllocator { long ret = 0L; if (null != m_features) { if (m_features.contains(EXPANDABLE)) { - return ret = size; + ret = size; + } else { + throw new ConfigurationException("Do not support expand operation"); } } else { - throw new ConfigurationException("Do not support expand operation"); + throw new ConfigurationException("Do not support features"); + } + return ret; + } + + @Override + public long shrink(long size) { + long ret = 0L; + if (null != m_features) { + if (m_features.contains(SHRINKABLE)) { + ret = size; + } else { + throw new ConfigurationException("Do not support shrink operation"); + } + } else { + throw new ConfigurationException("Do not support features"); } return ret; } http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/blob/67f074a2/mnemonic-core/src/main/java/org/apache/mnemonic/VolatileMemAllocator.java ---------------------------------------------------------------------- diff --git a/mnemonic-core/src/main/java/org/apache/mnemonic/VolatileMemAllocator.java b/mnemonic-core/src/main/java/org/apache/mnemonic/VolatileMemAllocator.java index b54dfad..1392a22 100644 --- a/mnemonic-core/src/main/java/org/apache/mnemonic/VolatileMemAllocator.java +++ b/mnemonic-core/src/main/java/org/apache/mnemonic/VolatileMemAllocator.java @@ -31,6 +31,7 @@ import java.nio.ByteBuffer; import static org.apache.mnemonic.service.memory.MemoryServiceFeature.EXPANDABLE; import static org.apache.mnemonic.service.memory.MemoryServiceFeature.QUERYABLE; +import static org.apache.mnemonic.service.memory.MemoryServiceFeature.SHRINKABLE; /** * manage a big native memory pool through underlying memory service. @@ -150,10 +151,27 @@ public class VolatileMemAllocator extends RestorableAllocator