tcp: improve builtin http server

[vpp.git] / src / vnet / session / application.c

diff --git a/src/vnet/session/application.c b/src/vnet/session/application.c
index 4bdb102..25a4efa 100644 (file)
--- a/src/vnet/session/application.c
+++ b/src/vnet/session/application.c
@@ -81,6 +81,9 @@ application_new ()
   memset (app, 0, sizeof (*app));
   app->index = application_get_index (app);
   app->connects_seg_manager = ~0;
+  app->first_segment_manager = ~0;
+  if (CLIB_DEBUG > 1)
+    clib_warning ("[%d] New app (%d)", getpid (), app->index);
   return app;
 }
 
@@ -97,11 +100,14 @@ application_del (application_t * app)
    * The app event queue allocated in first segment is cleared with
    * the segment manager. No need to explicitly free it.
    */
+  if (CLIB_DEBUG > 1)
+    clib_warning ("[%d] Delete app (%d)", getpid (), app->index);
 
   /*
    * Cleanup segment managers
    */
-  if (app->connects_seg_manager != (u32) ~ 0)
+  if ((app->connects_seg_manager != (u32) ~ 0) &&
+      (app->connects_seg_manager != app->first_segment_manager))
     {
       sm = segment_manager_get (app->connects_seg_manager);
       segment_manager_del (sm);
@@ -123,6 +129,12 @@ application_del (application_t * app)
       vnet_unbind (a);
     }
 
+  if (app->first_segment_manager != ~0)
+    {
+      sm = segment_manager_get (app->first_segment_manager);
+      segment_manager_first_segment_maybe_del (sm);
+    }
+
   application_table_del (app);
   pool_put (app_pool, app);
 }
@@ -163,6 +175,8 @@ application_init (application_t * app, u32 api_client_index, u64 * options,
   props->preallocated_fifo_pairs = options[APP_OPTIONS_PREALLOC_FIFO_PAIRS];
   props->use_private_segment = options[APP_OPTIONS_FLAGS]
     & APP_OPTIONS_FLAGS_BUILTIN_APP;
+  props->private_segment_count = options[APP_OPTIONS_PRIVATE_SEGMENT_COUNT];
+  props->private_segment_size = options[APP_OPTIONS_PRIVATE_SEGMENT_SIZE];
 
   first_seg_size = options[SESSION_OPTIONS_SEGMENT_SIZE];
   if ((rv = segment_manager_init (sm, props, first_seg_size)))
@@ -211,16 +225,17 @@ application_alloc_segment_manager (application_t * app)
 {
   segment_manager_t *sm = 0;
 
-  if (app->first_segment_manager != (u32) ~ 0)
+  if (app->first_segment_manager != (u32) ~ 0
+      && app->first_segment_manager_in_use == 0)
     {
       sm = segment_manager_get (app->first_segment_manager);
-      app->first_segment_manager = ~0;
+      app->first_segment_manager_in_use = 1;
       return sm;
     }
 
   sm = segment_manager_new ();
-  if (segment_manager_init (sm, &app->sm_properties, 0))
-    return 0;
+  sm->properties = &app->sm_properties;
+
   return sm;
 }
 
@@ -288,6 +303,11 @@ application_stop_listen (application_t * srv, u64 handle)
 
   sm = segment_manager_get (*indexp);
   segment_manager_del (sm);
+  if (srv->first_segment_manager == *indexp)
+    {
+      srv->first_segment_manager_in_use = 0;
+      srv->first_segment_manager = ~0;
+    }
   hash_unset (srv->listeners_table, handle);
   listen_session_del (listener);
 
@@ -315,7 +335,7 @@ application_open_session (application_t * app, session_type_t sst,
     return rv;
 
   /* Store api_context for when the reply comes. Not the nicest thing
-   * but better allocating a separate half-open pool.  */
+   * but better than allocating a separate half-open pool. */
   tc->s_index = api_context;
 
   return 0;
@@ -353,6 +373,12 @@ app_get_name_from_reg_index (application_t * app)
   return app_name;
 }
 
+int
+application_is_proxy (application_t * app)
+{
+  return !(app->flags & APP_OPTIONS_FLAGS_IS_PROXY);
+}
+
 u8 *
 format_application_listener (u8 * s, va_list * args)
 {