pool_put (sm->segments, fs);
}
+static fifo_segment_t *
+segment_manager_get_segment_if_valid (segment_manager_t * sm,
+ u32 segment_index)
+{
+ if (pool_is_free_index (sm->segments, segment_index))
+ return 0;
+ return pool_elt_at_index (sm->segments, segment_index);
+}
+
/**
* Removes segment after acquiring writer lock
*/
u8 is_prealloc;
clib_rwlock_writer_lock (&sm->segments_rwlock);
- fs = segment_manager_get_segment (sm, fs_index);
+
+ fs = segment_manager_get_segment_if_valid (sm, fs_index);
+ if (!fs)
+ goto done;
+
is_prealloc = fifo_segment_flags (fs) & FIFO_SEGMENT_F_IS_PREALLOCATED;
if (is_prealloc && !segment_manager_app_detached (sm))
- {
- clib_rwlock_writer_unlock (&sm->segments_rwlock);
- return;
- }
+ goto done;
segment_manager_del_segment (sm, fs);
+
+done:
clib_rwlock_writer_unlock (&sm->segments_rwlock);
}
{
clib_warning ("Added a segment, still can't allocate a fifo");
segment_manager_segment_reader_unlock (sm);
- return SESSION_ERROR_NEW_SEG_NO_SPACE;
+ return SESSION_E_SEG_NO_SPACE2;
}
if ((new_fs_index = segment_manager_add_segment (sm, 0)) < 0)
{
clib_warning ("Failed to add new segment");
- return SESSION_ERROR_SEG_CREATE;
+ return SESSION_E_SEG_CREATE;
}
fs = segment_manager_get_segment_w_lock (sm, new_fs_index);
alloc_fail = segment_manager_try_alloc_fifos (fs, thread_index,
else
{
clib_warning ("Can't add new seg and no space to allocate fifos!");
- return SESSION_ERROR_NO_SPACE;
+ return SESSION_E_SEG_NO_SPACE;
}
}
segment_manager_segment_reader_unlock (sm);
}
+void
+segment_manager_detach_fifo (segment_manager_t * sm, svm_fifo_t * f)
+{
+ fifo_segment_t *fs;
+
+ fs = segment_manager_get_segment_w_lock (sm, f->segment_index);
+ fifo_segment_detach_fifo (fs, f);
+ segment_manager_segment_reader_unlock (sm);
+}
+
+void
+segment_manager_attach_fifo (segment_manager_t * sm, svm_fifo_t * f,
+ session_t * s)
+{
+ fifo_segment_t *fs;
+
+ fs = segment_manager_get_segment_w_lock (sm, f->segment_index);
+ fifo_segment_attach_fifo (fs, f, s->thread_index);
+ segment_manager_segment_reader_unlock (sm);
+
+ f->master_session_index = s->session_index;
+ f->master_thread_index = s->thread_index;
+}
+
u32
segment_manager_evt_q_expected_size (u32 q_len)
{