% March 2000 %
% %
% %
-% Copyright 1999-2012 ImageMagick Studio LLC, a non-profit organization %
+% Copyright 1999-2014 ImageMagick Studio LLC, a non-profit organization %
% dedicated to making software imaging solutions freely available. %
% %
% You may not use this file except in compliance with the License. You may %
static SplayTreeInfo
*module_list = (SplayTreeInfo *) NULL;
-
-static volatile MagickBooleanType
- instantiate_module = MagickFalse;
\f
/*
Forward declarations.
static MagickBooleanType
GetMagickModulePath(const char *,MagickModuleType,char *,ExceptionInfo *),
- InitializeModuleList(ExceptionInfo *),
+ IsModuleTreeInstantiated(ExceptionInfo *),
UnregisterModule(const ModuleInfo *,ExceptionInfo *);
static void
#if defined(MAGICKCORE_MODULES_SUPPORT)
if (module_list != (SplayTreeInfo *) NULL)
module_list=DestroySplayTree(module_list);
- if (instantiate_module != MagickFalse)
- {
-#if !defined(MAGICKCORE_JP2_DELEGATE)
- (void) lt_dlexit(); /* Jasper has an errant atexit() handler */
-#endif
- instantiate_module=MagickFalse;
- }
#endif
UnlockSemaphoreInfo(module_semaphore);
}
*/
MagickExport ModuleInfo *GetModuleInfo(const char *tag,ExceptionInfo *exception)
{
- if ((module_list == (SplayTreeInfo *) NULL) ||
- (instantiate_module == MagickFalse))
- if (InitializeModuleList(exception) == MagickFalse)
- return((ModuleInfo *) NULL);
- if ((module_list == (SplayTreeInfo *) NULL) ||
- (GetNumberOfNodesInSplayTree(module_list) == 0))
+ ModuleInfo
+ *module_info;
+
+ if (IsModuleTreeInstantiated(exception) == MagickFalse)
return((ModuleInfo *) NULL);
+ LockSemaphoreInfo(module_semaphore);
+ ResetSplayTreeIterator(module_list);
if ((tag == (const char *) NULL) || (LocaleCompare(tag,"*") == 0))
{
- ModuleInfo
- *p;
-
#if defined(MAGICKCORE_MODULES_SUPPORT)
if (LocaleCompare(tag,"*") == 0)
(void) OpenModules(exception);
#endif
- LockSemaphoreInfo(module_semaphore);
- ResetSplayTreeIterator(module_list);
- p=(ModuleInfo *) GetNextValueInSplayTree(module_list);
+ module_info=(ModuleInfo *) GetNextValueInSplayTree(module_list);
UnlockSemaphoreInfo(module_semaphore);
- return(p);
+ return(module_info);
}
- return((ModuleInfo *) GetValueFromSplayTree(module_list,tag));
+ module_info=(ModuleInfo *) GetValueFromSplayTree(module_list,tag);
+ UnlockSemaphoreInfo(module_semaphore);
+ return(module_info);
}
\f
/*
modules=(char **) RelinquishMagickMemory(modules);
return((char **) NULL);
}
- buffer=(struct dirent *) AcquireMagickMemory(sizeof(*buffer)+
- FILENAME_MAX+1);
+ buffer=(struct dirent *) AcquireMagickMemory(sizeof(*buffer)+FILENAME_MAX+1);
if (buffer == (struct dirent *) NULL)
ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
i=0;
}
(void) CopyMagickString(prefix,GetClientPath(),MaxTextExtent);
ChopPathComponents(prefix,1);
- (void) FormatLocaleString(path,MaxTextExtent,
- "%s/lib/%s/modules-Q%d/%s/%s",prefix,MAGICKCORE_LIBRARY_RELATIVE_PATH,
- MAGICKCORE_QUANTUM_DEPTH,directory,filename);
+ (void) FormatLocaleString(path,MaxTextExtent,"%s/lib/%s/%s/%s",prefix,
+ MAGICKCORE_MODULES_RELATIVE_PATH,directory,filename);
#endif
if (IsPathAccessible(path) != MagickFalse)
return(MagickTrue);
if (home != (char *) NULL)
{
/*
- Search $HOME/.magick.
+ Search $HOME/.config/ImageMagick.
*/
- (void) FormatLocaleString(path,MaxTextExtent,"%s%s.magick%s%s",home,
+ (void) FormatLocaleString(path,MaxTextExtent,
+ "%s%s.config%sImageMagick%s%s",home,DirectorySeparator,
DirectorySeparator,DirectorySeparator,filename);
home=DestroyString(home);
if (IsPathAccessible(path) != MagickFalse)
if (exception->severity < ConfigureError)
ThrowFileException(exception,ConfigureWarning,"UnableToOpenModuleFile",
path);
- return(MagickFalse);
#endif
return(MagickFalse);
}
% %
% %
% %
-% I n i t i a l i z e M o d u l e L i s t %
+% I s M o d u l e T r e e I n s t a n t i a t e d %
% %
% %
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% InitializeModuleList() initializes the module loader.
+% IsModuleTreeInstantiated() determines if the module tree is instantiated.
+% If not, it instantiates the tree and returns it.
%
-% The format of the InitializeModuleList() method is:
+% The format of the IsModuleTreeInstantiated() method is:
%
-% InitializeModuleList(Exceptioninfo *exception)
+% IsModuleTreeInstantiated(Exceptioninfo *exception)
%
% A description of each parameter follows.
%
return(RelinquishMagickMemory(p));
}
-static MagickBooleanType InitializeModuleList(
+static MagickBooleanType IsModuleTreeInstantiated(
ExceptionInfo *magick_unused(exception))
{
- if ((module_list == (SplayTreeInfo *) NULL) &&
- (instantiate_module == MagickFalse))
+ if (module_list == (SplayTreeInfo *) NULL)
{
if (module_semaphore == (SemaphoreInfo *) NULL)
- AcquireSemaphoreInfo(&module_semaphore);
+ ActivateSemaphoreInfo(&module_semaphore);
LockSemaphoreInfo(module_semaphore);
- if ((module_list == (SplayTreeInfo *) NULL) &&
- (instantiate_module == MagickFalse))
+ if (module_list == (SplayTreeInfo *) NULL)
{
MagickBooleanType
status;
if (lt_dlinit() != 0)
ThrowFatalException(ModuleFatalError,
"UnableToInitializeModuleLoader");
- instantiate_module=MagickTrue;
}
UnlockSemaphoreInfo(module_semaphore);
}
if (status == MagickFalse)
{
(void) ThrowMagickException(exception,GetMagickModule(),ModuleError,
- "UnableToLoadModule","`%s': %s",name,path);
+ "UnableToLoadModule","'%s': %s",name,path);
return(MagickFalse);
}
/*
if (handle == (ModuleHandle) NULL)
{
(void) ThrowMagickException(exception,GetMagickModule(),ModuleError,
- "UnableToLoadModule","`%s': %s",name,lt_dlerror());
+ "UnableToLoadModule","'%s': %s",name,lt_dlerror());
return(MagickFalse);
}
/*
image_filter=(ImageFilterHandler *) lt_dlsym(handle,name);
if (image_filter == (ImageFilterHandler *) NULL)
(void) ThrowMagickException(exception,GetMagickModule(),ModuleError,
- "UnableToLoadModule","`%s': %s",name,lt_dlerror());
+ "UnableToLoadModule","'%s': %s",name,lt_dlerror());
else
{
size_t
tag);
if (signature != MagickImageFilterSignature)
(void) ThrowMagickException(exception,GetMagickModule(),ModuleError,
- "ImageFilterSignatureMismatch","`%s': %8lx != %8lx",tag,
+ "ImageFilterSignatureMismatch","'%s': %8lx != %8lx",tag,
(unsigned long) signature,(unsigned long) MagickImageFilterSignature);
}
/*
*/
if (lt_dlclose(handle) != 0)
(void) ThrowMagickException(exception,GetMagickModule(),ModuleWarning,
- "UnableToCloseModule","`%s': %s",name,lt_dlerror());
+ "UnableToCloseModule","'%s': %s",name,lt_dlerror());
return(exception->severity < ErrorException ? MagickTrue : MagickFalse);
}
\f
MagickBooleanType
status;
- AcquireSemaphoreInfo(&module_semaphore);
+ if (module_semaphore == (SemaphoreInfo *) NULL)
+ module_semaphore=AcquireSemaphoreInfo();
exception=AcquireExceptionInfo();
- status=InitializeModuleList(exception);
+ status=IsModuleTreeInstantiated(exception);
exception=DestroyExceptionInfo(exception);
return(status);
}
MagickPrivate void ModuleComponentTerminus(void)
{
if (module_semaphore == (SemaphoreInfo *) NULL)
- AcquireSemaphoreInfo(&module_semaphore);
+ ActivateSemaphoreInfo(&module_semaphore);
DestroyModuleList();
- DestroySemaphoreInfo(&module_semaphore);
+ RelinquishSemaphoreInfo(&module_semaphore);
}
\f
/*
if (handle == (ModuleHandle) NULL)
{
(void) ThrowMagickException(exception,GetMagickModule(),ModuleError,
- "UnableToLoadModule","`%s': %s",path,lt_dlerror());
+ "UnableToLoadModule","'%s': %s",path,lt_dlerror());
return(MagickFalse);
}
/*
if (module_info->register_module == (size_t (*)(void)) NULL)
{
(void) ThrowMagickException(exception,GetMagickModule(),ModuleError,
- "UnableToRegisterImageFormat","`%s': %s",module_name,lt_dlerror());
+ "UnableToRegisterImageFormat","'%s': %s",module_name,lt_dlerror());
return(MagickFalse);
}
(void) LogMagickEvent(ModuleEvent,GetMagickModule(),
if (module_info->unregister_module == (void (*)(void)) NULL)
{
(void) ThrowMagickException(exception,GetMagickModule(),ModuleError,
- "UnableToRegisterImageFormat","`%s': %s",module_name,lt_dlerror());
+ "UnableToRegisterImageFormat","'%s': %s",module_name,lt_dlerror());
return(MagickFalse);
}
(void) LogMagickEvent(ModuleEvent,GetMagickModule(),
if (signature != MagickImageCoderSignature)
{
(void) ThrowMagickException(exception,GetMagickModule(),ModuleError,
- "ImageCoderSignatureMismatch","`%s': %8lx != %8lx",module_name,
+ "ImageCoderSignatureMismatch","'%s': %8lx != %8lx",module_name,
(unsigned long) signature,(unsigned long) MagickImageCoderSignature);
return(MagickFalse);
}
if (lt_dlclose((ModuleHandle) module_info->handle) != 0)
{
(void) ThrowMagickException(exception,GetMagickModule(),ModuleWarning,
- "UnableToCloseModule","`%s': %s",module_info->tag,lt_dlerror());
+ "UnableToCloseModule","'%s': %s",module_info->tag,lt_dlerror());
return(MagickFalse);
}
return(MagickTrue);
}
#else
+
+#if !defined(MAGICKCORE_BUILD_MODULES)
+extern size_t
+ analyzeImage(Image **,const int,const char **,ExceptionInfo *);
+#endif
+
MagickExport MagickBooleanType ListModuleInfo(FILE *magick_unused(file),
ExceptionInfo *magick_unused(exception))
{
(void) exception;
#else
{
- extern size_t
- analyzeImage(Image **,const int,const char **,ExceptionInfo *);
-
ImageFilterHandler
*image_filter;
if (signature != MagickImageFilterSignature)
{
(void) ThrowMagickException(exception,GetMagickModule(),ModuleError,
- "ImageFilterSignatureMismatch","`%s': %8lx != %8lx",tag,
+ "ImageFilterSignatureMismatch","'%s': %8lx != %8lx",tag,
(unsigned long) signature,(unsigned long)
MagickImageFilterSignature);
return(MagickFalse);
projects / imagemagick / blobdiff