[Mesa-dev] [PATCH 29/32] util/disk_cache: check cache exists before calling munmap()

[Timothy Arceri]

On 17/02/17 14:40, Mark Janes wrote:
> Timothy Arceri <tarceri at itsqueeze.com> writes:
>
>> On 17/02/17 12:20, Mark Janes wrote:
>>> This series breaks the scons build:
>>>
>>> src/compiler/glsl/linker.cpp:4641: undefined reference to
>>> `shader_cache_read_program_metadata(gl_context*, gl_shader_program*)'
>>
>> To me it looks like its been broken for almost a month already. I'm getting.
>>
>> ast_to_hir.cpp:263:36: error: ‘ir_unop_i642d’ was not declared in this scope
>
> I get similar errors if I don't `git clean -xfd` first.

That works, thanks. I've pushed a fix.

>
>> author	Dave Airlie <airlied at redhat.com>	2016-06-09 00:01:00
>> committer	Ian Romanick <ian.d.romanick at intel.com>	2017-01-20
>> commit	78cc44280e3faeded8eea7face614e13d28481f0
>> tree	184345721e2f88812069fcf94801250b6a214b05
>> parent	85faf5082f06ed5828c6d97bb11dd2292ad0f86a
>>
>> glsl/ast: Add 64-bit integer support to conversion functions
>>
>>
>>>
>>>
>>>
>>> Timothy Arceri <tarceri at itsqueeze.com> writes:
>>>
>>>> ---
>>>>  src/util/disk_cache.c | 3 ++-
>>>>  1 file changed, 2 insertions(+), 1 deletion(-)
>>>>
>>>> diff --git a/src/util/disk_cache.c b/src/util/disk_cache.c
>>>> index 10b9d81..8eccf72 100644
>>>> --- a/src/util/disk_cache.c
>>>> +++ b/src/util/disk_cache.c
>>>> @@ -383,7 +383,8 @@ disk_cache_create(const char *gpu_name, const char *timestamp)
>>>>  void
>>>>  disk_cache_destroy(struct disk_cache *cache)
>>>>  {
>>>> -   munmap(cache->index_mmap, cache->index_mmap_size);
>>>> +   if (cache)
>>>> +      munmap(cache->index_mmap, cache->index_mmap_size);
>>>>
>>>>     ralloc_free(cache);
>>>>  }
>>>> --
>>>> 2.9.3
>>>>
>>>> _______________________________________________
>>>> mesa-dev mailing list
>>>> mesa-dev at lists.freedesktop.org
>>>> https://lists.freedesktop.org/mailman/listinfo/mesa-dev