summaryrefslogtreecommitdiffstats
path: root/src/vnet/config.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/vnet/config.c')
-rw-r--r--src/vnet/config.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/src/vnet/config.c b/src/vnet/config.c
index 9beda4a5706..73fed66d13a 100644
--- a/src/vnet/config.c
+++ b/src/vnet/config.c
@@ -267,11 +267,16 @@ vnet_config_add_feature (vlib_main_t * vm,
f->feature_index = feature_index;
f->node_index = node_index;
- n_feature_config_u32s =
- round_pow2 (n_feature_config_bytes,
- sizeof (f->feature_config[0])) /
- sizeof (f->feature_config[0]);
- vec_add (f->feature_config, feature_config, n_feature_config_u32s);
+ if (n_feature_config_bytes)
+ {
+ n_feature_config_u32s =
+ round_pow2 (n_feature_config_bytes,
+ sizeof (f->feature_config[0])) /
+ sizeof (f->feature_config[0]);
+ vec_validate (f->feature_config, n_feature_config_u32s - 1);
+ clib_memcpy_fast (f->feature_config, feature_config,
+ n_feature_config_bytes);
+ }
/* Sort (prioritize) features. */
if (vec_len (new_features) > 1)
a id='n90' href='#n90'>90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180
/*
 * Copyright (c) 2016 Cisco and/or its affiliates.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at:
 *
 *     http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package io.fd.vpp.jvpp.future;


import java.util.Map;
import java.util.Objects;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionStage;

import io.fd.vpp.jvpp.JVpp;
import io.fd.vpp.jvpp.JVppRegistry;
import io.fd.vpp.jvpp.VppInvocationException;
import io.fd.vpp.jvpp.dto.JVppDump;
import io.fd.vpp.jvpp.dto.JVppReply;
import io.fd.vpp.jvpp.dto.JVppReplyDump;
import io.fd.vpp.jvpp.dto.JVppRequest;

/**
 * Future facade on top of JVpp
 */
public abstract class AbstractFutureJVppInvoker implements FutureJVppInvoker {

    private final JVpp jvpp;
    private final JVppRegistry registry;

    /**
     * Guarded by self
     */
    private final Map<Integer, CompletableFuture<? extends JVppReply<?>>> requests;

    protected AbstractFutureJVppInvoker(final JVpp jvpp, final JVppRegistry registry,
                                        final Map<Integer, CompletableFuture<? extends JVppReply<?>>> requestMap) {
        this.jvpp =  Objects.requireNonNull(jvpp, "jvpp should not be null");
        this.registry =  Objects.requireNonNull(registry, "registry should not be null");
        // Request map represents the shared state between this facade and it's callback
        // where facade puts futures in and callback completes + removes them
        this.requests = Objects.requireNonNull(requestMap, "Null requestMap");
    }

    protected final Map<Integer, CompletableFuture<? extends JVppReply<?>>> getRequests() {
        synchronized (requests) {
            return requests;
        }
    }

    // TODO use Optional in Future, java8

    @Override
    @SuppressWarnings("unchecked")
    public <REQ extends JVppRequest, REPLY extends JVppReply<REQ>> CompletionStage<REPLY> send(REQ req) {
        try {
            // jvpp.send() can go to waiting state if sending queue is full, putting it into same
            // synchronization block as used by receiving part (synchronized(requests)) can lead
            // to deadlock between these two sides or at least slowing sending process by slow
            // reader
            final CompletableFuture<REPLY> replyCompletableFuture;
            final int contextId = jvpp.send(req);

            if(req instanceof JVppDump) {
                throw new IllegalArgumentException("Send with empty reply dump has to be used in case of dump calls");
            }

            synchronized(requests) {
                CompletableFuture<? extends JVppReply<?>> replyFuture = requests.get(contextId);
                if (replyFuture == null) {
                    // reply not yet received, put new future into map
                    replyCompletableFuture = new CompletableFuture<>();
                    requests.put(contextId, replyCompletableFuture);
                } else {
                    // reply already received (should be completed by reader),
                    // remove future from map and return it to caller
                    replyCompletableFuture = (CompletableFuture<REPLY>) replyFuture;
                    requests.remove(contextId);
                }
            }

            // TODO in case of timeouts/missing replies, requests from the map are not removed
            // consider adding cancel method, that would remove requests from the map and cancel
            // associated replyCompletableFuture

            return replyCompletableFuture;
        } catch (VppInvocationException ex) {
            final CompletableFuture<REPLY> replyCompletableFuture = new CompletableFuture<>();
            replyCompletableFuture.completeExceptionally(ex);
            return replyCompletableFuture;
        }
    }

    @Override
    @SuppressWarnings("unchecked")
    public <REQ extends JVppRequest, REPLY extends JVppReply<REQ>, DUMP extends JVppReplyDump<REQ, REPLY>> CompletionStage<DUMP> send(
            REQ req, DUMP emptyReplyDump) {
      try {
          // jvpp.send() and registry.controlPing() can go to waiting state if sending queue is full,
          // putting it into same synchronization block as used by receiving part (synchronized(requests))
          // can lead to deadlock between these two sides or at least slowing sending process by slow reader
          final CompletableDumpFuture<DUMP> replyDumpFuture;
          final int contextId = jvpp.send(req);

          if(!(req instanceof JVppDump)) {
              throw new IllegalArgumentException("Send without empty reply dump has to be used in case of regular calls");
          }

          synchronized(requests) {
              CompletableFuture<? extends JVppReply<?>> replyFuture = requests.get(contextId);
              if (replyFuture == null) {
                  // reply not received yet, put new future to map
                  replyDumpFuture = new CompletableDumpFuture<>(contextId, emptyReplyDump);
                  requests.put(contextId, replyDumpFuture);
              } else {
                  // reply already received, save existing future
                  replyDumpFuture = (CompletableDumpFuture<DUMP>) replyFuture;
              }
          }

          final int pingId = registry.controlPing(jvpp.getClass());

          synchronized(requests) {
              if (requests.remove(pingId) == null) {
                  // reply not received yet, put future into map under pingId
                  requests.put(pingId, replyDumpFuture);
              } else {
                  // reply already received, complete future
                  // ping reply couldn't complete the future because it is not in map under
                  // ping id
                  replyDumpFuture.complete(replyDumpFuture.getReplyDump());
                  requests.remove(contextId);
              }
          }

          // TODO in case of timeouts/missing replies, requests from the map are not removed
          // consider adding cancel method, that would remove requests from the map and cancel
          // associated replyCompletableFuture

          return replyDumpFuture;
      } catch (VppInvocationException ex) {
          final CompletableFuture<DUMP> replyCompletableFuture = new CompletableFuture<>();
          replyCompletableFuture.completeExceptionally(ex);
          return replyCompletableFuture;
      }
    }

    public static final class CompletableDumpFuture<T extends JVppReplyDump<?, ?>> extends CompletableFuture<T> {
        private final T replyDump;
        private final int contextId;

        public CompletableDumpFuture(final int contextId, final T emptyDump) {
            this.contextId = contextId;
            this.replyDump = emptyDump;
        }

        public int getContextId() {
            return contextId;
        }

        public T getReplyDump() {
            return replyDump;
        }
    }

    @Override
    public void close() throws Exception {
        jvpp.close();
    }
}