X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvppinfra%2Fvec.h;h=470a4f190c2a40d9ebfef6992e08e1ee8366be5c;hb=178cf493d009995b28fdf220f04c98860ff79a9b;hp=f233ae1c48f9a3637ad4ebf19d8afedfe9f6e45a;hpb=2f25ef33c870869e613b81ee7603b9b7337e48fe;p=vpp.git

diff --git a/src/vppinfra/vec.h b/src/vppinfra/vec.h
index f233ae1c48f..470a4f190c2 100644
--- a/src/vppinfra/vec.h
+++ b/src/vppinfra/vec.h
@@ -360,7 +360,7 @@ do {						\
   if (_v(l) > 0)					\
     {							\
       vec_resize_ha (_v(v), _v(l), (H), (A));		\
-      clib_memcpy (_v(v), (V), _v(l) * sizeof ((V)[0]));\
+      clib_memcpy_fast (_v(v), (V), _v(l) * sizeof ((V)[0]));\
     }							\
   _v(v);						\
 })
@@ -387,7 +387,7 @@ do {						\
     @param DST destination
     @param SRC source
 */
-#define vec_copy(DST,SRC) clib_memcpy (DST, SRC, vec_len (DST) * \
+#define vec_copy(DST,SRC) clib_memcpy_fast (DST, SRC, vec_len (DST) * \
 				       sizeof ((DST)[0]))
 
 /** \brief Clone a vector. Make a new vector with the
@@ -423,7 +423,7 @@ do {									\
       vec_resize_ha ((V), 1 + (_v(i) - _v(l)), (H), (A));		\
       /* Must zero new space since user may have previously		\
 	 used e.g. _vec_len (v) -= 10 */				\
-      memset ((V) + _v(l), 0, (1 + (_v(i) - _v(l))) * sizeof ((V)[0]));	\
+      clib_memset ((V) + _v(l), 0, (1 + (_v(i) - _v(l))) * sizeof ((V)[0]));	\
     }									\
 } while (0)
 
@@ -587,7 +587,7 @@ do {										\
   word _v(n) = (N);								\
   word _v(l) = vec_len (V);							\
   V = _vec_resize ((V), _v(n), (_v(l) + _v(n)) * sizeof ((V)[0]), (H), (A));	\
-  clib_memcpy ((V) + _v(l), (E), _v(n) * sizeof ((V)[0]));			\
+  clib_memcpy_fast ((V) + _v(l), (E), _v(n) * sizeof ((V)[0]));			\
 } while (0)
 
 /** \brief Add N elements to end of vector V (no header, unspecified alignment)
@@ -661,7 +661,7 @@ do {							\
   memmove ((V) + _v(m) + _v(n),				\
 	   (V) + _v(m),					\
 	   (_v(l) - _v(m)) * sizeof ((V)[0]));		\
-  memset  ((V) + _v(m), INIT, _v(n) * sizeof ((V)[0]));	\
+  clib_memset  ((V) + _v(m), INIT, _v(n) * sizeof ((V)[0]));	\
 } while (0)
 
 /** \brief Insert N vector elements starting at element M,
@@ -749,7 +749,7 @@ do {							\
   memmove ((V) + _v(m) + _v(n),				\
 	   (V) + _v(m),					\
 	   (_v(l) - _v(m)) * sizeof ((V)[0]));		\
-  clib_memcpy ((V) + _v(m), (E),			\
+  clib_memcpy_fast ((V) + _v(m), (E),			\
 	       _v(n) * sizeof ((V)[0]));		\
 } while (0)
 
@@ -794,7 +794,7 @@ do {								\
 	     (_v(l) - _v(n) - _v(m)) * sizeof ((V)[0]));	\
   /* Zero empty space at end (for future re-allocation). */	\
   if (_v(n) > 0)						\
-    memset ((V) + _v(l) - _v(n), 0, _v(n) * sizeof ((V)[0]));	\
+    clib_memset ((V) + _v(l) - _v(n), 0, _v(n) * sizeof ((V)[0]));	\
   _vec_len (V) -= _v(n);					\
 } while (0)
 
