[Git][freetype/freetype][master] [cache] Revise list cleansing.

Alexei Podtelezhnikov pushed to branch master at FreeType / FreeType

Commits:

f2f97545

by Alexei Podtelezhnikov at 2023-05-03T23:02:04-04:00

[cache] Revise list cleansing.

* src/cache/ftcmru.c (FTC_MruList_RemoveSelection): Use one loop to
do it.
* src/cache/ftcmanag.c (FTC_Manager_Compress, FTC_Manager_FlushN):
Streamline loops.

2 changed files:

src/cache/ftcmanag.c
src/cache/ftcmru.c

Changes:

src/cache/ftcmanag.c

@@ -426,7 +426,7 @@
      memory = manager->memory;
      /* now discard all caches */
 -    for (idx = manager->num_caches; idx-- > 0; )
 +    for ( idx = manager->num_caches; idx-- > 0; )
+     {
        FTC_Cache  cache = manager->caches[idx];
@@ -537,7 +537,7 @@
    FT_LOCAL_DEF( void )
    FTC_Manager_Compress( FTC_Manager  manager )
+   {
 -    FTC_Node   node, first;
 +    FTC_Node   node, prev, first;
      if ( !manager )
@@ -557,20 +557,16 @@
        return;
      /* go to last node -- it's a circular list */
 -    node = FTC_NODE_PREV( first );
 +    prev = FTC_NODE_PREV( first );
      do
+     {
 -      FTC_Node  prev;
+-
+-
 -      prev = ( node == first ) ? NULL : FTC_NODE_PREV( node );
 +      node = prev;
 +      prev = FTC_NODE_PREV( node );
        if ( node->ref_count <= 0 )
          ftc_node_destroy( node, manager );
 -      node = prev;
+-
 -    } while ( node && manager->cur_weight > manager->max_weight );
 +    } while ( node != first && manager->cur_weight > manager->max_weight );
+   }
@@ -633,20 +629,20 @@
                        FT_UInt      count )
+   {
      FTC_Node  first = manager->nodes_list;
 -    FTC_Node  node;
 -    FT_UInt   result;
 +    FTC_Node  prev, node;
 +    FT_UInt   result = 0;
      /* try to remove `count' nodes from the list */
 -    if ( !first )  /* empty list! */
 -      return 0;
 +    if ( !first || !count )
 +      return result;
 -    /* go to last node - it's a circular list */
 -    node = FTC_NODE_PREV(first);
 -    for ( result = 0; result < count; )
 +    /* go to last node -- it's a circular list */
 +    prev = FTC_NODE_PREV( first );
 +    do
+     {
 -      FTC_Node  prev = FTC_NODE_PREV( node );
+-
 +      node = prev;
 +      prev = FTC_NODE_PREV( node );
        /* don't touch locked nodes */
        if ( node->ref_count <= 0 )
@@ -654,13 +650,9 @@
          ftc_node_destroy( node, manager );
          result++;
+       }
 +    } while ( node != first && result < count );
 -      if ( node == first )
 -        break;
+-
 -      node = prev;
 -    }
 -    return  result;
 +    return result;
+   }

src/cache/ftcmru.c

@@ -329,29 +329,23 @@
                                 FTC_MruNode_CompareFunc  selection,
                                 FT_Pointer               key )
+   {
 -    FTC_MruNode  first, node, next;
 +    FTC_MruNode  first = list->nodes;
 +    FTC_MruNode  node, next;
 -    first = list->nodes;
 -    while ( first && ( !selection || selection( first, key ) ) )
 -    {
 -      FTC_MruList_Remove( list, first );
 -      first = list->nodes;
 -    }
 +    if ( !first || !selection )
 +      return;
 -    if ( first )
 +    next = first;
 +    do
+     {
 -      node = first->next;
 -      while ( node != first )
 -      {
 -        next = node->next;
 +      node = next;
 +      next = node->next;
 -        if ( selection( node, key ) )
 -          FTC_MruList_Remove( list, node );
 +      if ( selection( node, key ) )
 +        FTC_MruList_Remove( list, node );
 -        node = next;
 -      }
 -    }
 +    } while ( next != first );
+   }

From:	Alexei Podtelezhnikov (@apodtele)
Subject:	[Git][freetype/freetype][master] [cache] Revise list cleansing.
Date:	Thu, 04 May 2023 03:04:06 +0000