[Bf-committers] [Bf-blender-cvs] [ed935ae] master: Cycles: Use lock in the memory statistics

[Sergey Sharybin]

Woops, just to clarify:

- "Lock" in the commit message is a left over from a WIP patch which
actually used lock and had "TODO: use atomics". There're no locks at
all
- This is a potential fix for the bug reported to debian bug tracker:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=771042

On Tue, Dec 2, 2014 at 3:56 PM, Sergey Sharybin <noreply at git.blender.org> wrote:
> Commit: ed935ae5adf8d676bb002380d4f46a288c6572d0
> Author: Sergey Sharybin
> Date:   Tue Dec 2 15:36:44 2014 +0500
> Branches: master
> https://developer.blender.org/rBed935ae5adf8d676bb002380d4f46a288c6572d0
>
> Cycles: Use lock in the memory statistics
>
> CPU rendering is allowed to allocate memory from multiple threads,
> which means statistics need to be avare of this.
>
> ===================================================================
>
> M       intern/cycles/CMakeLists.txt
> M       intern/cycles/SConscript
> M       intern/cycles/util/CMakeLists.txt
> A       intern/cycles/util/util_atomic.h
> M       intern/cycles/util/util_stats.h
>
> ===================================================================
>
> diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt
> index 7de1182..c8c71fe 100644
> --- a/intern/cycles/CMakeLists.txt
> +++ b/intern/cycles/CMakeLists.txt
> @@ -163,6 +163,10 @@ include_directories(
>         ${OPENEXR_INCLUDE_DIRS}
>  )
>
> +# TODO(sergey): Adjust so standalone repository is also happy.
> +include_directories(
> +       ../atomic
> +)
>
>  # Warnings
>  if(CMAKE_COMPILER_IS_GNUCXX)
> diff --git a/intern/cycles/SConscript b/intern/cycles/SConscript
> index b399844..0d35ebf 100644
> --- a/intern/cycles/SConscript
> +++ b/intern/cycles/SConscript
> @@ -68,6 +68,7 @@ incs.extend('#source/blender/blenloader ../../source/blender/makesrna/intern'.sp
>
>  incs.append(env['BF_GLEW_INC'])
>  incs.append('#/intern/glew-mx')
> +incs.append('#/intern/atomic')
>  incs.append('#intern/mikktspace')
>  incs.extend('#extern/glew/include #extern/clew/include #extern/cuew/include #intern/mikktspace'.split())
>
> diff --git a/intern/cycles/util/CMakeLists.txt b/intern/cycles/util/CMakeLists.txt
> index 295ebd2..a07deb6 100644
> --- a/intern/cycles/util/CMakeLists.txt
> +++ b/intern/cycles/util/CMakeLists.txt
> @@ -30,6 +30,7 @@ endif()
>  set(SRC_HEADERS
>         util_algorithm.h
>         util_args.h
> +       util_atomic.h
>         util_boundbox.h
>         util_cache.h
>         util_debug.h
> diff --git a/intern/cycles/util/util_stats.h b/intern/cycles/util/util_atomic.h
> similarity index 55%
> copy from intern/cycles/util/util_stats.h
> copy to intern/cycles/util/util_atomic.h
> index 8758b82..1bbb0a8 100644
> --- a/intern/cycles/util/util_stats.h
> +++ b/intern/cycles/util/util_atomic.h
> @@ -1,5 +1,5 @@
>  /*
> - * Copyright 2011-2013 Blender Foundation
> + * Copyright 2014 Blender Foundation
>   *
>   * Licensed under the Apache License, Version 2.0 (the "License");
>   * you may not use this file except in compliance with the License.
> @@ -14,30 +14,20 @@
>   * limitations under the License
>   */
>
> -#ifndef __UTIL_STATS_H__
> -#define __UTIL_STATS_H__
> +#ifndef __UTIL_ATOMIC_H__
> +#define __UTIL_ATOMIC_H__
>
> -CCL_NAMESPACE_BEGIN
> +/* Using atomic ops header from Blender. */
> +#include "atomic_ops.h"
>
> -class Stats {
> -public:
> -       Stats() : mem_used(0), mem_peak(0) {}
> -
> -       void mem_alloc(size_t size) {
> -               mem_used += size;
> -               if(mem_used > mem_peak)
> -                       mem_peak = mem_used;
> -       }
> -
> -       void mem_free(size_t size) {
> -               assert(mem_used >= size);
> -               mem_used -= size;
> +ATOMIC_INLINE void atomic_update_max_z(size_t *maximum_value, size_t value)
> +{
> +       size_t prev_value = *maximum_value;
> +       while (prev_value < value) {
> +               if (atomic_cas_z(maximum_value, prev_value, value) != prev_value) {
> +                       break;
> +               }
>         }
> +}
>
> -       size_t mem_used;
> -       size_t mem_peak;
> -};
> -
> -CCL_NAMESPACE_END
> -
> -#endif /* __UTIL_STATS_H__ */
> +#endif /* __UTIL_ATOMIC_H__ */
> diff --git a/intern/cycles/util/util_stats.h b/intern/cycles/util/util_stats.h
> index 8758b82..fe6c162 100644
> --- a/intern/cycles/util/util_stats.h
> +++ b/intern/cycles/util/util_stats.h
> @@ -17,6 +17,8 @@
>  #ifndef __UTIL_STATS_H__
>  #define __UTIL_STATS_H__
>
> +#include "util_atomic.h"
> +
>  CCL_NAMESPACE_BEGIN
>
>  class Stats {
> @@ -24,14 +26,13 @@ public:
>         Stats() : mem_used(0), mem_peak(0) {}
>
>         void mem_alloc(size_t size) {
> -               mem_used += size;
> -               if(mem_used > mem_peak)
> -                       mem_peak = mem_used;
> +               atomic_add_z(&mem_used, size);
> +               atomic_update_max_z(&mem_peak, mem_used);
>         }
>
>         void mem_free(size_t size) {
>                 assert(mem_used >= size);
> -               mem_used -= size;
> +               atomic_sub_z(&mem_used, size);
>         }
>
>         size_t mem_used;
>
> _______________________________________________
> Bf-blender-cvs mailing list
> Bf-blender-cvs at blender.org
> http://lists.blender.org/mailman/listinfo/bf-blender-cvs



-- 
With best regards, Sergey Sharybin