folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add and use internal (lockless) version of rpmDefineMacro() 

- rpmLoadMacroFile() already grabs the (theoretical) lock on entry
  so we shouldn't try to grab it again, use the new lockless
  defineMacro() version for the purpose.
- rpmDefineMacro() is now just a simple lock-wrapper around defineMacro()
This commit is contained in:
Panu Matilainen 2013-05-22 11:15:20 +03:00
parent 1036601e3e
commit bfda1b6013
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
rpmio/macro.c
View File

@ -1396,6 +1396,17 @@ static void popMacro(rpmMacroContext mc, const char * n)
free(me);
}
static int defineMacro(rpmMacroContext mc, const char * macro, int level)
{
MacroBuf mb = xcalloc(1, sizeof(*mb));
/* XXX just enough to get by */
mb->mc = mc;
(void) doDefine(mb, macro, level, 0);
_free(mb);
return 0;
}
/* External interfaces */
int expandMacros(void * spec, rpmMacroContext mc, char * sbuf, size_t slen)
@ -1453,13 +1464,9 @@ void delMacro(rpmMacroContext mc, const char * n)
int
rpmDefineMacro(rpmMacroContext mc, const char * macro, int level)
{
MacroBuf mb = xcalloc(1, sizeof(*mb));
/* XXX just enough to get by */
mb->mc = rpmmctxAcquire(mc);
(void) doDefine(mb, macro, level, 0);
rpmmctxRelease(mb->mc);
_free(mb);
mc = rpmmctxAcquire(mc);
(void) defineMacro(mc, macro, level);
rpmmctxRelease(mc);
return 0;
}
@ -1507,7 +1514,7 @@ rpmLoadMacroFile(rpmMacroContext mc, const char * fn)
if (c != '%')
continue;
n++; /* skip % */
rc = rpmDefineMacro(mc, n, RMIL_MACROFILES);
rc = defineMacro(mc, n, RMIL_MACROFILES);
}
rpmmctxRelease(mc);