Changeset ab936440 in mainline for kernel/generic/src/mm/slab.c

Timestamp:

2019-02-12T20:42:42Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

f31ca47

Parents:

7f7817a9 (diff), 4805495 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:26:18)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:42:42)

Message:

Merge branch 'master' into bdsh_alias

Conflicts:

uspace/app/bdsh/Makefile
uspace/app/bdsh/cmds/modules/modules.h

Ccheck correction and removing header which includes itself

File:

• kernel/generic/src/mm/slab.c (modified) (18 diffs)

kernel/generic/src/mm/slab.c

@@ -158 +158 @@
  *
  */
-NO_TRACE static slab_t *slab_space_alloc(slab_cache_t *cache,
+_NO_TRACE static slab_t *slab_space_alloc(slab_cache_t *cache,
     unsigned int flags)
 {
@@ -206 +206 @@
  *
  */
-NO_TRACE static size_t slab_space_free(slab_cache_t *cache, slab_t *slab)
+_NO_TRACE static size_t slab_space_free(slab_cache_t *cache, slab_t *slab)
 {
         frame_free(KA2PA(slab->start), slab->cache->frames);
@@ -218 +218 @@
 
 /** Map object to slab structure */
-NO_TRACE static slab_t *obj2slab(void *obj)
+_NO_TRACE static slab_t *obj2slab(void *obj)
 {
         return (slab_t *) frame_get_parent(ADDR2PFN(KA2PA(obj)), 0);
@@ -234 +234 @@
  *
  */
-NO_TRACE static size_t slab_obj_destroy(slab_cache_t *cache, void *obj,
+_NO_TRACE static size_t slab_obj_destroy(slab_cache_t *cache, void *obj,
     slab_t *slab)
 {
@@ -276 +276 @@
  *
  */
-NO_TRACE static void *slab_obj_create(slab_cache_t *cache, unsigned int flags)
+_NO_TRACE static void *slab_obj_create(slab_cache_t *cache, unsigned int flags)
 {
         irq_spinlock_lock(&cache->slablock, true);
@@ -332 +332 @@
  *
  */
-NO_TRACE static slab_magazine_t *get_mag_from_cache(slab_cache_t *cache,
+_NO_TRACE static slab_magazine_t *get_mag_from_cache(slab_cache_t *cache,
     bool first)
 {
@@ -357 +357 @@
  *
  */
-NO_TRACE static void put_mag_to_cache(slab_cache_t *cache,
+_NO_TRACE static void put_mag_to_cache(slab_cache_t *cache,
     slab_magazine_t *mag)
 {
@@ -373 +373 @@
  *
  */
-NO_TRACE static size_t magazine_destroy(slab_cache_t *cache,
+_NO_TRACE static size_t magazine_destroy(slab_cache_t *cache,
     slab_magazine_t *mag)
 {
@@ -392 +392 @@
  *
  */
-NO_TRACE static slab_magazine_t *get_full_current_mag(slab_cache_t *cache)
+_NO_TRACE static slab_magazine_t *get_full_current_mag(slab_cache_t *cache)
 {
         slab_magazine_t *cmag = cache->mag_cache[CPU->id].current;
@@ -429 +429 @@
  *
  */
-NO_TRACE static void *magazine_obj_get(slab_cache_t *cache)
+_NO_TRACE static void *magazine_obj_get(slab_cache_t *cache)
 {
         if (!CPU)
@@ -459 +459 @@
  *
  */
-NO_TRACE static slab_magazine_t *make_empty_current_mag(slab_cache_t *cache)
+_NO_TRACE static slab_magazine_t *make_empty_current_mag(slab_cache_t *cache)
 {
         slab_magazine_t *cmag = cache->mag_cache[CPU->id].current;
@@ -509 +509 @@
  *
  */
-NO_TRACE static int magazine_obj_put(slab_cache_t *cache, void *obj)
+_NO_TRACE static int magazine_obj_put(slab_cache_t *cache, void *obj)
 {
         if (!CPU)
@@ -538 +538 @@
  *
  */
-NO_TRACE static size_t comp_objects(slab_cache_t *cache)
+_NO_TRACE static size_t comp_objects(slab_cache_t *cache)
 {
         if (cache->flags & SLAB_CACHE_SLINSIDE)
@@ -550 +550 @@
  *
  */
-NO_TRACE static size_t badness(slab_cache_t *cache)
+_NO_TRACE static size_t badness(slab_cache_t *cache)
 {
         size_t objects = comp_objects(cache);
@@ -564 +564 @@
  *
  */
-NO_TRACE static bool make_magcache(slab_cache_t *cache)
+_NO_TRACE static bool make_magcache(slab_cache_t *cache)
 {
         assert(_slab_initialized >= 2);
@@ -585 +585 @@
  *
  */
-NO_TRACE static void _slab_cache_create(slab_cache_t *cache, const char *name,
+_NO_TRACE static void _slab_cache_create(slab_cache_t *cache, const char *name,
     size_t size, size_t align, errno_t (*constructor)(void *obj,
     unsigned int kmflag), size_t (*destructor)(void *obj), unsigned int flags)
@@ -660 +660 @@
  *
  */
-NO_TRACE static size_t _slab_reclaim(slab_cache_t *cache, unsigned int flags)
+_NO_TRACE static size_t _slab_reclaim(slab_cache_t *cache, unsigned int flags)
 {
         if (cache->flags & SLAB_CACHE_NOMAGAZINE)
@@ -707 +707 @@
  *
  */
-NO_TRACE static void _slab_free(slab_cache_t *cache, void *obj, slab_t *slab)
+_NO_TRACE static void _slab_free(slab_cache_t *cache, void *obj, slab_t *slab)
 {
         if (!obj)