@@ -824,7 +824,7 @@ do {									\
 									\
   v1 = _vec_resize ((v1), _v(l2),					\
 		    (_v(l1) + _v(l2)) * sizeof ((v1)[0]), 0, 0);	\
-  clib_memcpy ((v1) + _v(l1), (v2), _v(l2) * sizeof ((v2)[0]));		\
+  clib_memcpy_fast ((v1) + _v(l1), (v2), _v(l2) * sizeof ((v2)[0]));		\
 } while (0)
 
 /** \brief Append v2 after v1. Result in v1. Specified alignment.
@@ -840,7 +840,7 @@ do {									\
 									\
   v1 = _vec_resize ((v1), _v(l2),					\
 		    (_v(l1) + _v(l2)) * sizeof ((v1)[0]), 0, align);	\
-  clib_memcpy ((v1) + _v(l1), (v2), _v(l2) * sizeof ((v2)[0]));		\
+  clib_memcpy_fast ((v1) + _v(l1), (v2), _v(l2) * sizeof ((v2)[0]));		\
 } while (0)
 
 /** \brief Prepend v2 before v1. Result in v1.
@@ -856,7 +856,7 @@ do {                                                                    \
   v1 = _vec_resize ((v1), _v(l2),                                       \
 		    (_v(l1) + _v(l2)) * sizeof ((v1)[0]), 0, 0);	\
   memmove ((v1) + _v(l2), (v1), _v(l1) * sizeof ((v1)[0]));             \
-  clib_memcpy ((v1), (v2), _v(l2) * sizeof ((v2)[0]));                  \
+  clib_memcpy_fast ((v1), (v2), _v(l2) * sizeof ((v2)[0]));                  \
 } while (0)
 
 /** \brief Prepend v2 before v1. Result in v1. Specified alignment
@@ -873,7 +873,7 @@ do {                                                                    \
   v1 = _vec_resize ((v1), _v(l2),                                       \
 		    (_v(l1) + _v(l2)) * sizeof ((v1)[0]), 0, align);	\
   memmove ((v1) + _v(l2), (v1), _v(l1) * sizeof ((v1)[0]));             \
-  clib_memcpy ((v1), (v2), _v(l2) * sizeof ((v2)[0]));                  \
+  clib_memcpy_fast ((v1), (v2), _v(l2) * sizeof ((v2)[0]));                  \
 } while (0)
 
 
@@ -883,7 +883,7 @@ do {                                                                    \
 #define vec_zero(var)						\
 do {								\
   if (var)							\
-    memset ((var), 0, vec_len (var) * sizeof ((var)[0]));	\
+    clib_memset ((var), 0, vec_len (var) * sizeof ((var)[0]));	\
 } while (0)
 
 /** \brief Set all vector elements to given value. Null-pointer tolerant.
@@ -953,6 +953,27 @@ do {						\
   _v(i);						\
 })
 
+/** \brief Search a vector for the index of the entry that matches.
+
+    @param v1 Pointer to a vector
+    @param v2 Pointer to entry to match
+    @param fn Comparison function !0 => match
+    @return index of match or ~0
+*/
+#define vec_search_with_function(v,E,fn)                \
+({							\
+  word _v(i) = 0;					\
+  while (_v(i) < vec_len(v))				\
+  {							\
+    if (0 != fn(&(v)[_v(i)], (E)))                      \
+      break;						\
+    _v(i)++;						\
+  }							\
+  if (_v(i) == vec_len(v))				\
+    _v(i) = ~0;					        \
+  _v(i);						\
+})
+
 /** \brief Sort a vector using the supplied element comparison function
 
     @param vec vector to sort
@@ -974,7 +995,7 @@ do {								\
     vec_reset_length (V);                       \
     vec_validate ((V), (L));                    \
     if ((S) && (L))                             \
-        clib_memcpy ((V), (S), (L));            \
+        clib_memcpy_fast ((V), (S), (L));            \
     (V)[(L)] = 0;                               \
   } while (0)