Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
apk-tools
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
59
Issues
59
List
Boards
Labels
Service Desk
Milestones
Merge Requests
14
Merge Requests
14
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
alpine
apk-tools
Commits
fe9b4a38
Commit
fe9b4a38
authored
Feb 08, 2012
by
Timo Teräs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
blob: optimize spn and cspn
parent
3320fba5
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
112 additions
and
12 deletions
+112
-12
src/apk_blob.h
src/apk_blob.h
+5
-2
src/blob.c
src/blob.c
+87
-4
src/database.c
src/database.c
+7
-2
src/package.c
src/package.c
+13
-4
No files found.
src/apk_blob.h
View file @
fe9b4a38
...
@@ -18,6 +18,9 @@
...
@@ -18,6 +18,9 @@
#include "apk_defines.h"
#include "apk_defines.h"
typedef
const
unsigned
char
*
apk_spn_match
;
typedef
unsigned
char
apk_spn_match_def
[
256
/
8
];
struct
apk_blob
{
struct
apk_blob
{
long
len
;
long
len
;
char
*
ptr
;
char
*
ptr
;
...
@@ -83,8 +86,8 @@ static inline apk_blob_t apk_blob_trim(apk_blob_t blob)
...
@@ -83,8 +86,8 @@ static inline apk_blob_t apk_blob_trim(apk_blob_t blob)
}
}
char
*
apk_blob_cstr
(
apk_blob_t
str
);
char
*
apk_blob_cstr
(
apk_blob_t
str
);
int
apk_blob_spn
(
apk_blob_t
blob
,
const
char
*
accept
,
apk_blob_t
*
l
,
apk_blob_t
*
r
);
int
apk_blob_spn
(
apk_blob_t
blob
,
const
apk_spn_match
accept
,
apk_blob_t
*
l
,
apk_blob_t
*
r
);
int
apk_blob_cspn
(
apk_blob_t
blob
,
const
char
*
reject
,
apk_blob_t
*
l
,
apk_blob_t
*
r
);
int
apk_blob_cspn
(
apk_blob_t
blob
,
const
apk_spn_match
reject
,
apk_blob_t
*
l
,
apk_blob_t
*
r
);
int
apk_blob_split
(
apk_blob_t
blob
,
apk_blob_t
split
,
apk_blob_t
*
l
,
apk_blob_t
*
r
);
int
apk_blob_split
(
apk_blob_t
blob
,
apk_blob_t
split
,
apk_blob_t
*
l
,
apk_blob_t
*
r
);
int
apk_blob_rsplit
(
apk_blob_t
blob
,
char
split
,
apk_blob_t
*
l
,
apk_blob_t
*
r
);
int
apk_blob_rsplit
(
apk_blob_t
blob
,
char
split
,
apk_blob_t
*
l
,
apk_blob_t
*
r
);
apk_blob_t
apk_blob_pushed
(
apk_blob_t
buffer
,
apk_blob_t
left
);
apk_blob_t
apk_blob_pushed
(
apk_blob_t
buffer
,
apk_blob_t
left
);
...
...
src/blob.c
View file @
fe9b4a38
...
@@ -38,12 +38,94 @@ char *apk_blob_cstr(apk_blob_t blob)
...
@@ -38,12 +38,94 @@ char *apk_blob_cstr(apk_blob_t blob)
return
cstr
;
return
cstr
;
}
}
int
apk_blob_spn
(
apk_blob_t
blob
,
const
char
*
accept
,
apk_blob_t
*
l
,
apk_blob_t
*
r
)
#if defined(__i386__)
static
unsigned
long
inline
memspn
(
const
unsigned
char
*
ptr
,
unsigned
long
len
,
const
unsigned
char
*
array
)
{
unsigned
long
p
=
len
;
__asm__
(
"cld ; xorl %%eax, %%eax
\n
"
"1:
\n
"
"lodsb
\n
"
"btl %%eax, %2
\n
"
"jnc 2f
\n
"
"decl %1
\n
"
"jnz 1b
\n
"
"2:
\n
"
:
"+&S"
(
ptr
),
"+&r"
(
p
)
:
"m"
(
*
array
)
:
"cc"
,
"%eax"
);
return
p
;
}
static
unsigned
long
inline
memcspn
(
const
unsigned
char
*
ptr
,
unsigned
long
len
,
const
unsigned
char
*
array
)
{
unsigned
long
p
=
len
;
__asm__
(
"cld ; xorl %%eax, %%eax
\n
"
"1:
\n
"
"lodsb
\n
"
"btl %%eax, %2
\n
"
"jc 2f
\n
"
"decl %1
\n
"
"jnz 1b
\n
"
"2:
\n
"
:
"+&S"
(
ptr
),
"+&r"
(
p
)
:
"m"
(
*
array
)
:
"cc"
,
"%eax"
);
return
p
;
}
int
apk_blob_spn
(
apk_blob_t
blob
,
const
apk_spn_match
accept
,
apk_blob_t
*
l
,
apk_blob_t
*
r
)
{
unsigned
int
i
;
if
(
blob
.
len
==
0
)
return
0
;
i
=
blob
.
len
-
memspn
((
unsigned
char
*
)
blob
.
ptr
,
blob
.
len
,
accept
);
if
(
i
==
blob
.
len
)
return
0
;
if
(
l
!=
NULL
)
*
l
=
APK_BLOB_PTR_LEN
(
blob
.
ptr
,
i
);
if
(
r
!=
NULL
)
*
r
=
APK_BLOB_PTR_LEN
(
blob
.
ptr
+
i
,
blob
.
len
-
i
);
return
1
;
}
int
apk_blob_cspn
(
apk_blob_t
blob
,
const
apk_spn_match
reject
,
apk_blob_t
*
l
,
apk_blob_t
*
r
)
{
unsigned
int
i
;
if
(
blob
.
len
==
0
)
return
0
;
i
=
blob
.
len
-
memcspn
((
unsigned
char
*
)
blob
.
ptr
,
blob
.
len
,
reject
);
if
(
i
==
blob
.
len
)
return
0
;
if
(
l
!=
NULL
)
*
l
=
APK_BLOB_PTR_LEN
(
blob
.
ptr
,
i
);
if
(
r
!=
NULL
)
*
r
=
APK_BLOB_PTR_LEN
(
blob
.
ptr
+
i
,
blob
.
len
-
i
);
return
1
;
}
#else
static
int
inline
test_bit
(
const
unsigned
char
*
array
,
unsigned
bit
)
{
return
array
[
bit
>>
3
]
&
(
1
<<
(
bit
&
7
));
}
int
apk_blob_spn
(
apk_blob_t
blob
,
const
apk_spn_match
accept
,
apk_blob_t
*
l
,
apk_blob_t
*
r
)
{
{
int
i
;
int
i
;
for
(
i
=
0
;
i
<
blob
.
len
;
i
++
)
{
for
(
i
=
0
;
i
<
blob
.
len
;
i
++
)
{
if
(
strchr
(
accept
,
blob
.
ptr
[
i
])
==
NULL
)
{
if
(
!
test_bit
(
accept
,
blob
.
ptr
[
i
])
)
{
if
(
l
!=
NULL
)
if
(
l
!=
NULL
)
*
l
=
APK_BLOB_PTR_LEN
(
blob
.
ptr
,
i
);
*
l
=
APK_BLOB_PTR_LEN
(
blob
.
ptr
,
i
);
if
(
r
!=
NULL
)
if
(
r
!=
NULL
)
...
@@ -54,12 +136,12 @@ int apk_blob_spn(apk_blob_t blob, const char *accept, apk_blob_t *l, apk_blob_t
...
@@ -54,12 +136,12 @@ int apk_blob_spn(apk_blob_t blob, const char *accept, apk_blob_t *l, apk_blob_t
return
0
;
return
0
;
}
}
int
apk_blob_cspn
(
apk_blob_t
blob
,
const
char
*
reject
,
apk_blob_t
*
l
,
apk_blob_t
*
r
)
int
apk_blob_cspn
(
apk_blob_t
blob
,
const
apk_spn_match
reject
,
apk_blob_t
*
l
,
apk_blob_t
*
r
)
{
{
int
i
;
int
i
;
for
(
i
=
0
;
i
<
blob
.
len
;
i
++
)
{
for
(
i
=
0
;
i
<
blob
.
len
;
i
++
)
{
if
(
strchr
(
reject
,
blob
.
ptr
[
i
])
!=
NULL
)
{
if
(
test_bit
(
reject
,
blob
.
ptr
[
i
])
)
{
if
(
l
!=
NULL
)
if
(
l
!=
NULL
)
*
l
=
APK_BLOB_PTR_LEN
(
blob
.
ptr
,
i
);
*
l
=
APK_BLOB_PTR_LEN
(
blob
.
ptr
,
i
);
if
(
r
!=
NULL
)
if
(
r
!=
NULL
)
...
@@ -69,6 +151,7 @@ int apk_blob_cspn(apk_blob_t blob, const char *reject, apk_blob_t *l, apk_blob_t
...
@@ -69,6 +151,7 @@ int apk_blob_cspn(apk_blob_t blob, const char *reject, apk_blob_t *l, apk_blob_t
}
}
return
0
;
return
0
;
}
}
#endif
int
apk_blob_rsplit
(
apk_blob_t
blob
,
char
split
,
apk_blob_t
*
l
,
apk_blob_t
*
r
)
int
apk_blob_rsplit
(
apk_blob_t
blob
,
char
split
,
apk_blob_t
*
l
,
apk_blob_t
*
r
)
{
{
...
...
src/database.c
View file @
fe9b4a38
...
@@ -33,6 +33,11 @@
...
@@ -33,6 +33,11 @@
#include "apk_archive.h"
#include "apk_archive.h"
#include "apk_print.h"
#include "apk_print.h"
static
const
apk_spn_match_def
apk_spn_repo_separators
=
{
[
4
]
=
(
1
<<
0
)
/* */
,
[
7
]
=
(
1
<<
2
)
/*:*/
,
};
enum
{
enum
{
APK_DISALLOW_RMDIR
=
0
,
APK_DISALLOW_RMDIR
=
0
,
APK_ALLOW_RMDIR
=
1
APK_ALLOW_RMDIR
=
1
...
@@ -1770,8 +1775,8 @@ int apk_db_add_repository(apk_database_t _db, apk_blob_t _repository)
...
@@ -1770,8 +1775,8 @@ int apk_db_add_repository(apk_database_t _db, apk_blob_t _repository)
if
(
brepo
.
ptr
[
0
]
==
'@'
)
{
if
(
brepo
.
ptr
[
0
]
==
'@'
)
{
apk_blob_pull_char
(
&
brepo
,
'@'
);
apk_blob_pull_char
(
&
brepo
,
'@'
);
apk_blob_cspn
(
brepo
,
": "
,
&
btag
,
&
brepo
);
apk_blob_cspn
(
brepo
,
apk_spn_repo_separators
,
&
btag
,
&
brepo
);
apk_blob_spn
(
brepo
,
": "
,
NULL
,
&
brepo
);
apk_blob_spn
(
brepo
,
apk_spn_repo_separators
,
NULL
,
&
brepo
);
tag_id
=
apk_db_get_tag_id
(
db
,
btag
);
tag_id
=
apk_db_get_tag_id
(
db
,
btag
);
}
}
...
...
src/package.c
View file @
fe9b4a38
...
@@ -29,6 +29,15 @@
...
@@ -29,6 +29,15 @@
#include "apk_database.h"
#include "apk_database.h"
#include "apk_print.h"
#include "apk_print.h"
static
const
apk_spn_match_def
apk_spn_dependency_comparer
=
{
[
7
]
=
(
1
<<
4
)
/*<*/
|
(
1
<<
5
)
/*=*/
|
(
1
<<
6
)
/*<*/
,
};
static
const
apk_spn_match_def
apk_spn_dependency_separator
=
{
[
1
]
=
(
1
<<
2
)
/*\n*/
,
[
4
]
=
(
1
<<
0
)
/* */
,
};
void
apk_pkg_format_plain
(
struct
apk_package
*
pkg
,
apk_blob_t
to
)
void
apk_pkg_format_plain
(
struct
apk_package
*
pkg
,
apk_blob_t
to
)
{
{
/* pkgname-1.0.apk */
/* pkgname-1.0.apk */
...
@@ -200,13 +209,13 @@ void apk_blob_pull_dep(apk_blob_t *b, struct apk_database *db, struct apk_depend
...
@@ -200,13 +209,13 @@ void apk_blob_pull_dep(apk_blob_t *b, struct apk_database *db, struct apk_depend
goto
fail
;
goto
fail
;
/* grap one token */
/* grap one token */
if
(
!
apk_blob_cspn
(
*
b
,
"
\n
"
,
&
bdep
,
NULL
))
if
(
!
apk_blob_cspn
(
*
b
,
apk_spn_dependency_separator
,
&
bdep
,
NULL
))
bdep
=
*
b
;
bdep
=
*
b
;
b
->
ptr
+=
bdep
.
len
;
b
->
ptr
+=
bdep
.
len
;
b
->
len
-=
bdep
.
len
;
b
->
len
-=
bdep
.
len
;
/* skip also all separator chars */
/* skip also all separator chars */
if
(
!
apk_blob_spn
(
*
b
,
"
\n
"
,
NULL
,
b
))
{
if
(
!
apk_blob_spn
(
*
b
,
apk_spn_dependency_separator
,
NULL
,
b
))
{
b
->
ptr
+=
b
->
len
;
b
->
ptr
+=
b
->
len
;
b
->
len
=
0
;
b
->
len
=
0
;
}
}
...
@@ -218,12 +227,12 @@ void apk_blob_pull_dep(apk_blob_t *b, struct apk_database *db, struct apk_depend
...
@@ -218,12 +227,12 @@ void apk_blob_pull_dep(apk_blob_t *b, struct apk_database *db, struct apk_depend
optional
=
1
;
optional
=
1
;
}
}
if
(
apk_blob_cspn
(
bdep
,
"<>="
,
&
bname
,
&
bop
))
{
if
(
apk_blob_cspn
(
bdep
,
apk_spn_dependency_comparer
,
&
bname
,
&
bop
))
{
int
i
;
int
i
;
if
(
mask
==
0
)
if
(
mask
==
0
)
goto
fail
;
goto
fail
;
if
(
!
apk_blob_spn
(
bop
,
"<>="
,
&
bop
,
&
bver
))
if
(
!
apk_blob_spn
(
bop
,
apk_spn_dependency_comparer
,
&
bop
,
&
bver
))
goto
fail
;
goto
fail
;
mask
=
0
;
mask
=
0
;
for
(
i
=
0
;
i
<
bop
.
len
;
i
++
)
{
for
(
i
=
0
;
i
<
bop
.
len
;
i
++
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment