mirror of
https://github.com/BepInEx/mono.git
synced 2026-11-16 11:21:08 -10:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
96c0883549 | ||
|
|
60b980b3bb | ||
|
|
3c84401ec8 | ||
|
|
44162b8a8b | ||
|
|
355944f0d6 | ||
|
|
9f4a644133 | ||
|
|
c83b0a3f98 | ||
|
|
b7422c2c22 | ||
|
|
c9e78b5322 | ||
|
|
7898a926f0 | ||
|
|
a3000fbb7f | ||
|
|
df4669b216 | ||
|
|
76db8b168c | ||
|
|
0f76c2acec | ||
|
|
1a431e6183 | ||
|
|
0e86b9e40b | ||
|
|
ce75ab6aed | ||
|
|
75367e0413 | ||
|
|
044b7d4ac8 | ||
|
|
707e9c6b03 | ||
|
|
ce9765ffe0 | ||
|
|
85d51db4f0 | ||
|
|
af502ec4df | ||
|
|
b72ef417bc | ||
|
|
bc699443c1 | ||
|
|
addce38b83 | ||
|
|
b2250d8ecf | ||
|
|
cfe2428963 | ||
|
|
e51d521ff9 | ||
|
|
d5885b1996 | ||
|
|
b429bfe794 | ||
|
|
48e94bd5f6 | ||
|
|
726b2befe9 | ||
|
|
bff4165b8d | ||
|
|
b4ec38c280 | ||
|
|
d5cfcd6b2a | ||
|
|
1ee454fce3 | ||
|
|
24775d13d4 | ||
|
|
934465474b | ||
|
|
8c1b959850 | ||
|
|
26c39f88fb | ||
|
|
92f7d7ac14 | ||
|
|
2636235a82 | ||
|
|
5267bcb2b7 | ||
|
|
d03c1a55e0 | ||
|
|
63798ae475 | ||
|
|
31c099d7ca | ||
|
|
ad9daeaf58 | ||
|
|
829534374f | ||
|
|
6ce90d742b | ||
|
|
28dcb2abb3 | ||
|
|
1438e3a015 | ||
|
|
b403e9b528 | ||
|
|
f02e94d25c | ||
|
|
c93b4d1722 | ||
|
|
5d37aa59b9 | ||
|
|
3c7e98aa62 | ||
|
|
0e2248ca22 | ||
|
|
ec43cc1dc4 | ||
|
|
3cd2ccce57 | ||
|
|
eaff739a03 | ||
|
|
742e703eb4 | ||
|
|
fe214b46bd | ||
|
|
c843b3f25f | ||
|
|
b5e1cb7236 | ||
|
|
47f6b08657 | ||
|
|
1d8c43241a | ||
|
|
90be24e928 | ||
|
|
34a97709ce | ||
|
|
632c5e8e1c | ||
|
|
b0527fafe3 | ||
|
|
e3a2754a33 | ||
|
|
0deb1fd312 | ||
|
|
3ffbfe94c9 | ||
|
|
51599d15b2 | ||
|
|
68fc0a509f | ||
|
|
6eaec1bb59 | ||
|
|
de06b9c866 | ||
|
|
ec16c55370 | ||
|
|
dcc1d41ffb | ||
|
|
d6af8351b4 | ||
|
|
c3c06baf61 | ||
|
|
c5a0d0e011 | ||
|
|
5e8d4de0f7 | ||
|
|
b4632e0789 | ||
|
|
141d8fafaa | ||
|
|
259864a1d3 | ||
|
|
3eb8d6d178 | ||
|
|
3deebbf487 | ||
|
|
0e486b814f | ||
|
|
04f45d88f9 | ||
|
|
fdd7beb707 | ||
|
|
0ec03cb37c | ||
|
|
03298038d7 | ||
|
|
310bba2a01 | ||
|
|
db62348438 | ||
|
|
f5040c4e67 | ||
|
|
1d366da8f0 | ||
|
|
ed0f1b4992 | ||
|
|
e9f63bbd97 | ||
|
|
640748df04 | ||
|
|
3f3e41781e | ||
|
|
74a8e56233 | ||
|
|
0e38c766cc | ||
|
|
73d4810c70 | ||
|
|
15bd67a390 | ||
|
|
6af040720f | ||
|
|
d7767d7f41 | ||
|
|
ba0a5b09ae | ||
|
|
94d9ccc8b7 | ||
|
|
759ae465ea | ||
|
|
c4c358fcb3 | ||
|
|
a88a2802d8 | ||
|
|
884e4bffa0 | ||
|
|
9417be0f11 | ||
|
|
c212bccc3d | ||
|
|
1dd426f94b | ||
|
|
fe021658d9 |
No files matched your search
@@ -1,47 +0,0 @@
|
||||
<!--
|
||||
If you are new to the project get yourself familiar with https://www.mono-project.com/community/bugs/make-a-good-bug-report/ before filling the issue
|
||||
-->
|
||||
|
||||
## Steps to Reproduce
|
||||
|
||||
1.
|
||||
2.
|
||||
3.
|
||||
|
||||
<!--
|
||||
You may drag & drop the attachment (repro code/solution, screenshot, etc.) onto the issue.
|
||||
-->
|
||||
|
||||
### Current Behavior
|
||||
|
||||
<!--
|
||||
What is the current behavior?
|
||||
-->
|
||||
|
||||
### Expected Behavior
|
||||
|
||||
<!--
|
||||
Please describe the behavior you are expecting
|
||||
-->
|
||||
|
||||
## On which platforms did you notice this
|
||||
|
||||
[ ] macOS
|
||||
[ ] Linux
|
||||
[ ] Windows
|
||||
|
||||
**Version Used**:
|
||||
|
||||
<!--
|
||||
You can use `mono --version` or About dialog to obtain this information.
|
||||
-->
|
||||
|
||||
## Stacktrace
|
||||
|
||||
```
|
||||
Please paste the stack trace here if available.
|
||||
```
|
||||
|
||||
<!--
|
||||
You can join us at https://gitter.im/mono/mono to discuss your reported issue
|
||||
-->
|
||||
@@ -1,9 +0,0 @@
|
||||
|
||||
|
||||
<!--
|
||||
Thank you for your Pull Request!
|
||||
|
||||
If you are new to contributing to Mono, please try to do your best at conforming to our coding guidelines http://www.mono-project.com/community/contributing/coding-guidelines/ but don't worry if you get something wrong. One of the project members will help you to get things landed.
|
||||
|
||||
Does your pull request fix any of the existing issues? Please use the following format: Fixes #issue-number
|
||||
-->
|
||||
+1
-4
@@ -40,12 +40,10 @@ Ankh.NoLoad
|
||||
*.gpState
|
||||
.vscode/
|
||||
*.exp
|
||||
.vs/
|
||||
|
||||
# Tooling
|
||||
_ReSharper*/
|
||||
*.resharper
|
||||
.idea/*
|
||||
[Tt]est[Rr]esult*
|
||||
*.orig
|
||||
*.rej
|
||||
@@ -90,7 +88,6 @@ stamp-h.in
|
||||
*.swp
|
||||
*.o
|
||||
.deps
|
||||
.libs
|
||||
|
||||
# Libtool
|
||||
libtool.m4
|
||||
@@ -131,4 +128,4 @@ mono-*.tar.*
|
||||
tmpinst-dir.stamp
|
||||
msvc/scripts/inputs/
|
||||
extensions-config.h
|
||||
*.mlpd
|
||||
|
||||
Vendored
-91
@@ -1,91 +0,0 @@
|
||||
{
|
||||
"configurations": [
|
||||
{
|
||||
"name": "Mac",
|
||||
"includePath": [
|
||||
"/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1",
|
||||
"/usr/local/include",
|
||||
"/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/9.0.0/include",
|
||||
"/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include",
|
||||
"/usr/include",
|
||||
"${workspaceRoot}",
|
||||
"${workspaceRoot}/mono",
|
||||
"${workspaceRoot}/mono/eglib",
|
||||
"${workspaceRoot}/support"
|
||||
],
|
||||
"defines": [],
|
||||
"intelliSenseMode": "clang-x64",
|
||||
"browse": {
|
||||
"path": [
|
||||
"/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1",
|
||||
"/usr/local/include",
|
||||
"/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/9.0.0/include",
|
||||
"/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include",
|
||||
"/usr/include",
|
||||
"${workspaceRoot}",
|
||||
"${workspaceRoot}/mono",
|
||||
"${workspaceRoot}/mono/eglib",
|
||||
"${workspaceRoot}/support"
|
||||
],
|
||||
"limitSymbolsToIncludedHeaders": true,
|
||||
"databaseFilename": ""
|
||||
},
|
||||
"macFrameworkPath": [
|
||||
"/System/Library/Frameworks",
|
||||
"/Library/Frameworks"
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "Linux",
|
||||
"includePath": [
|
||||
"/usr/include",
|
||||
"/usr/local/include",
|
||||
"${workspaceRoot}",
|
||||
"${workspaceRoot}/mono",
|
||||
"${workspaceRoot}/mono/eglib",
|
||||
"${workspaceRoot}/support"
|
||||
],
|
||||
"defines": [],
|
||||
"intelliSenseMode": "clang-x64",
|
||||
"browse": {
|
||||
"path": [
|
||||
"/usr/include",
|
||||
"/usr/local/include",
|
||||
"${workspaceRoot}",
|
||||
"${workspaceRoot}/mono",
|
||||
"${workspaceRoot}/mono/eglib",
|
||||
"${workspaceRoot}/support"
|
||||
],
|
||||
"limitSymbolsToIncludedHeaders": true,
|
||||
"databaseFilename": ""
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "Win32",
|
||||
"includePath": [
|
||||
"C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/include",
|
||||
"${workspaceRoot}",
|
||||
"${workspaceRoot}/mono",
|
||||
"${workspaceRoot}/mono/eglib",
|
||||
"${workspaceRoot}/support"
|
||||
],
|
||||
"defines": [
|
||||
"_DEBUG",
|
||||
"UNICODE"
|
||||
],
|
||||
"intelliSenseMode": "msvc-x64",
|
||||
"browse": {
|
||||
"path": [
|
||||
"C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/include/*",
|
||||
"${workspaceRoot}",
|
||||
"${workspaceRoot}/mono",
|
||||
"${workspaceRoot}/mono/eglib",
|
||||
"${workspaceRoot}/support"
|
||||
],
|
||||
"limitSymbolsToIncludedHeaders": true,
|
||||
"databaseFilename": ""
|
||||
}
|
||||
}
|
||||
],
|
||||
"version": 4
|
||||
}
|
||||
+55
-129
@@ -1,136 +1,62 @@
|
||||
# Mono Code Owners File
|
||||
#
|
||||
# GitHub uses this file to determine who to assign for reviews
|
||||
# on pull requests. Please keep this file alphabetically sorted.
|
||||
# GitHub uses this file to determine who to ping for reviews on pull requests.
|
||||
# If you're the primary maintainer of an area of Mono and you don't mind
|
||||
# reviewing pull requests, please add yourself to this file. You may want to
|
||||
# avoid adding entries for commonly changed or automatically generated files
|
||||
# (e.g. stuff in external/, or various generated *.csproj files) so as not to
|
||||
# get spammed with emails.
|
||||
#
|
||||
# References:
|
||||
# Note that if two patterns match a file, the later pattern takes precedence.
|
||||
#
|
||||
# Please keep this file alphabetically sorted.
|
||||
#
|
||||
# Reference:
|
||||
#
|
||||
# https://github.com/blog/2392-introducing-code-owners
|
||||
# https://help.github.com/articles/about-codeowners
|
||||
|
||||
|
||||
# These owners will be the default owners for everything in the repo.
|
||||
* @luhenry @marek-safar
|
||||
|
||||
# Order is important. The last matching pattern has the most precedence.
|
||||
|
||||
/acceptance-tests @akoeplinger
|
||||
/acceptance-tests/profiler-stress* @alexrp
|
||||
|
||||
/data @marek-safar @akoeplinger @luhenry
|
||||
/data/gdb @vargaz
|
||||
/data/lldb @lewurm @vargaz
|
||||
|
||||
/docs @luhenry @marek-safar
|
||||
/docs/sources/mono-api-profiler.html @alexrp
|
||||
|
||||
/external @marek-safar @luhenry
|
||||
/external/binary-reference-assemblies @marek-safar @akoeplinger
|
||||
/external/bockbuild @akoeplinger @alexischr
|
||||
/external/boringssl @baulig
|
||||
/external/nuget-buildtasks @radical @akoeplinger
|
||||
|
||||
/libgc @BrzVlad @vargaz @luhenry
|
||||
|
||||
/llvm @vargaz @luhenry
|
||||
|
||||
/man @marek-safar @miguel @luhenry
|
||||
/man/*prof* @alexrp
|
||||
|
||||
/mcs @marek-safar @luhenry
|
||||
|
||||
/mcs/build @marek-safar @akoeplinger
|
||||
|
||||
/mcs/class @marek-safar @akoeplinger
|
||||
/mcs/class/corlib/System.Reflection*/ @vargaz @lambdageek
|
||||
/mcs/class/Mono.Btls.Interface @baulig
|
||||
/mcs/class/Mono.Data.Tds @egorbo
|
||||
/mcs/class/Mono.Debugger.Soft @vargaz
|
||||
/mcs/class/Mono.Options @jonpryor
|
||||
/mcs/class/Mono.Profiler.Log @alexrp
|
||||
/mcs/class/Mono.Security/Mono.Security/Interface @baulig
|
||||
/mcs/class/System/Mono.AppleTls @baulig
|
||||
/mcs/class/System/Mono.Btls @baulig
|
||||
/mcs/class/System/Mono.Net.Security @baulig
|
||||
/mcs/class/System/Mono.Security.Interface @baulig
|
||||
/mcs/class/System.Data* @egorbo
|
||||
|
||||
/mcs/errors @marek-safar
|
||||
/mcs/ilasm @marek-safar
|
||||
/mcs/jay @marek-safar
|
||||
/mcs/mcs @marek-safar @lewurm
|
||||
/mcs/tests @marek-safar
|
||||
/mcs/tools @marek-safar @akoeplinger
|
||||
|
||||
/mono @luhenry
|
||||
|
||||
/mono/btls @baulig
|
||||
/mono/dis @lambdageek @vargaz
|
||||
/mono/eglib @kumpera @vargaz @luhenry
|
||||
|
||||
/mono/metadata @vargaz @kumpera
|
||||
/mono/metadata/*verify* @kumpera
|
||||
/mono/metadata/*profiler* @alexrp
|
||||
/mono/metadata/monitor* @brzvlad
|
||||
/mono/metadata/sgen* @brzvlad
|
||||
/mono/metadata/threads* @luhenry @kumpera
|
||||
/mono/metadata/threadpool* @luhenry
|
||||
/mono/metadata/w32* @luhenry
|
||||
/mono/metadata/*-win* @lateralusX @luhenry
|
||||
|
||||
/mono/mini @vargaz @kumpera
|
||||
/mono/mini/*cfgdump* @lewurm
|
||||
/mono/mini/*exceptions* @lewurm
|
||||
/mono/mini/*ppc* @lewurm
|
||||
/mono/mini/*type-check* @lewurm
|
||||
/mono/mini/interp/* @lewurm @BrzVlad
|
||||
/mono/mini/*profiler* @alexrp
|
||||
/mono/mini/debugger-agent.c @DavidKarlas
|
||||
|
||||
/mono/profiler @alexrp @kumpera
|
||||
|
||||
/mono/sgen @BrzVlad @kumpera
|
||||
|
||||
/mono/utils @kumpera @vargaz
|
||||
/mono/utils/atomic* @alexrp
|
||||
/mono/utils/mono-hwcap* @alexrp
|
||||
/mono/utils/mono-mem* @alexrp
|
||||
/mono/utils/mono-threads* @luhenry @kumpera
|
||||
/mono/utils/*-win* @lateralusX @kumpera
|
||||
|
||||
/msvc @lateralusX @luhenry
|
||||
/msvc/*profiler* @alexrp
|
||||
/msvc/scripts @akoeplinger @kg
|
||||
|
||||
/packaging/ @alexischr @akoeplinger @luhenry @directhex
|
||||
/packaging/MacSDK/msbuild.py @radical @akoeplinger
|
||||
|
||||
/runtime @akoeplinger @marek-safar @luhenry
|
||||
|
||||
/samples @luhenry
|
||||
/samples/profiler @alexrp
|
||||
/samples/size @alexrp
|
||||
|
||||
/scripts @akoeplinger @luhenry
|
||||
/scripts/ci @akoeplinger @alexischr
|
||||
/scripts/ci/run-test-profiler-stress-tests.sh @alexrp
|
||||
|
||||
/sdks @marek-safar @luhenry
|
||||
/sdks/builds/android* @luhenry @jonpryor
|
||||
/sdks/builds/mxe* @luhenry @jonpryor
|
||||
/sdks/builds/ios* @vargaz @rolfbjarne
|
||||
/sdks/wasm @kumpera @lrz
|
||||
/sdks/ios @vargaz @rolfbjarne
|
||||
/sdks/android @luhenry @jonpryor
|
||||
|
||||
/support @luhenry @vargaz
|
||||
|
||||
/tools @kumpera @luhenry
|
||||
/tools/checker @tritao
|
||||
/tools/crash-bisector @kumpera
|
||||
/tools/locale-builder @marek-safar
|
||||
/tools/monograph @vargaz
|
||||
/tools/nuget-hash-extractor @marek-safar
|
||||
/tools/offsets-tool @lewurm @rolfbjarne
|
||||
/tools/pedump @kumpera @lambdageek
|
||||
/tools/sgen @brzvlad
|
||||
acceptance-tests/* @akoeplinger
|
||||
acceptance-tests/profiler-stress* @alexrp
|
||||
docs/sources/mono-api-profiler.html @alexrp
|
||||
man/mprof-report.1 @alexrp
|
||||
mcs/build @marek-safar
|
||||
mcs/class @marek-safar
|
||||
mcs/errors @marek-safar
|
||||
mcs/mcs @marek-safar
|
||||
mcs/tests @marek-safar
|
||||
mcs/class/corlib/System.Reflection*/ @vargaz @lambdageek
|
||||
mcs/class/Mono.Btls.Interface @baulig
|
||||
mcs/class/Mono.Data.Tds @egorbo
|
||||
mcs/class/Mono.Debugger.Soft @vargaz
|
||||
mcs/class/Mono.Options @jonpryor
|
||||
mcs/class/Mono.Profiler.Log @alexrp
|
||||
mcs/class/Mono.Security/Mono.Security/Interface @baulig
|
||||
mcs/class/System/Mono.AppleTls @baulig
|
||||
mcs/class/System/Mono.Btls @baulig
|
||||
mcs/class/System/Mono.Net.Security @baulig
|
||||
mcs/class/System/Mono.Security.Interface @baulig
|
||||
mcs/class/System.Data @egorbo
|
||||
mono/metadata/*profiler* @alexrp
|
||||
mono/metadata/monitor* @brzvlad
|
||||
mono/metadata/sgen* @brzvlad
|
||||
mono/metadata/threads* @luhenry @kumpera
|
||||
mono/metadata/threadpool* @luhenry
|
||||
mono/metadata/w32* @luhenry
|
||||
mono/mini/*profiler* @alexrp
|
||||
mono/profiler @alexrp
|
||||
mono/sgen @brzvlad
|
||||
mono/utils/atomic* @alexrp
|
||||
mono/utils/mono-hwcap* @alexrp
|
||||
mono/utils/mono-mem* @alexrp
|
||||
mono/utils/mono-threads* @luhenry @kumpera
|
||||
msvc/*profiler* @alexrp
|
||||
msvc/scripts @akoeplinger
|
||||
packaging/Windows @akoeplinger
|
||||
samples/profiler @alexrp
|
||||
samples/size @alexrp
|
||||
scripts/ci/run-jenkins.sh @akoeplinger
|
||||
scripts/ci/run-test-acceptance-tests.sh @akoeplinger
|
||||
scripts/ci/run-test-default.sh @akoeplinger
|
||||
scripts/ci/run-test-profiler-stress-tests.sh @alexrp
|
||||
scripts/ci/util.sh @akoeplinger
|
||||
@@ -32,12 +32,7 @@ file in this directory.
|
||||
CLA
|
||||
=======
|
||||
|
||||
Contributions are now taken under the [.NET Foundation CLA](https://cla.dotnetfoundation.org/).
|
||||
|
||||
Code Review
|
||||
=======
|
||||
We are requiring code reviews before merging a pull request.
|
||||
GitHub won't let you merge a PR until someone from the Mono team approves it.
|
||||
Contributions are now taken under the [.NET Foundation CLA](https://cla2.dotnetfoundation.org/).
|
||||
|
||||
Testing
|
||||
=======
|
||||
@@ -46,7 +46,7 @@ embeddable runtime:
|
||||
|
||||
* mono/utils/bsearch.c: BSD license.
|
||||
|
||||
* mono/metadata/w32file-unix-glob.c, w32file-unix-glob.h: BSD license
|
||||
* mono/io-layer/wapi_glob.h, wapi_glob.c: BSD license
|
||||
|
||||
Class Library code
|
||||
==================
|
||||
|
||||
+24
-12
@@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS = -I m4
|
||||
|
||||
AM_CFLAGS = $(WERROR_CFLAGS)
|
||||
|
||||
MONOTOUCH_SUBDIRS = $(libgc_dir) mono
|
||||
MONOTOUCH_SUBDIRS = $(libgc_dir) eglib/src mono
|
||||
|
||||
# Some tools might not build when cross-compiling
|
||||
if CROSS_COMPILING
|
||||
@@ -11,9 +11,9 @@ else
|
||||
tools_dir = tools
|
||||
endif
|
||||
|
||||
SUBDIRS = mk po $(libgc_dir) mono $(ikvm_native_dir) support data runtime scripts man samples $(tools_dir) msvc $(docs_dir) acceptance-tests llvm
|
||||
SUBDIRS = po $(libgc_dir) eglib mono $(ikvm_native_dir) support data runtime scripts man samples $(tools_dir) msvc $(docs_dir) acceptance-tests llvm
|
||||
# Keep in sync with SUBDIRS
|
||||
DIST_SUBDIRS = m4 mk po $(libgc_dir) mono ikvm-native support data runtime scripts man samples tools msvc docs acceptance-tests llvm
|
||||
DIST_SUBDIRS = m4 po $(libgc_dir) eglib mono ikvm-native support data runtime scripts man samples tools msvc docs acceptance-tests llvm
|
||||
|
||||
all: update_submodules
|
||||
|
||||
@@ -44,7 +44,6 @@ dist-hook:
|
||||
rm -rf `find $(top_distdir)/external -path '*\.git'`
|
||||
rm -f `find $(top_distdir)/external -path '*\.exe' -not -path '*/roslyn-binaries/*'`
|
||||
rm -f `find $(top_distdir)/external -path '*\.dll' -not -path '*/binary-reference-assemblies/*' -not -path '*/roslyn-binaries/*'`
|
||||
rm -rf "$(top_distdir)/external/linker/linker/Tests"
|
||||
|
||||
pkgconfigdir = $(libdir)/pkgconfig
|
||||
noinst_DATA = mono-uninstalled.pc
|
||||
@@ -110,12 +109,29 @@ monotouch-do-clean:
|
||||
|
||||
endif
|
||||
|
||||
win32getdeps:
|
||||
wget http://www.go-mono.com/archive/pkgconfig-0.11-20020310.zip
|
||||
wget http://www.go-mono.com/archive/glib-2.0.4-20020703.zip
|
||||
wget http://www.go-mono.com/archive/glib-dev-2.0.4-20020703.zip
|
||||
wget http://www.go-mono.com/archive/libiconv-1.7.zip
|
||||
wget http://www.go-mono.com/archive/libiconv-dev-1.7.zip
|
||||
wget http://www.go-mono.com/archive/libintl-0.10.40-20020101.zip
|
||||
unzip -n -d / pkgconfig-0.11-20020310.zip
|
||||
unzip -n -d / glib-2.0.4-20020703.zip
|
||||
unzip -n -d / glib-dev-2.0.4-20020703.zip
|
||||
unzip -n -d / libiconv-1.7.zip
|
||||
unzip -n -d / libiconv-dev-1.7.zip
|
||||
unzip -n -d / libintl-0.10.40-20020101.zip
|
||||
|
||||
win32setup:
|
||||
makensis /DMILESTONE=$(VERSION) /DSOURCE_INSTALL_DIR=$(SOURCE_INSTALL_DIR) /DBUILDNUM=$(BUILDNUM) monowiz.win32.nsi
|
||||
|
||||
update-csproj:
|
||||
-rm msvc/scripts/order
|
||||
-rm msvc/scripts/order.xml
|
||||
-rm -rf msvc/scripts/inputs
|
||||
-mkdir msvc/scripts/inputs
|
||||
(cd runtime; $(MAKE) V=1 extra_targets=csproj-local)
|
||||
(cd runtime; make V=1 extra_targets=csproj-local)
|
||||
|
||||
package-inputs:
|
||||
echo '<?xml version="1.0" encoding="utf-8"?>' > msvc/scripts/order.xml
|
||||
@@ -144,10 +160,6 @@ update-llvm-version:
|
||||
|
||||
|
||||
update-solution-files:
|
||||
(pushd msvc/scripts; rm genproj.exe; $(MAKE) genproj.exe; popd)
|
||||
$(MAKE) update-csproj
|
||||
$(MAKE) package-inputs
|
||||
(cd msvc/scripts; mono --debug genproj.exe $(GENPROJ_ARGS))
|
||||
|
||||
update-solution-files-with-tests:
|
||||
$(MAKE) "GENPROJ_ARGS=2012 true true" update-solution-files
|
||||
make update-csproj
|
||||
make package-inputs
|
||||
(cd msvc/scripts; make genproj.exe; mono genproj.exe)
|
||||
@@ -19,30 +19,30 @@ The Mono project is part of the [.NET Foundation](http://www.dotnetfoundation.or
|
||||
|
||||
| OS | Architecture | Status |
|
||||
|--------------|--------------------|------------------------------|
|
||||
| Debian 9 | amd64 | [![debian-9-amd64][1]][2] |
|
||||
| Debian 9 | i386 | [![debian-9-i386][3]][4] |
|
||||
| Debian 9 | armel | [![debian-9-armel][5]][6] |
|
||||
| Debian 9 | armhf | [![debian-9-armhf][7]][8] |
|
||||
| Debian 9 | arm64 | [![debian-9-arm64][9]][10] |
|
||||
| Ubuntu 14.04 | amd64 | [![ubuntu-1404-amd64][1]][2] |
|
||||
| Ubuntu 14.04 | i386 | [![ubuntu-1404-i386][3]][4] |
|
||||
| Debian 8 | armel | [![debian-8-armel][5]][6] |
|
||||
| Debian 8 | armhf | [![debian-8-armhf][7]][8] |
|
||||
| Debian 8 | arm64 | [![debian-8-arm64][9]][10] |
|
||||
| OS X | amd64 | [![osx-amd64][11]][12] |
|
||||
| OS X | i386 | [![osx-i386][13]][14] |
|
||||
| Windows | amd64 | [![windows-amd64][15]][16] |
|
||||
| Windows | i386 | [![windows-i386][17]][18] |
|
||||
| Windows | i386 | [![windows-amd64][17]][18] |
|
||||
| CentOS | s390x (cs) | [![centos-s390x][19]][20] |
|
||||
| Debian 9 | ppc64el (cs) | [![debian-9-ppc64el][21]][22]|
|
||||
| Debian 8 | ppc64el (cs) | [![debian-8-ppc64el][21]][22]|
|
||||
|
||||
_(cs) = community supported architecture_
|
||||
|
||||
[1]: https://jenkins.mono-project.com/job/test-mono-mainline-linux/label=debian-9-amd64/badge/icon
|
||||
[2]: https://jenkins.mono-project.com/job/test-mono-mainline-linux/label=debian-9-amd64
|
||||
[3]: https://jenkins.mono-project.com/job/test-mono-mainline-linux/label=debian-9-i386/badge/icon
|
||||
[4]: https://jenkins.mono-project.com/job/test-mono-mainline-linux/label=debian-9-i386/
|
||||
[5]: https://jenkins.mono-project.com/job/test-mono-mainline-linux/label=debian-9-armel/badge/icon
|
||||
[6]: https://jenkins.mono-project.com/job/test-mono-mainline-linux/label=debian-9-armel/
|
||||
[7]: https://jenkins.mono-project.com/job/test-mono-mainline-linux/label=debian-9-armhf/badge/icon
|
||||
[8]: https://jenkins.mono-project.com/job/test-mono-mainline-linux/label=debian-9-armhf/
|
||||
[9]: https://jenkins.mono-project.com/job/test-mono-mainline-linux/label=debian-9-arm64/badge/icon
|
||||
[10]: https://jenkins.mono-project.com/job/test-mono-mainline-linux/label=debian-9-arm64/
|
||||
[1]: https://jenkins.mono-project.com/job/test-mono-mainline-linux/label=ubuntu-1404-amd64/badge/icon
|
||||
[2]: https://jenkins.mono-project.com/job/test-mono-mainline-linux/label=ubuntu-1404-amd64
|
||||
[3]: https://jenkins.mono-project.com/job/test-mono-mainline-linux/label=ubuntu-1404-i386/badge/icon
|
||||
[4]: https://jenkins.mono-project.com/job/test-mono-mainline-linux/label=ubuntu-1404-i386/
|
||||
[5]: https://jenkins.mono-project.com/job/test-mono-mainline-linux/label=debian-8-armel/badge/icon
|
||||
[6]: https://jenkins.mono-project.com/job/test-mono-mainline-linux/label=debian-8-armel/
|
||||
[7]: https://jenkins.mono-project.com/job/test-mono-mainline-linux/label=debian-8-armhf/badge/icon
|
||||
[8]: https://jenkins.mono-project.com/job/test-mono-mainline-linux/label=debian-8-armhf/
|
||||
[9]: https://jenkins.mono-project.com/job/test-mono-mainline-linux/label=debian-8-arm64/badge/icon
|
||||
[10]: https://jenkins.mono-project.com/job/test-mono-mainline-linux/label=debian-8-arm64/
|
||||
[11]: https://jenkins.mono-project.com/job/test-mono-mainline/label=osx-amd64/badge/icon
|
||||
[12]: https://jenkins.mono-project.com/job/test-mono-mainline/label=osx-amd64/
|
||||
[13]: https://jenkins.mono-project.com/job/test-mono-mainline/label=osx-i386/badge/icon
|
||||
@@ -53,8 +53,8 @@ _(cs) = community supported architecture_
|
||||
[18]: https://jenkins.mono-project.com/job/z/label=w32/
|
||||
[19]: https://jenkins.mono-project.com/job/test-mono-mainline-community/label=centos-s390x/badge/icon
|
||||
[20]: https://jenkins.mono-project.com/job/test-mono-mainline-community/label=centos-s390x
|
||||
[21]: https://jenkins.mono-project.com/job/test-mono-mainline-community-chroot/label=debian-9-ppc64el/badge/icon
|
||||
[22]: https://jenkins.mono-project.com/job/test-mono-mainline-community-chroot/label=debian-9-ppc64el
|
||||
[21]: https://jenkins.mono-project.com/job/test-mono-mainline-community-chroot/label=debian-8-ppc64el/badge/icon
|
||||
[22]: https://jenkins.mono-project.com/job/test-mono-mainline-community-chroot/label=debian-8-ppc64el
|
||||
|
||||
Compilation and Installation
|
||||
============================
|
||||
@@ -111,7 +111,7 @@ Once you have installed the software, you can run a few programs:
|
||||
|
||||
* `mono program.exe` runtime engine
|
||||
|
||||
* `mcs program.cs` C# compiler
|
||||
* `mcs program.cs` C# compiler
|
||||
|
||||
* `monodis program.exe` CIL Disassembler
|
||||
|
||||
@@ -128,14 +128,6 @@ Directory Roadmap
|
||||
|
||||
* `external/` - Git submodules for external libraries (Newtonsoft.Json, ikvm, etc).
|
||||
|
||||
* `ikvm-native/` - Glue code for ikvm.
|
||||
|
||||
* `libgc/` - The (deprecated) Boehm GC implementation.
|
||||
|
||||
* `llvm/` - Utility Makefiles for integrating the Mono LLVM fork.
|
||||
|
||||
* `m4/` - General utility Makefiles.
|
||||
|
||||
* `man/` - Manual pages for the various Mono commands and programs.
|
||||
|
||||
* `mcs/` - The class libraries, compiler and tools
|
||||
@@ -150,52 +142,26 @@ Directory Roadmap
|
||||
|
||||
* `arch/` - Architecture specific portions.
|
||||
|
||||
* `benchmark/` - A collection of benchmarks.
|
||||
|
||||
* `btls/` - Build files for the BTLS library which incorporates BoringSSL.
|
||||
|
||||
* `cil/` - Common Intermediate Representation, XML
|
||||
definition of the CIL bytecodes.
|
||||
|
||||
* `dis/` - CIL executable Disassembler.
|
||||
* `dis/` - CIL executable Disassembler
|
||||
|
||||
* `eglib/` - Independent implementation of the glib API.
|
||||
* `io-layer/` - The I/O layer and system abstraction for
|
||||
emulating the .NET IO model.
|
||||
|
||||
* `metadata/` - The object system and metadata reader.
|
||||
|
||||
* `mini/` - The Just in Time Compiler.
|
||||
|
||||
* `profiler/` - The profiler implementation.
|
||||
|
||||
* `sgen/` - The SGen Garbage Collector implementation.
|
||||
|
||||
* `tests/` - The main runtime tests.
|
||||
|
||||
* `unit-tests/` - Additional runtime unit tests.
|
||||
|
||||
* `utils/` - Utility functions used across the runtime codebase.
|
||||
|
||||
* `msvc/` - Logic for the MSVC / Visual Studio based runtime and BCL build system.
|
||||
The latter is experimental at the moment.
|
||||
|
||||
* `packaging/` - Packaging logic for the OS X and Windows Mono packages.
|
||||
|
||||
* `po/` - Translation files.
|
||||
|
||||
* `runtime/` - A directory that contains the Makefiles that link the
|
||||
mono/ and mcs/ build systems.
|
||||
|
||||
* `samples/` - Some simple sample programs on uses of the Mono
|
||||
runtime as an embedded library.
|
||||
* `samples/` -Some simple sample programs on uses of the Mono
|
||||
runtime as an embedded library.
|
||||
|
||||
* `scripts/` - Scripts used to invoke Mono and the corresponding program.
|
||||
|
||||
* `sdks/` - A new way of embedding Mono into Xamarin.iOS, Xamarin.Android and other products.
|
||||
|
||||
* `support/` - Various support libraries.
|
||||
|
||||
* `tools/` - A collection of tools, mostly used during Mono development.
|
||||
|
||||
Contributing to Mono
|
||||
====================
|
||||
|
||||
@@ -208,7 +174,8 @@ section.
|
||||
Reporting bugs
|
||||
==============
|
||||
|
||||
To submit bug reports, please [open an issue on the mono GitHub repo](https://github.com/mono/mono/issues/new).
|
||||
To submit bug reports, please use [Xamarin's
|
||||
Bugzilla](https://bugzilla.xamarin.com/)
|
||||
|
||||
Please use the search facility to ensure the same bug hasn't already
|
||||
been submitted and follow our
|
||||
@@ -241,12 +208,12 @@ Disables the inclusion of a Boehm garbage collector.
|
||||
|
||||
* This defaults to `included`.
|
||||
|
||||
* `--enable-cooperative-suspend`
|
||||
* `--with-cooperative-gc`
|
||||
|
||||
* If you pass this flag the Mono runtime is configured to only use
|
||||
the cooperative mode of the garbage collector. If you do not pass
|
||||
this flag, then you can control at runtime the use of the
|
||||
cooperative GC mode by setting the `MONO_ENABLE_COOP_SUSPEND` flag.
|
||||
cooperative GC mode by setting the `MONO_ENABLE_COOP` flag.
|
||||
|
||||
* `--with-tls=__thread,pthread`
|
||||
|
||||
@@ -341,6 +308,16 @@ should be used.
|
||||
|
||||
* Or you can specify a path to a libgdiplus.
|
||||
|
||||
* `--disable-shared-memory`
|
||||
|
||||
* Use this option to disable the use of shared memory in
|
||||
Mono (this is equivalent to setting the MONO_DISABLE_SHM
|
||||
environment variable, although this removes the feature
|
||||
completely).
|
||||
|
||||
* Disabling the shared memory support will disable certain
|
||||
features like cross-process named mutexes.
|
||||
|
||||
* `--enable-minimal=LIST`
|
||||
|
||||
* Use this feature to specify optional runtime
|
||||
@@ -506,16 +483,6 @@ http://code.google.com/p/nativeclient/
|
||||
* Currently this is used with Mono's AOT engine as
|
||||
Native Client does not support JIT engines yet.
|
||||
|
||||
* `--enable-wasm`
|
||||
|
||||
* Use this option to configure mono to run on WebAssembly. It will
|
||||
set both host and target to the WebAssembly triplet. This overrides
|
||||
the values passed to `--host` or `--target` and ignored what config.sub guesses.
|
||||
|
||||
This is a workaround to enable usage of old automake versions that don't
|
||||
recognize the wasm triplet.
|
||||
|
||||
|
||||
Working With Submodules
|
||||
=======================
|
||||
|
||||
@@ -575,7 +542,7 @@ file for information about Microsoft's patent grant.
|
||||
Mono Trademark Use Policy
|
||||
=========================
|
||||
|
||||
The use of trademarks and logos for Mono can be found [here](http://www.dotnetfoundation.org/legal/mono-tm).
|
||||
The use of trademarks and logos for Mono can be found [here] (http://www.dotnetfoundation.org/legal/mono-tm).
|
||||
|
||||
Maintaining the Class Library Solution Files
|
||||
============================================
|
||||
|
||||
@@ -5,7 +5,7 @@ CORECLR_PATH=$(ACCEPTANCE_TESTS_PATH)/coreclr
|
||||
MSTESTSUITE_PATH=$(ACCEPTANCE_TESTS_PATH)/ms-test-suite
|
||||
|
||||
CLEANFILES = *.dll *.exe *.mdb
|
||||
EXTRA_DIST=README.md SUBMODULES.json versions.mk profiler-stress.mk roslyn.mk coreclr.mk ms-test-suite.mk
|
||||
EXTRA_DIST=README.md SUBMODULES.json versions.mk roslyn.mk coreclr.mk ms-test-suite.mk
|
||||
|
||||
CLASS=$(mcs_topdir)/class/lib/$(DEFAULT_PROFILE)
|
||||
TOOLS_CLASS=$(mcs_topdir)/class/lib/build
|
||||
@@ -14,7 +14,6 @@ RUNTIME = MONO_PATH=$(CLASS) $(abs_top_builddir)/runtime/mono-wrapper --debug
|
||||
TOOLS_RUNTIME = MONO_PATH=$(TOOLS_CLASS) $(abs_top_builddir)/runtime/mono-wrapper --debug
|
||||
MCS = $(TOOLS_RUNTIME) $(CSC) -nologo -noconfig -lib:$(CLASS) -r:System.dll -r:System.Core.dll -r:System.Xml.dll -r:Microsoft.CSharp.dll
|
||||
ILASM = $(TOOLS_RUNTIME) $(TOOLS_CLASS)/ilasm.exe
|
||||
XUNIT = $(RUNTIME) $(abs_top_builddir)/external/xunit-binaries/xunit.console.exe
|
||||
|
||||
include versions.mk
|
||||
include profiler-stress.mk
|
||||
|
||||
@@ -1,16 +1,16 @@
|
||||
[
|
||||
{
|
||||
"name": "roslyn",
|
||||
"url": "git://github.com/mono/roslyn.git",
|
||||
"rev": "380eec412868464a132cdcd3a45ef457fab6e060",
|
||||
"remote-branch": "origin/mono-testing",
|
||||
"branch": "mono-testing",
|
||||
"url": "git://github.com/dotnet/roslyn.git",
|
||||
"rev": "322bd5b2bbf07df6a67de35cbcb2365484412f70",
|
||||
"remote-branch": "origin/master",
|
||||
"branch": "master",
|
||||
"directory": "roslyn"
|
||||
},
|
||||
{
|
||||
"name": "coreclr",
|
||||
"url": "git://github.com/mono/coreclr.git",
|
||||
"rev": "aa62c0382ae79562293f3ea1a94ef0f16f80f498",
|
||||
"rev": "c7da48acf72c40c0c0ed1a80ebfacea21bb3a271",
|
||||
"remote-branch": "origin/mono",
|
||||
"branch": "mono",
|
||||
"directory": "coreclr"
|
||||
@@ -18,7 +18,7 @@
|
||||
{
|
||||
"name": "ms-test-suite",
|
||||
"url": "[email protected]:xamarin/ms-test-suite.git",
|
||||
"rev": "67f29dfc0741b5311dd746c75760963a2915e648",
|
||||
"rev": "73c155f76b55839f26ba707d6d40091060e4f5d8",
|
||||
"remote-branch": "origin/master",
|
||||
"branch": "master",
|
||||
"directory": "ms-test-suite"
|
||||
@@ -31,4 +31,4 @@
|
||||
"branch": "master",
|
||||
"directory": "benchmarker"
|
||||
}
|
||||
]
|
||||
]
|
||||
@@ -32,7 +32,7 @@ coreclr-runtest-coremanglib: coreclr-validate test-runner.exe $(CORECLR_COREMANG
|
||||
check-coreclr: coreclr-compile-tests coreclr-runtest-basic coreclr-runtest-coremanglib
|
||||
|
||||
coreclr-gcstress: coreclr-validate GCStressTests.exe $(CORECLR_STRESSTESTSI_CS)
|
||||
BVT_ROOT=$(realpath $(CORECLR_PATH)/tests/src/GC/Stress/Tests) $(RUNTIME) GCStressTests.exe $(CORECLR_PATH)/tests/src/GC/Stress/$(if $(CI_PR),testmix_gc_pr.config,testmix_gc.config); if [ $$? -ne 100 ]; then exit 1; fi
|
||||
BVT_ROOT=$(realpath $(CORECLR_PATH)/tests/src/GC/Stress/Tests) $(RUNTIME) GCStressTests.exe $(CORECLR_PATH)/tests/src/GC/Stress/testmix_gc.config; if [ $$? -ne 100 ]; then exit 1; fi
|
||||
|
||||
# Output a variable in $(2) to the file $(1), separated by newline characters
|
||||
# we need to do it in groups of 100 entries to make sure we don't exceed shell char limits
|
||||
@@ -2217,6 +2217,7 @@ CORECLR_COREMANGLIB_TEST_CS_SRC= \
|
||||
$(CORECLR_PATH)/tests/src/CoreMangLib/cti/system/gc/gcgettotalmemory.cs \
|
||||
$(CORECLR_PATH)/tests/src/CoreMangLib/cti/system/gc/gckeepalive.cs \
|
||||
$(CORECLR_PATH)/tests/src/CoreMangLib/cti/system/gc/gcmaxgeneration.cs \
|
||||
$(CORECLR_PATH)/tests/src/CoreMangLib/cti/system/gc/gcsuppressfinalize.cs \
|
||||
$(CORECLR_PATH)/tests/src/CoreMangLib/cti/system/gc/gcwaitforpendingfinalizers.cs \
|
||||
$(CORECLR_PATH)/tests/src/CoreMangLib/cti/system/globalization/calendarweekrule/calendarweekrulefirstday.cs \
|
||||
$(CORECLR_PATH)/tests/src/CoreMangLib/cti/system/globalization/calendarweekrule/calendarweekrulefirstfourdayweek.cs \
|
||||
@@ -3715,7 +3716,7 @@ CORECLR_DISABLED_TEST_CS_SRC += \
|
||||
CORECLR_DISABLED_TEST_CS_SRC += \
|
||||
$(CORECLR_PATH)/tests/src/readytorun/main.cs \
|
||||
$(CORECLR_PATH)/tests/src/readytorun/test.cs
|
||||
|
||||
|
||||
# relies on a referenced managed or native assembly, to complicated here:
|
||||
CORECLR_DISABLED_TEST_CS_SRC += \
|
||||
$(CORECLR_PATH)/tests/src/Regressions/assemblyref/assem.cs \
|
||||
@@ -3855,7 +3856,7 @@ CORECLR_DISABLED_TEST_CS_SRC += \
|
||||
CORECLR_DISABLED_TEST_CS_SRC += \
|
||||
$(CORECLR_PATH)/tests/src/CoreMangLib/cti/system/datetime/cfdatetimetools.cs \
|
||||
$(CORECLR_PATH)/tests/src/CoreMangLib/cti/system/datetime/datetimeisdaylightsavingtime.cs
|
||||
|
||||
|
||||
# relies on delegatedefinitions.cs helper
|
||||
CORECLR_DISABLED_TEST_CS_SRC += \
|
||||
$(CORECLR_PATH)/tests/src/CoreMangLib/cti/system/multicastdelegate/multicastdelegatector.cs \
|
||||
@@ -3963,7 +3964,7 @@ CORECLR_DISABLED_TEST_CS_SRC += \
|
||||
$(CORECLR_PATH)/tests/src/CoreMangLib/system/delegate/threatmodel/public/testclass.cs \
|
||||
$(CORECLR_PATH)/tests/src/CoreMangLib/system/delegate/threatmodel/tests/bindingtarget.cs \
|
||||
$(CORECLR_PATH)/tests/src/CoreMangLib/system/delegate/threatmodel/tests/testclass.cs
|
||||
|
||||
|
||||
# samples (should probably be removed upstream)
|
||||
CORECLR_DISABLED_TEST_CS_SRC += \
|
||||
$(CORECLR_PATH)/tests/src/hosting/samples/hosting/usercode/usercode.cs \
|
||||
@@ -3981,10 +3982,6 @@ CORECLR_DISABLED_TEST_CS_SRC += \
|
||||
$(CORECLR_PATH)/tests/src/JIT/Directed/newarr/newarr.cs \
|
||||
$(CORECLR_PATH)/tests/src/baseservices/exceptions/sharedexceptions/emptystacktrace/oomexception01.cs
|
||||
|
||||
# https://github.com/mono/mono/issues/7432
|
||||
CORECLR_DISABLED_TEST_CS_SRC += \
|
||||
$(CORECLR_PATH)/tests/src/CoreMangLib/cti/system/gc/gcsuppressfinalize.cs
|
||||
|
||||
CORECLR_TEST_IL_SRC = \
|
||||
$(CORECLR_PATH)/tests/src/JIT/BBT/Scenario4/Not-Int32.il \
|
||||
$(CORECLR_PATH)/tests/src/JIT/Directed/Convert/implicitConv.il \
|
||||
@@ -4969,6 +4966,7 @@ CORECLR_TEST_IL_SRC = \
|
||||
$(CORECLR_PATH)/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/rem.il \
|
||||
$(CORECLR_PATH)/tests/src/JIT/jit64/opt/regress/vswhidbey/228572/conv.il \
|
||||
$(CORECLR_PATH)/tests/src/JIT/jit64/opt/regress/vswhidbey/481244/foo.il \
|
||||
$(CORECLR_PATH)/tests/src/JIT/jit64/opt/regress/vswhidbey/481244/foo2.il \
|
||||
$(CORECLR_PATH)/tests/src/JIT/jit64/regress/ddb/118414/118414.il \
|
||||
$(CORECLR_PATH)/tests/src/JIT/jit64/regress/ddb/127931/127931.il \
|
||||
$(CORECLR_PATH)/tests/src/JIT/jit64/regress/vsw/102974/test.il \
|
||||
@@ -5060,9 +5058,6 @@ CORECLR_DISABLED_TEST_IL_SRC += \
|
||||
CORECLR_DISABLED_TEST_IL_SRC += \
|
||||
$(CORECLR_PATH)/tests/src/JIT/Directed/coverage/oldtests/lcliimpl.il
|
||||
|
||||
# We use an r4 for r4-r8 stack merge so it loses precision
|
||||
CORECLR_DISABLED_TEST_IL_SRC += \
|
||||
$(CORECLR_PATH)/tests/src/JIT/jit64/opt/regress/vswhidbey/481244/foo2.il
|
||||
|
||||
# FIXME: these tests are baselined, i.e. we don't have time to investigate
|
||||
# them right now but want to make sure we don't introduce new regressions
|
||||
|
||||
@@ -1,11 +1,9 @@
|
||||
check-ms-test-suite: $(CLASS)/nunitlite.dll
|
||||
@if $(MAKE) validate-ms-test-suite RESET_VERSIONS=1; then \
|
||||
$(MAKE) -C $(MSTESTSUITE_PATH)/conformance build MCS="$(MCS) -debug:portable -t:library -warn:1 -r:$(CLASS)/nunitlite.dll" && \
|
||||
$(MAKE) -C $(MSTESTSUITE_PATH)/systemruntimebringup build MCS="$(MCS) -debug:portable -t:library -warn:1 -r:$(CLASS)/nunitlite.dll" && \
|
||||
$(MAKE) -C $(MSTESTSUITE_PATH)/System.Linq.Expressions build MCS="$(MCS) -debug:portable -t:library -warn:1 -r:$(CLASS)/nunitlite.dll" && \
|
||||
$(MAKE) -C $(MSTESTSUITE_PATH)/conformance run NUNIT-CONSOLE="$(RUNTIME) $(CLASS)/nunit-lite-console.exe -exclude=MonoBug,BadTest -format:nunit2" NUNIT_XML_RESULT="-result:$(abs_top_builddir)/acceptance-tests/TestResult-ms-test-suite-conformance.xml" || EXIT_CODE=1; \
|
||||
$(MAKE) -C $(MSTESTSUITE_PATH)/systemruntimebringup run NUNIT-CONSOLE="$(RUNTIME) $(CLASS)/nunit-lite-console.exe -exclude=MonoBug,BadTest -format:nunit2" NUNIT_XML_RESULT="-result:$(abs_top_builddir)/acceptance-tests/TestResult-ms-test-suite-systemruntimebringup.xml" || EXIT_CODE=1; \
|
||||
$(MAKE) -C $(MSTESTSUITE_PATH)/System.Linq.Expressions run NUNIT-CONSOLE="$(RUNTIME) $(CLASS)/nunit-lite-console.exe -exclude=MonoBug,BadTest -format:nunit2" NUNIT_XML_RESULT="-result:$(abs_top_builddir)/acceptance-tests/TestResult-ms-test-suite-systemlinqexpressions.xml" || EXIT_CODE=1; \
|
||||
$(MAKE) -C $(MSTESTSUITE_PATH)/systemruntimebringup build MCS="$(MCS) -debug:portable -warn:1" && \
|
||||
$(MAKE) -C $(MSTESTSUITE_PATH)/systemruntimebringup run MONO="$(RUNTIME)" || EXIT_CODE=1; \
|
||||
exit $$EXIT_CODE; \
|
||||
else \
|
||||
echo "*** [ms-test-suite] Getting the repository failed, you probably don't have access to this Xamarin-internal resource. Skipping."; \
|
||||
|
||||
@@ -57,21 +57,21 @@ namespace Mono.Profiling.Tests.Stress {
|
||||
"jit",
|
||||
};
|
||||
|
||||
static readonly TimeSpan _timeout = TimeSpan.FromHours (6);
|
||||
|
||||
const RegexOptions _regexOptions = RegexOptions.Compiled | RegexOptions.Singleline;
|
||||
static readonly TimeSpan _timeout = TimeSpan.FromHours (8);
|
||||
|
||||
static readonly Dictionary<string, Predicate<Benchmark>> _filters = new Dictionary<string, Predicate<Benchmark>> {
|
||||
{ "ironjs-v8", FilterNotOnArm },
|
||||
{ "msbiology", FilterNever },
|
||||
{ "ironjs-v8", FilterArmArchitecture },
|
||||
};
|
||||
|
||||
static bool FilterNever (Benchmark benchmark)
|
||||
{
|
||||
return false;
|
||||
static readonly Dictionary<string, Action<TestResult>> _processors = new Dictionary<string, Action<TestResult>> {
|
||||
{ "msbiology", Process32BitOutOfMemory },
|
||||
};
|
||||
|
||||
static string FilterInvalidXmlChars (string text) {
|
||||
return Regex.Replace (text, @"[^\x09\x0A\x0D\x20-\uD7FF\uE000-\uFFFD\u10000-\u10FFFF]", string.Empty);
|
||||
}
|
||||
|
||||
static bool FilterNotOnArm (Benchmark benchmark)
|
||||
static bool FilterArmArchitecture (Benchmark benchmark)
|
||||
{
|
||||
#if ARCH_arm || ARCH_arm64
|
||||
return false;
|
||||
@@ -80,66 +80,45 @@ namespace Mono.Profiling.Tests.Stress {
|
||||
#endif
|
||||
}
|
||||
|
||||
static void Process32BitOutOfMemory (TestResult result)
|
||||
{
|
||||
if (Environment.Is64BitProcess)
|
||||
return;
|
||||
|
||||
if (result.ExitCode == null || result.ExitCode == 0)
|
||||
return;
|
||||
|
||||
if (result.StandardError.Contains ("OutOfMemoryException"))
|
||||
result.ExitCode = 0;
|
||||
}
|
||||
|
||||
static bool IsSupported (Benchmark benchmark)
|
||||
{
|
||||
return _filters.TryGetValue (benchmark.Name, out var filter) ? filter (benchmark) : true;
|
||||
}
|
||||
|
||||
static string ReplaceInvalidXmlChars (string text) {
|
||||
return Regex.Replace (text, @"[^\x09\x0A\x0D\x20-\uD7FF\uE000-\uFFFD\u10000-\u10FFFF]", string.Empty);
|
||||
}
|
||||
|
||||
static int Main ()
|
||||
{
|
||||
var regex = new Regex (".*", _regexOptions);
|
||||
|
||||
if (Environment.GetEnvironmentVariable ("MONO_PROFILER_STRESS_REGEX") is string envRegex)
|
||||
regex = new Regex (envRegex, _regexOptions);
|
||||
|
||||
var depDir = Path.Combine ("..", "external", "benchmarker");
|
||||
var benchDir = Path.Combine (depDir, "benchmarks");
|
||||
var testDir = Path.Combine (depDir, "tests");
|
||||
|
||||
var benchmarks = Directory.EnumerateFiles (benchDir, "*.benchmark")
|
||||
.Select (Benchmark.Load)
|
||||
.Where (b => !b.OnlyExplicit && b.ClientCommandLine == null && IsSupported (b) && regex.IsMatch (b.Name))
|
||||
.Where (b => !b.OnlyExplicit && b.ClientCommandLine == null && IsSupported (b))
|
||||
.OrderBy (b => b.Name)
|
||||
.ToArray ();
|
||||
|
||||
var monoPath = Path.GetFullPath (Path.Combine ("..", "..", "runtime", "mono-wrapper"));
|
||||
var classDir = Path.GetFullPath (Path.Combine ("..", "..", "mcs", "class", "lib", "net_4_x"));
|
||||
|
||||
var seed = Environment.TickCount;
|
||||
|
||||
if (Environment.GetEnvironmentVariable ("MONO_PROFILER_STRESS_SEED") is string envSeed)
|
||||
seed = int.Parse (envSeed);
|
||||
|
||||
var timeout = (int) _timeout.TotalMilliseconds;
|
||||
|
||||
if (Environment.GetEnvironmentVariable ("MONO_PROFILER_STRESS_TIMEOUT") is string envTimeout)
|
||||
timeout = (int) TimeSpan.Parse (envTimeout).TotalMilliseconds;
|
||||
|
||||
string options = null;
|
||||
|
||||
if (Environment.GetEnvironmentVariable ("MONO_PROFILER_STRESS_OPTIONS") is string envOptions)
|
||||
options = envOptions;
|
||||
|
||||
var suspend = false;
|
||||
|
||||
if (Environment.GetEnvironmentVariable ("MONO_PROFILER_STRESS_SUSPEND") is string envSuspend)
|
||||
suspend = bool.Parse (envSuspend);
|
||||
|
||||
var rand = new Random (seed);
|
||||
var rand = new Random ();
|
||||
var cpus = Environment.ProcessorCount;
|
||||
|
||||
var sw = Stopwatch.StartNew ();
|
||||
|
||||
Console.ForegroundColor = ConsoleColor.Magenta;
|
||||
Console.WriteLine ($"[{sw.Elapsed.ToString ("G")}] Starting test session with seed: {seed}");
|
||||
Console.ResetColor ();
|
||||
|
||||
var results = new List<TestResult> (benchmarks.Length);
|
||||
|
||||
var sw = Stopwatch.StartNew ();
|
||||
|
||||
for (var i = 0; i < benchmarks.Length; i++) {
|
||||
var bench = benchmarks [i];
|
||||
|
||||
@@ -148,24 +127,17 @@ namespace Mono.Profiling.Tests.Stress {
|
||||
var maxSamples = rand.Next (0, cpus * 2000 + 1);
|
||||
var heapShotFreq = rand.Next (-10, 11);
|
||||
var maxFrames = rand.Next (0, 33);
|
||||
var flags = _options.ToDictionary (x => x, _ => rand.Next (0, 2) == 1)
|
||||
.Select (x => (x.Value ? string.Empty : "no") + x.Key)
|
||||
.ToArray ();
|
||||
var options = _options.ToDictionary (x => x, _ => rand.Next (0, 2) == 1)
|
||||
.Select (x => (x.Value ? string.Empty : "no") + x.Key)
|
||||
.ToArray ();
|
||||
|
||||
var profOptions = "nodefaults,output=/dev/null,";
|
||||
var profOptions = $"maxframes={maxFrames},{string.Join (",", options)},output=/dev/null";
|
||||
|
||||
if (options == null) {
|
||||
profOptions += $"maxframes={maxFrames},";
|
||||
if (sampleFreq > 0)
|
||||
profOptions += $",sample{sampleMode}={sampleFreq},maxsamples={maxSamples}";
|
||||
|
||||
if (sampleFreq > 0)
|
||||
profOptions += $"sample{sampleMode}={sampleFreq},maxsamples={maxSamples},";
|
||||
|
||||
if (heapShotFreq > 0)
|
||||
profOptions += $"heapshot={heapShotFreq}gc,";
|
||||
|
||||
profOptions += string.Join (",", flags);
|
||||
} else
|
||||
profOptions += options;
|
||||
if (heapShotFreq > 0)
|
||||
profOptions += $",heapshot={heapShotFreq}gc";
|
||||
|
||||
var info = new ProcessStartInfo {
|
||||
UseShellExecute = false,
|
||||
@@ -179,9 +151,6 @@ namespace Mono.Profiling.Tests.Stress {
|
||||
info.EnvironmentVariables.Clear ();
|
||||
info.EnvironmentVariables.Add ("MONO_PATH", classDir);
|
||||
|
||||
if (suspend)
|
||||
info.EnvironmentVariables.Add ("MONO_DEBUG", "suspend-on-native-crash,suspend-on-unhandled");
|
||||
|
||||
var progress = $"({i + 1}/{benchmarks.Length})";
|
||||
|
||||
Console.ForegroundColor = ConsoleColor.Blue;
|
||||
@@ -218,7 +187,7 @@ namespace Mono.Profiling.Tests.Stress {
|
||||
proc.BeginOutputReadLine ();
|
||||
proc.BeginErrorReadLine ();
|
||||
|
||||
if (!proc.WaitForExit (timeout)) {
|
||||
if (!proc.WaitForExit ((int) _timeout.TotalMilliseconds)) {
|
||||
// Force a thread dump.
|
||||
Syscall.kill (proc.Id, Signum.SIGQUIT);
|
||||
Thread.Sleep (1000);
|
||||
@@ -258,6 +227,9 @@ namespace Mono.Profiling.Tests.Stress {
|
||||
Console.WriteLine (result.StandardError);
|
||||
}
|
||||
|
||||
if (_processors.TryGetValue (bench.Name, out var processor))
|
||||
processor (result);
|
||||
|
||||
results.Add (result);
|
||||
}
|
||||
|
||||
@@ -274,7 +246,7 @@ namespace Mono.Profiling.Tests.Stress {
|
||||
|
||||
using (var writer = XmlWriter.Create ("TestResult-profiler-stress.xml", settings)) {
|
||||
writer.WriteStartDocument ();
|
||||
writer.WriteComment ($"This file represents the results of running a test suite (seed: {seed})");
|
||||
writer.WriteComment ("This file represents the results of running a test suite");
|
||||
|
||||
writer.WriteStartElement ("test-results");
|
||||
writer.WriteAttributeString ("name", "profiler-stress-tests.dummy");
|
||||
@@ -335,11 +307,11 @@ namespace Mono.Profiling.Tests.Stress {
|
||||
writer.WriteStartElement ("failure");
|
||||
|
||||
writer.WriteStartElement ("message");
|
||||
writer.WriteCData (ReplaceInvalidXmlChars (result.StandardOutput));
|
||||
writer.WriteCData (FilterInvalidXmlChars (result.StandardOutput));
|
||||
writer.WriteEndElement ();
|
||||
|
||||
writer.WriteStartElement ("stack-trace");
|
||||
writer.WriteCData (ReplaceInvalidXmlChars (result.StandardError));
|
||||
writer.WriteCData (FilterInvalidXmlChars (result.StandardError));
|
||||
writer.WriteEndElement ();
|
||||
|
||||
writer.WriteEndElement ();
|
||||
|
||||
@@ -1,5 +1,18 @@
|
||||
check-roslyn:
|
||||
@$(MAKE) validate-roslyn RESET_VERSIONS=1
|
||||
@if [ -z $$PREFIX ]; then echo "You need to set PREFIX to the prefix of the Mono installation that should be used for testing Roslyn." && exit 1; fi
|
||||
sed -i -e 's/\\4.5-api"/\\4.5"/g' $$PREFIX/lib/mono/xbuild-frameworks/.NETFramework/v4.5/RedistList/FrameworkList.xml; \
|
||||
export MSBuildExtensionsPath=$$PREFIX/lib/mono/xbuild; \
|
||||
MONO_DOTNET_PORTABLE_DIR=$$PREFIX/lib/mono/xbuild-frameworks/.NETPortable/; \
|
||||
if [ ! -d "$$MONO_DOTNET_PORTABLE_DIR/v4.6" ]; then \
|
||||
mkdir -p $$MONO_DOTNET_PORTABLE_DIR; \
|
||||
curl -SL "http://download.mono-project.com/third-party/RoslynBuildDependencies.zip" > /tmp/RoslynBuildDependencies.zip; \
|
||||
unzip -o /tmp/RoslynBuildDependencies.zip -d /tmp/RoslynBuildDependencies; \
|
||||
cp -r /tmp/RoslynBuildDependencies/PortableReferenceAssemblies/* $$MONO_DOTNET_PORTABLE_DIR; \
|
||||
fi; \
|
||||
cd $(ROSLYN_PATH); \
|
||||
./mono-testing.sh "$(XUNIT)" || exit; \
|
||||
echo "done"
|
||||
sed -i -e 'N; s/bootstrapArg=".*\n.*"/bootstrapArg=""/g' cibuild.sh; \
|
||||
sed -i -e 's#-xml Binaries/\$$BUILD_CONFIGURATION/xUnitResults/#-nunit $(abs_top_builddir)/acceptance-tests/TestResult-#g' cibuild.sh; \
|
||||
./cibuild.sh --mono-path $$PREFIX/bin || EXIT_CODE=1; \
|
||||
sed -i -e 's/\\4.5"/\\4.5-api"/g' $$PREFIX/lib/mono/xbuild-frameworks/.NETFramework/v4.5/RedistList/FrameworkList.xml; \
|
||||
exit $$EXIT_CODE
|
||||
+3
-5
@@ -89,11 +89,9 @@ if test x$NOCONFIGURE = x && test -z "$*"; then
|
||||
echo
|
||||
fi
|
||||
|
||||
am_opt="--add-missing --copy --gnu -Wno-portability -Wno-obsolete"
|
||||
|
||||
case $CC in
|
||||
xlc )
|
||||
am_opt="$am_opt --include-deps";;
|
||||
am_opt=--include-deps;;
|
||||
esac
|
||||
|
||||
|
||||
@@ -144,8 +142,8 @@ if grep "^AC_CONFIG_HEADERS" configure.ac >/dev/null; then
|
||||
autoheader || { echo "**Error**: autoheader failed."; exit 1; }
|
||||
fi
|
||||
|
||||
echo "Running automake $am_opt ..."
|
||||
automake $am_opt ||
|
||||
echo "Running automake --gnu $am_opt ..."
|
||||
automake --add-missing --gnu -Wno-portability -Wno-obsolete $am_opt ||
|
||||
{ echo "**Error**: automake failed."; exit 1; }
|
||||
echo "Running autoconf ..."
|
||||
autoconf || { echo "**Error**: autoconf failed."; exit 1; }
|
||||
|
||||
+207
-1133
File diff suppressed because it is too large.
Load diff
@@ -11,7 +11,6 @@
|
||||
<dllmap dll="oci" target="libclntsh@libsuffix@" os="!windows"/>
|
||||
<dllmap dll="db2cli" target="libdb2_36@libsuffix@" os="!windows"/>
|
||||
<dllmap dll="MonoPosixHelper" target="$mono_libdir/libMonoPosixHelper@libsuffix@" os="!windows" />
|
||||
<dllmap dll="System.Native" target="$mono_libdir/libmono-system-native@libsuffix@" os="!windows" />
|
||||
<dllmap dll="libmono-btls-shared" target="$mono_libdir/libmono-btls-shared@libsuffix@" os="!windows" />
|
||||
<dllmap dll="i:msvcrt" target="@LIBC@" os="!windows"/>
|
||||
<dllmap dll="i:msvcrt.dll" target="@LIBC@" os="!windows"/>
|
||||
|
||||
+2
-2
@@ -11,9 +11,9 @@ def print_frames(thread, num_frames, current_thread):
|
||||
pc = str(frame.addr)
|
||||
var = frame
|
||||
function_name = frame.GetFunctionName()
|
||||
if function_name == "interp_exec_method_full":
|
||||
if function_name == "ves_exec_method_with_context":
|
||||
try:
|
||||
s = 'frame->imethod->method'
|
||||
s = 'frame->runtime_method->method'
|
||||
klassname = frame.EvaluateExpression('(char*) ' + s + '->klass->name').summary[1:-1]
|
||||
methodname = frame.EvaluateExpression('(char*) ' + s + '->name').summary[1:-1]
|
||||
|
||||
|
||||
@@ -116,7 +116,7 @@
|
||||
<add prefix="http" type="System.Net.HttpRequestCreator, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<add prefix="https" type="System.Net.HttpRequestCreator, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<add prefix="file" type="System.Net.FileWebRequestCreator, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<add prefix="ftp" type="System.Net.FtpWebRequestCreator, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<add prefix="ftp" type="System.Net.FtpRequestCreator, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
</webRequestModules>
|
||||
</system.net>
|
||||
|
||||
|
||||
@@ -132,7 +132,7 @@
|
||||
<add prefix="http" type="System.Net.HttpRequestCreator, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<add prefix="https" type="System.Net.HttpRequestCreator, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<add prefix="file" type="System.Net.FileWebRequestCreator, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<add prefix="ftp" type="System.Net.FtpWebRequestCreator, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<add prefix="ftp" type="System.Net.FtpRequestCreator, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
</webRequestModules>
|
||||
<settings>
|
||||
<ipv6 enabled="false"/>
|
||||
|
||||
@@ -133,7 +133,7 @@
|
||||
<add prefix="http" type="System.Net.HttpRequestCreator, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<add prefix="https" type="System.Net.HttpRequestCreator, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<add prefix="file" type="System.Net.FileWebRequestCreator, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<add prefix="ftp" type="System.Net.FtpWebRequestCreator, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<add prefix="ftp" type="System.Net.FtpRequestCreator, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
</webRequestModules>
|
||||
</system.net>
|
||||
|
||||
|
||||
@@ -11,11 +11,11 @@
|
||||
<section name="assemblyBinding" type="System.Configuration.IgnoreSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowLocation="false" />
|
||||
<section name="satelliteassemblies" type="System.Configuration.IgnoreSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowLocation="false" />
|
||||
<section name="startup" type="System.Configuration.IgnoreSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowLocation="false"/>
|
||||
<section name="system.codedom" type="System.CodeDom.Compiler.CodeDomConfigurationHandler, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<section name="system.data" type="System.Data.Common.DbProviderFactoriesConfigurationHandler, System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<section name="system.diagnostics" type="System.Diagnostics.SystemDiagnosticsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<section name="system.runtime.remoting" type="System.Configuration.IgnoreSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowLocation="false"/>
|
||||
<section name="system.windows.forms" type="System.Windows.Forms.WindowsFormsSection, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<section name="system.codedom" type="System.CodeDom.Compiler.CodeDomConfigurationHandler, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<section name="windows" type="System.Configuration.IgnoreSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowLocation="false" />
|
||||
<section name="strongNames" type="System.Configuration.IgnoreSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowLocation="false"/>
|
||||
<sectionGroup name="system.runtime.serialization" type="System.Runtime.Serialization.Configuration.SerializationSectionGroup, System.Runtime.Serialization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
@@ -136,7 +136,7 @@
|
||||
<add prefix="http" type="System.Net.HttpRequestCreator, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<add prefix="https" type="System.Net.HttpRequestCreator, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<add prefix="file" type="System.Net.FileWebRequestCreator, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<add prefix="ftp" type="System.Net.FtpWebRequestCreator, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<add prefix="ftp" type="System.Net.FtpRequestCreator, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
</webRequestModules>
|
||||
</system.net>
|
||||
|
||||
|
||||
@@ -43,16 +43,6 @@
|
||||
line-height: 0px;
|
||||
}
|
||||
|
||||
.mapi-codeblock {
|
||||
display: block;
|
||||
padding: 5pt 5pt;
|
||||
margin: 10pt;
|
||||
white-space: pre;
|
||||
font-family: monospace;
|
||||
border: 1px solid rgba(233,233,233,1);
|
||||
background-color: rgba(249,249,249,1);
|
||||
}
|
||||
|
||||
.mapi-entry code {
|
||||
border: none;
|
||||
background-color: transparent;
|
||||
|
||||
+2
-2
@@ -13,10 +13,10 @@ ASSEMBLED_DOCS = \
|
||||
monoapi.tree monoapi.zip
|
||||
|
||||
convert.exe: $(srcdir)/convert.cs AgilityPack.dll
|
||||
$(CSCOMPILE) -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll -r:$(topdir)/class/lib/$(PROFILE)/System.Xml.dll -out:$@ $< -r:AgilityPack.dll
|
||||
$(CSCOMPILE) -r:$(topdir)/class/lib/$(PROFILE)/System.Xml.dll -out:$@ $< -r:AgilityPack.dll
|
||||
|
||||
AgilityPack.dll:
|
||||
$(CSCOMPILE) -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll -r:$(topdir)/class/lib/$(PROFILE)/System.dll -r:$(topdir)/class/lib/$(PROFILE)/System.Xml.dll -target:library -out:$@ $(srcdir)/HtmlAgilityPack/*.cs
|
||||
$(CSCOMPILE) -r:$(topdir)/class/lib/$(PROFILE)/System.dll -r:$(topdir)/class/lib/$(PROFILE)/System.Xml.dll -target:library -out:$@ $(srcdir)/HtmlAgilityPack/*.cs
|
||||
|
||||
monoapi.zip: monoapi.tree
|
||||
@test -f $@ || { rm -f $< && $(MAKE) $<; }
|
||||
|
||||
+1
-1
@@ -69,5 +69,5 @@ object for filters is passed in a local variable (cfg->exvar).
|
||||
throw: we first save all regs into a sigcontext struct and then call the stack
|
||||
unwinding code.
|
||||
|
||||
catch handler: catch handlers are always called from the stack unwinding
|
||||
catch handler: catch hanlders are always called from the stack unwinding
|
||||
code. The exception object is passed in a local variable (cfg->exvar).
|
||||
+4
-20
@@ -124,7 +124,6 @@ sub process_function {
|
||||
my $body = '';
|
||||
my $returns = '';
|
||||
my $prototype = '';
|
||||
my $codeblock = 'false';
|
||||
|
||||
while (<$file>) {
|
||||
|
||||
@@ -157,6 +156,7 @@ sub process_function {
|
||||
if (defined($deprecated)) {
|
||||
process_formatting(\$deprecated, $file_path, $.);
|
||||
}
|
||||
$body =~ s/\n/ /g;
|
||||
|
||||
if (exists($docs->{body}->{$name})) {
|
||||
my $origin = $docs->{origin}->{$name};
|
||||
@@ -180,16 +180,8 @@ sub process_function {
|
||||
chomp;
|
||||
s/^ +\*//;
|
||||
|
||||
if (/\s*\\code$/) {
|
||||
$codeblock = 'true';
|
||||
} elsif (/\s*\\endcode$/) {
|
||||
$codeblock = 'false';
|
||||
}
|
||||
|
||||
# Replace blank lines with paragraph breaks if we're not in a code block.
|
||||
if (/^\s*$/) {
|
||||
$_ = '<p>' if $codeblock eq 'false';
|
||||
}
|
||||
# Replace blank lines with paragraph breaks.
|
||||
$_ = '<p>' if /^\s*$/;
|
||||
|
||||
if ($section == $PARAMETER_SECTION) {
|
||||
if (/\s*\\param +(\w+)(.*)/) {
|
||||
@@ -218,7 +210,7 @@ sub process_function {
|
||||
$returns = "\t$_\n";
|
||||
$section = $RETURN_SECTION;
|
||||
} else {
|
||||
$body .= "\n$_";
|
||||
$body .= "\n\t$_";
|
||||
}
|
||||
} elsif ($section == $RETURN_SECTION) {
|
||||
$returns .= "\n\t$_";
|
||||
@@ -235,12 +227,6 @@ sub process_formatting {
|
||||
my ($content, $file_path, $current_line) = @_;
|
||||
$_ = $$content;
|
||||
|
||||
# General formatting
|
||||
s{\\b +(\w+)}{<strong>$1</strong>}g;
|
||||
s{\\a +(\w+)}{<i>$1</i>}g;
|
||||
s{\\e +(\w+)}{<i>$1</i>}g;
|
||||
s{\\em +(\w+)}{<i>$1</i>}g;
|
||||
|
||||
# Constants
|
||||
s{NULL}{<code>NULL</code>}g;
|
||||
s{TRUE}{<code>TRUE</code>}g;
|
||||
@@ -257,8 +243,6 @@ sub process_formatting {
|
||||
warn "$file_path:$current_line: Old-style monodoc notation '`code`' used\n"
|
||||
if s{\`((?!api:)[:.\w\*]+)\`}{<code>$1</code>}g && $WARNINGS;
|
||||
s{\\c +(\S+(?<![.,:;]))}{<code>$1</code>}g;
|
||||
s{\\code}{<pre><code class="mapi-codeblock">}g;
|
||||
s{\\endcode}{</code></pre>}g;
|
||||
|
||||
$$content = $_;
|
||||
}
|
||||
|
||||
@@ -37,6 +37,7 @@
|
||||
<manpage name="mono-xmltool(1)" page="../man/mono-xmltool.1" />
|
||||
<manpage name="mozroots(1)" page="../man/mozroots.1" />
|
||||
<manpage name="permview(1)" page="../man/permview.1" />
|
||||
<manpage name="prj2make(1)" page="../man/prj2make.1" />
|
||||
<manpage name="resgen(1)" page="../man/resgen.1" />
|
||||
<manpage name="secutil(1)" page="../man/secutil.1" />
|
||||
<manpage name="setreg(1)" page="../man/setreg.1" />
|
||||
|
||||
@@ -1,193 +1,73 @@
|
||||
<h1>Runtime Profiler API</h1>
|
||||
<h1>Profiling Interface</h1>
|
||||
|
||||
<p>The profiler API can be used by dynamically loaded profiler
|
||||
modules to monitor different aspects of a running program. The
|
||||
API is also usable by embedders without having to compile a
|
||||
profiler module.
|
||||
<h3>Profiler Operation</h3>
|
||||
|
||||
<h2>Profiler Modules</h2>
|
||||
<p>The following methods can be used by dynamic profiler
|
||||
methods to monitor different aspects of the program.
|
||||
|
||||
<p>A profiler module is simply a shared library with a single
|
||||
exported function which is the entry point that Mono calls at
|
||||
startup. It must have the following signature:
|
||||
<p>A custom profiler will have one public method defined in
|
||||
the shared library which is the entry point that Mono calls at
|
||||
startup, it has the following signature:
|
||||
|
||||
<pre><code class="mapi-codeblock">
|
||||
void mono_profiler_startup_example (const char *desc)
|
||||
</code></pre>
|
||||
<pre>
|
||||
void mono_profiler_startup (const char *desc)
|
||||
</pre>
|
||||
|
||||
<p>Here, the <code>example</code> portion of the function name is
|
||||
the name of the profiler module. It must match the shared library
|
||||
name (i.e. <code>libmono-profiler-example.so</code>). <i>desc</i>
|
||||
is the set of arguments that were passed from the command line.
|
||||
<p>Where "desc" is the set of arguments that were passed from
|
||||
the command line. This routine will call
|
||||
<tt>mono_profiler_install</tt> to activate the profiler and
|
||||
will install one or more filters (one of the various
|
||||
<tt>mono_profiler_install_</tt> functions).
|
||||
|
||||
<p>For example, a bare bones profiler module might look like this
|
||||
(<code>example.c</code>):
|
||||
<p>In addition, a profiler developer will typically call
|
||||
<tt>mono_profiler_set_events</tt> to register which kinds of
|
||||
traces should be enabled, these can be an OR-ed combination of
|
||||
the following:
|
||||
|
||||
<pre><code class="mapi-codeblock">
|
||||
#include <mono/metadata/profiler.h>
|
||||
#include <stdio.h>
|
||||
<pre>
|
||||
MONO_PROFILE_NONE
|
||||
MONO_PROFILE_APPDOMAIN_EVENTS
|
||||
MONO_PROFILE_ASSEMBLY_EVENTS
|
||||
MONO_PROFILE_MODULE_EVENTS
|
||||
MONO_PROFILE_CLASS_EVENTS
|
||||
MONO_PROFILE_JIT_COMPILATION
|
||||
MONO_PROFILE_INLINING
|
||||
MONO_PROFILE_EXCEPTIONS
|
||||
MONO_PROFILE_ALLOCATIONS
|
||||
MONO_PROFILE_GC
|
||||
MONO_PROFILE_THREADS
|
||||
MONO_PROFILE_REMOTING
|
||||
MONO_PROFILE_TRANSITIONS
|
||||
MONO_PROFILE_ENTER_LEAVE
|
||||
MONO_PROFILE_COVERAGE
|
||||
MONO_PROFILE_INS_COVERAGE
|
||||
MONO_PROFILE_STATISTICAL
|
||||
</pre>
|
||||
|
||||
struct _MonoProfiler {
|
||||
int dummy;
|
||||
}
|
||||
<p>Developers can change the set of monitored events at
|
||||
runtime by calling <tt>mono_profiler_set_events</tt>.
|
||||
|
||||
<h4><a name="api:mono_profiler_install">mono_profiler_install</a></h4>
|
||||
<h4><a name="api:mono_profiler_install_allocation">mono_profiler_install_allocation</a></h4>
|
||||
<h4><a name="api:mono_profiler_install_appdomain">mono_profiler_install_appdomain</a></h4>
|
||||
<h4><a name="api:mono_profiler_install_assembly">mono_profiler_install_assembly</a></h4>
|
||||
<h4><a name="api:mono_profiler_install_class">mono_profiler_install_class</a></h4>
|
||||
<h4><a name="api:mono_profiler_install_coverage_filter">mono_profiler_install_coverage_filter</a></h4>
|
||||
<h4><a name="api:mono_profiler_install_enter_leave">mono_profiler_install_enter_leave</a></h4>
|
||||
<h4><a name="api:mono_profiler_install_jit_compile">mono_profiler_install_jit_compile</a></h4>
|
||||
<h4><a name="api:mono_profiler_install_module">mono_profiler_install_module</a></h4>
|
||||
<h4><a name="api:mono_profiler_install_thread">mono_profiler_install_thread</a></h4>
|
||||
<h4><a name="api:mono_profiler_install_transition">mono_profiler_install_transition</a></h4>
|
||||
<h4><a name="api:mono_profiler_install_gc">mono_profiler_install_gc</a></h4>
|
||||
<h4><a name="api:mono_profiler_install_statistical">mono_profiler_install_statistical</a></h4>
|
||||
<h4><a name="api:mono_profiler_set_events">mono_profiler_set_events</a></h4>
|
||||
<h4><a name="api:mono_profiler_get_events">mono_profiler_get_events</a></h4>
|
||||
|
||||
static MonoProfiler profiler;
|
||||
<h3>Coverage</h3>
|
||||
|
||||
static void
|
||||
runtime_inited (MonoProfiler *prof)
|
||||
{
|
||||
printf ("Hello World");
|
||||
}
|
||||
<p>To support profiling modules that need to do code coverage
|
||||
analysis, the following routines is provided:
|
||||
|
||||
<h4><a name="api:mono_profiler_coverage_get">mono_profiler_coverage_get</a></h4>
|
||||
|
||||
void
|
||||
mono_profiler_init_example (const char *desc)
|
||||
{
|
||||
MonoProfilerHandle handle = mono_profiler_create (&profiler);
|
||||
mono_profiler_set_runtime_initialized_callback (handle, runtime_inited);
|
||||
}
|
||||
</code></pre>
|
||||
|
||||
<p>To compile this module, a C compiler must be invoked in a
|
||||
similar fashion to this, on Linux:
|
||||
|
||||
<pre><code class="mapi-codeblock">
|
||||
gcc -fPIC -shared -o libmono-profiler-example.so example.c `pkg-config --cflags mono-2`
|
||||
</code></pre>
|
||||
|
||||
<p>Or on OS X:
|
||||
|
||||
<pre><code class="mapi-codeblock">
|
||||
gcc -undefined suppress -flat_namespace -o libmono-profiler-example.so example.c `pkg-config --cflags mono-2`
|
||||
</code></pre>
|
||||
|
||||
<p>You can then load the module using:
|
||||
|
||||
<pre><code class="mapi-codeblock">
|
||||
mono --profile=example hello.exe
|
||||
</code></pre>
|
||||
|
||||
<p>(Note that adjusting <code>LD_LIBRARY_PATH</code> may be
|
||||
necessary in order for the dynamic linker to find the module.)
|
||||
|
||||
<h2>Profiler Functions</h2>
|
||||
|
||||
<p>These are the functions usable for profiling programs.
|
||||
|
||||
<p>Each function has a note indicating whether they're async
|
||||
safe. An async safe function can be invoked in a signal handler
|
||||
or when the world is stopped by the GC. Conversely, a function
|
||||
that is not async safe must not be invoked in such a context or
|
||||
undefined behavior can occur (crashes, deadlocks, etc).
|
||||
|
||||
<p>Some functions may only be invoked from a profiler module's
|
||||
init function (or prior to running managed code in the case of
|
||||
embedding). This is noted explicitly only if applicable to a
|
||||
function.
|
||||
|
||||
<h3>Basic Functions</h3>
|
||||
|
||||
<p>These functions are used to load and install profilers.
|
||||
|
||||
<h4><a name="api:mono_profiler_load">mono_profiler_load</a></h4>
|
||||
<h4><a name="api:mono_profiler_create">mono_profiler_create</a></h4>
|
||||
<h4><a name="api:mono_profiler_set_cleanup_callback">mono_profiler_set_cleanup_callback</a></h4>
|
||||
|
||||
<h3>Code Coverage</h3>
|
||||
|
||||
<p>These functions provide access to the JIT compiler's code
|
||||
coverage support. This functionality can be used to collect
|
||||
information about how many times certain code paths have been
|
||||
executed.
|
||||
|
||||
<h4><a name="api:mono_profiler_enable_coverage">mono_profiler_enable_coverage</a></h4>
|
||||
<h4><a name="api:mono_profiler_set_coverage_filter_callback">mono_profiler_set_coverage_filter_callback</a></h4>
|
||||
<h4><a name="api:mono_profiler_get_coverage_data">mono_profiler_get_coverage_data</a></h4>
|
||||
|
||||
<h3>Statistical Sampling</h3>
|
||||
|
||||
<p>Statistical sampling can be used to interrupt managed threads
|
||||
based on a certain mode and frequency for the purpose of
|
||||
collecting data about their current work.
|
||||
|
||||
<p>One common use case for this functionality, usually referred
|
||||
to as call sampling, is to collect a backtrace from every thread
|
||||
when a sampling hit event arrives. This data can then be compiled
|
||||
into a report indicating where a program spends most of its time.
|
||||
|
||||
<h4><a name="api:mono_profiler_enable_sampling">mono_profiler_enable_sampling</a></h4>
|
||||
<h4><a name="api:mono_profiler_set_sample_mode">mono_profiler_set_sample_mode</a></h4>
|
||||
<h4><a name="api:mono_profiler_get_sample_mode">mono_profiler_get_sample_mode</a></h4>
|
||||
|
||||
<p>A callback must be registered to receive sample hit events.
|
||||
Please see the <i>Callback Registration</i> section below.
|
||||
|
||||
<h3>GC Allocations</h3>
|
||||
|
||||
<p>Profilers can be notified about all GC allocations performed
|
||||
by a program or the Mono runtime.
|
||||
|
||||
<h4><a name="api:mono_profiler_enable_allocations">mono_profiler_enable_allocations</a></h4>
|
||||
|
||||
<p>A callback must be registered to receive allocation events.
|
||||
Please see the <i>Callback Registration</i> section below.
|
||||
|
||||
<h3>Call Instrumentation</h3>
|
||||
|
||||
<p>The JIT compiler supports instrumenting managed method entry
|
||||
and exit points so that a profiler callback will be invoked.
|
||||
|
||||
<p>While such callbacks by themselves have traditionally only
|
||||
been useful for call count profiling and the like, Mono gives
|
||||
these callbacks access to the arguments, locals, and return
|
||||
value of instrumented methods (together referred to as the 'call
|
||||
context'). This enables many profiling scenarios that would
|
||||
otherwise have required explicit hooks in the base class
|
||||
libraries.
|
||||
|
||||
<h4><a name="api:mono_profiler_set_call_instrumentation_filter_callback">mono_profiler_set_call_instrumentation_filter_callback</a></h4>
|
||||
<h4><a name="api:mono_profiler_enable_call_context_introspection">mono_profiler_enable_call_context_introspection</a></h4>
|
||||
<h4><a name="api:mono_profiler_call_context_get_this">mono_profiler_call_context_get_this</a></h4>
|
||||
<h4><a name="api:mono_profiler_call_context_get_argument">mono_profiler_call_context_get_argument</a></h4>
|
||||
<h4><a name="api:mono_profiler_call_context_get_local">mono_profiler_call_context_get_local</a></h4>
|
||||
<h4><a name="api:mono_profiler_call_context_get_result">mono_profiler_call_context_get_result</a></h4>
|
||||
<h4><a name="api:mono_profiler_call_context_free_buffer">mono_profiler_call_context_free_buffer</a></h4>
|
||||
|
||||
<p>Callbacks must be registered to receive method entry and exit
|
||||
events. Please see the <i>Callback Registration</i> section
|
||||
below.
|
||||
|
||||
<h3>Callback Registration</h3>
|
||||
|
||||
<p>In addition to the above functions, there's a large set of
|
||||
functions for installing generic profiler event callbacks. These
|
||||
are generated from C macros and so are not documented here.
|
||||
Please refer to the <code>mono/metadata/profiler.h</code> and
|
||||
<code>mono/metadata/profiler-events.h</code> headers for a full
|
||||
listing of these.
|
||||
|
||||
<p>Callback registration functions are all async safe and can be
|
||||
safely invoked from multiple threads at the same time, with the
|
||||
caveat that altering a registered callback from one thread will
|
||||
not immediately affect another thread that is already invoking
|
||||
the current callback.
|
||||
|
||||
<h2>API Stability</h2>
|
||||
|
||||
<p>The profiler API does not have the same API stability
|
||||
garantees that the rest of the Mono embedding API does. While
|
||||
a breaking change to the profiler API is extremely rare, it has
|
||||
happened in the past when changing the API in a backwards
|
||||
compatible way was deemed to be too much work for too little
|
||||
gain.
|
||||
|
||||
<p>Therefore, developers of profiler modules may rarely need to
|
||||
update their code to work with new versions of the profiler API.
|
||||
|
||||
<p>Developers who wish to support older versions of the API can
|
||||
perform a compile time check of the
|
||||
<code>MONO_PROFILER_API_VERSION</code> macro and maintain code
|
||||
for both old and new versions.
|
||||
|
||||
<p>To aid with transitioning to a new version of the profiler
|
||||
API, the Mono runtime will detect and reject loading profiler
|
||||
modules which were compiled against older profiler API versions.
|
||||
@@ -0,0 +1,22 @@
|
||||
/
|
||||
/depcomp
|
||||
/config.guess
|
||||
/config.sub
|
||||
/ltmain.sh
|
||||
/eglib-*.tar.gz
|
||||
/missing
|
||||
/install-sh
|
||||
/compile
|
||||
/Makefile
|
||||
/Makefile.in
|
||||
/stamp-h1
|
||||
/config.h.in
|
||||
/libtool
|
||||
/autom4te.cache
|
||||
/aclocal.m4
|
||||
/config.log
|
||||
/configure
|
||||
/config.h
|
||||
/config.status
|
||||
/INSTALL
|
||||
dolt*
|
||||
File renamed without changes.
@@ -0,0 +1,17 @@
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to
|
||||
deal in the Software without restriction, including without limitation the
|
||||
rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
|
||||
sell copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in
|
||||
all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
||||
IN THE SOFTWARE.
|
||||
@@ -0,0 +1,5 @@
|
||||
AM_CFLAGS = $(WERROR_CFLAGS)
|
||||
|
||||
SUBDIRS = src
|
||||
|
||||
EXTRA_DIST = README NEWS AUTHORS winconfig.h
|
||||
@@ -0,0 +1,3 @@
|
||||
Release notes for Mono are hosted on the web, please see:
|
||||
|
||||
http://www.mono-project.com/docs/about-mono/releases/
|
||||
@@ -0,0 +1,54 @@
|
||||
|
||||
The purpose of eglib is to be an X11-licensed subset of glib that can
|
||||
be used with Mono when the Mono runtime is explicitly relicensed under
|
||||
a different license by Novell.
|
||||
|
||||
The implementation is done from the public documentation available here:
|
||||
|
||||
http://developer.gnome.org/doc/API/2.0/glib/
|
||||
|
||||
Currently this is only being built standalone, use:
|
||||
|
||||
./autogen.sh --prefix=/tmp/test
|
||||
|
||||
Currently all the definitions go into a single file: glib.h, there are
|
||||
no separate files, please try to follow the convetions in the source code
|
||||
|
||||
* Tests
|
||||
|
||||
Please read the README in tests/
|
||||
|
||||
* Features
|
||||
|
||||
The source code is designed to allow for different operating
|
||||
system builds of the eglib code.
|
||||
|
||||
Files in src that:
|
||||
|
||||
* Have a plain name: are cross platform, and should work on
|
||||
every operating system.
|
||||
|
||||
* That end in -unix.c: These files contain Unix specific code.
|
||||
|
||||
* That end in -win32.c: These files contain Win32 specific code.
|
||||
|
||||
* That end in -posix.c: Will work on both Windows and Unix,
|
||||
but should not be included for other operating systems.
|
||||
|
||||
* Plans: short and long term.
|
||||
|
||||
The short term plans for eglib is to allow Mono to optionally
|
||||
build with it instead of using glib, gmodule and gthread, but
|
||||
the default build will continue to be done against glib 2.0.
|
||||
|
||||
In the long-term we are considering dropping glib as a
|
||||
dependency, considering that Mono requires a modern Unix
|
||||
system to run anyways (for its thread support) it would allow
|
||||
us to fix some of the glib API limitations we have to live
|
||||
with (explicit thread support for example), rework the API to
|
||||
use types from stdint.h and we would be able to drop three
|
||||
external shared libraries.
|
||||
|
||||
This would reduce memory usage for the handful of routines
|
||||
that we use from glib, dynamic linker overhead for those and
|
||||
would allow us to tune the implementation to Mono's needs.
|
||||
+33
@@ -0,0 +1,33 @@
|
||||
* Missing code
|
||||
|
||||
* Process launching
|
||||
3 g_shell_quote
|
||||
1 g_shell_unquote
|
||||
|
||||
----------------------------------------------------------------------
|
||||
|
||||
* Should implement, for better performance:
|
||||
|
||||
Macros:
|
||||
6 G_UNLIKELY
|
||||
4 G_LIKELY
|
||||
|
||||
* Unimplemented, not supported currently:
|
||||
|
||||
(none as yet.)
|
||||
|
||||
* Dead Code
|
||||
|
||||
The GMainLoop code was no longer in use in Mono.
|
||||
|
||||
* Windows implementations needed
|
||||
|
||||
Directory, File manipulation:
|
||||
|
||||
g_dir_open, g_dir_close, g_dir_read_name
|
||||
|
||||
We're missing a native windows implementation. The unix one is in place.
|
||||
|
||||
* Information retrieval
|
||||
1 g_win32_getlocale
|
||||
|
||||
File renamed without changes.
@@ -1,8 +1,3 @@
|
||||
include $(top_srcdir)/mk/common.mk
|
||||
|
||||
# FIXME
|
||||
#SUBDIRS = test
|
||||
|
||||
noinst_LTLIBRARIES = libeglib.la
|
||||
|
||||
AM_CFLAGS = $(WERROR_CFLAGS)
|
||||
@@ -57,13 +52,11 @@ libeglib_la_CFLAGS = -g -Wall -D_FORTIFY_SOURCE=2 -D_GNU_SOURCE
|
||||
|
||||
AM_CPPFLAGS = -I$(srcdir)
|
||||
|
||||
if HOST_ANDROID
|
||||
libeglib_la_LIBADD = -lm -llog
|
||||
else
|
||||
if HOST_WIN32
|
||||
libeglib_la_LIBADD = -lm -lpsapi $(LTLIBICONV)
|
||||
libeglib_la_LIBADD = -lm $(LIBICONV) -lpsapi
|
||||
else
|
||||
libeglib_la_LIBADD = -lm $(LTLIBICONV)
|
||||
if PLATFORM_ANDROID
|
||||
libeglib_la_LIBADD = -llog
|
||||
endif
|
||||
endif
|
||||
|
||||
@@ -14,26 +14,29 @@
|
||||
#define G_DIR_SEPARATOR_S "@PATHSEP@"
|
||||
#define G_BREAKPOINT() @BREAKPOINT@
|
||||
#define G_OS_@OS@
|
||||
#define GPOINTER_TO_INT(ptr) @GPOINTER_TO_INT@
|
||||
#define GPOINTER_TO_UINT(ptr) @GPOINTER_TO_UINT@
|
||||
#define GINT_TO_POINTER(v) @GINT_TO_POINTER@
|
||||
#define GUINT_TO_POINTER(v) @GUINT_TO_POINTER@
|
||||
|
||||
#if @HAVE_ALLOCA_H@ == 1
|
||||
#define G_HAVE_ALLOCA_H
|
||||
#endif
|
||||
|
||||
typedef @GSIZE@ gsize;
|
||||
typedef @GSSIZE@ gssize;
|
||||
typedef unsigned @GSIZE@ gsize;
|
||||
typedef signed @GSIZE@ gssize;
|
||||
|
||||
#define G_GSIZE_FORMAT @GSIZE_FORMAT@
|
||||
|
||||
#if @G_HAVE_ISO_VARARGS@ == 1
|
||||
#define G_HAVE_ISO_VARARGS
|
||||
#endif
|
||||
|
||||
#if defined (HOST_WATCHOS)
|
||||
#undef G_BREAKPOINT
|
||||
#define G_BREAKPOINT()
|
||||
#endif
|
||||
|
||||
#if defined (HOST_WASM)
|
||||
#undef G_BREAKPOINT
|
||||
#define G_BREAKPOINT() do { printf ("MONO: BREAKPOINT\n"); abort (); } while (0)
|
||||
#endif
|
||||
|
||||
typedef @PIDTYPE@ GPid;
|
||||
|
||||
#endif
|
||||
@@ -9,7 +9,6 @@
|
||||
#ifdef _MSC_VER
|
||||
|
||||
#include <io.h>
|
||||
#include <stddef.h>
|
||||
|
||||
#define G_GNUC_PRETTY_FUNCTION __FUNCTION__
|
||||
#define G_GNUC_UNUSED
|
||||
@@ -18,26 +17,22 @@
|
||||
#define G_BREAKPOINT() __debugbreak()
|
||||
#define MAXPATHLEN 242
|
||||
|
||||
typedef size_t gsize;
|
||||
typedef ptrdiff_t gssize;
|
||||
typedef uintptr_t gsize;
|
||||
typedef intptr_t gssize;
|
||||
typedef int pid_t;
|
||||
|
||||
#define G_DIR_SEPARATOR '\\'
|
||||
#define G_DIR_SEPARATOR_S "\\"
|
||||
#define G_SEARCHPATH_SEPARATOR_S ";"
|
||||
#define G_SEARCHPATH_SEPARATOR ';'
|
||||
#define G_GSIZE_FORMAT "d"
|
||||
#define GPOINTER_TO_INT(ptr) ((gint)(intptr_t) (ptr))
|
||||
#define GPOINTER_TO_UINT(ptr) ((guint)(intptr_t) (ptr))
|
||||
#define GINT_TO_POINTER(v) ((gpointer)(intptr_t) (v))
|
||||
#define GUINT_TO_POINTER(v) ((gpointer)(intptr_t) (v))
|
||||
|
||||
#ifdef _WIN64
|
||||
// Correct for Win32 and Win64 since circa 2000.
|
||||
#define G_GSIZE_FORMAT "Iu"
|
||||
#else
|
||||
// Correct for Win32 since circa 1992.
|
||||
#define G_GSIZE_FORMAT "u"
|
||||
#endif
|
||||
|
||||
// https://msdn.microsoft.com/en-us/library/40bbyw78.aspx
|
||||
#define STDOUT_FILENO (1)
|
||||
#define STDERR_FILENO (2)
|
||||
#define STDOUT_FILENO (int)(intptr_t)stdout
|
||||
#define STDERR_FILENO (int)(intptr_t)stderr
|
||||
|
||||
/* FIXME: what should this be ?*/
|
||||
#define X_OK 4 /* This is really read */
|
||||
@@ -129,7 +129,6 @@
|
||||
#define g_printerr monoeg_g_printerr
|
||||
#define g_propagate_error monoeg_g_propagate_error
|
||||
#define g_ptr_array_add monoeg_g_ptr_array_add
|
||||
#define g_ptr_array_capacity monoeg_g_ptr_array_capacity
|
||||
#define g_ptr_array_foreach monoeg_g_ptr_array_foreach
|
||||
#define g_ptr_array_free monoeg_g_ptr_array_free
|
||||
#define g_ptr_array_new monoeg_g_ptr_array_new
|
||||
@@ -243,9 +242,6 @@
|
||||
#define g_usleep monoeg_g_usleep
|
||||
#define g_utf16_to_ucs4 monoeg_g_utf16_to_ucs4
|
||||
#define g_utf16_to_utf8 monoeg_g_utf16_to_utf8
|
||||
#define g_utf16_ascii_equal monoeg_g_utf16_ascii_equal
|
||||
#define g_utf16_asciiz_equal monoeg_g_utf16_asciiz_equal
|
||||
#define g_utf8_jump_table monoeg_g_utf8_jump_table
|
||||
#define g_utf8_get_char monoeg_g_utf8_get_char
|
||||
#define g_utf8_offset_to_pointer monoeg_g_utf8_offset_to_pointer
|
||||
#define g_utf8_pointer_to_offset monoeg_g_utf8_pointer_to_offset
|
||||
@@ -264,7 +260,6 @@
|
||||
#define g_vasprintf monoeg_g_vasprintf
|
||||
#define g_win32_getlocale monoeg_g_win32_getlocale
|
||||
#define g_assertion_message monoeg_assertion_message
|
||||
#define g_get_assertion_message monoeg_get_assertion_message
|
||||
#define g_malloc monoeg_malloc
|
||||
#define g_malloc0 monoeg_malloc0
|
||||
#define g_ptr_array_grow monoeg_ptr_array_grow
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -42,20 +42,20 @@ struct _GDir {
|
||||
};
|
||||
|
||||
GDir *
|
||||
g_dir_open (const gchar *path, guint flags, GError **gerror)
|
||||
g_dir_open (const gchar *path, guint flags, GError **error)
|
||||
{
|
||||
GDir *dir;
|
||||
|
||||
g_return_val_if_fail (path != NULL, NULL);
|
||||
g_return_val_if_fail (gerror == NULL || *gerror == NULL, NULL);
|
||||
g_return_val_if_fail (error == NULL || *error == NULL, NULL);
|
||||
|
||||
(void) flags; /* this is not used */
|
||||
dir = g_new (GDir, 1);
|
||||
dir->dir = opendir (path);
|
||||
if (dir->dir == NULL) {
|
||||
if (gerror) {
|
||||
if (error) {
|
||||
gint err = errno;
|
||||
*gerror = g_error_new (G_LOG_DOMAIN, g_file_error_from_errno (err), strerror (err));
|
||||
*error = g_error_new (G_LOG_DOMAIN, g_file_error_from_errno (err), strerror (err));
|
||||
}
|
||||
g_free (dir);
|
||||
return NULL;
|
||||
@@ -42,7 +42,7 @@ struct _GDir {
|
||||
};
|
||||
|
||||
GDir *
|
||||
g_dir_open (const gchar *path, guint flags, GError **gerror)
|
||||
g_dir_open (const gchar *path, guint flags, GError **error)
|
||||
{
|
||||
GDir *dir;
|
||||
gunichar2* path_utf16;
|
||||
@@ -50,7 +50,7 @@ g_dir_open (const gchar *path, guint flags, GError **gerror)
|
||||
WIN32_FIND_DATAW find_data;
|
||||
|
||||
g_return_val_if_fail (path != NULL, NULL);
|
||||
g_return_val_if_fail (gerror == NULL || *gerror == NULL, NULL);
|
||||
g_return_val_if_fail (error == NULL || *error == NULL, NULL);
|
||||
|
||||
dir = g_new0 (GDir, 1);
|
||||
path_utf16 = u8to16 (path);
|
||||
@@ -60,9 +60,9 @@ g_dir_open (const gchar *path, guint flags, GError **gerror)
|
||||
|
||||
dir->handle = FindFirstFileW (path_utf16_search, &find_data);
|
||||
if (dir->handle == INVALID_HANDLE_VALUE) {
|
||||
if (gerror) {
|
||||
if (error) {
|
||||
gint err = errno;
|
||||
*gerror = g_error_new (G_LOG_DOMAIN, g_file_error_from_errno (err), strerror (err));
|
||||
*error = g_error_new (G_LOG_DOMAIN, g_file_error_from_errno (err), strerror (err));
|
||||
}
|
||||
g_free (path_utf16_search);
|
||||
g_free (path_utf16);
|
||||
@@ -74,9 +74,9 @@ g_dir_open (const gchar *path, guint flags, GError **gerror)
|
||||
|
||||
while ((wcscmp ((wchar_t *) find_data.cFileName, L".") == 0) || (wcscmp ((wchar_t *) find_data.cFileName, L"..") == 0)) {
|
||||
if (!FindNextFileW (dir->handle, &find_data)) {
|
||||
if (gerror) {
|
||||
if (error) {
|
||||
gint err = errno;
|
||||
*gerror = g_error_new (G_LOG_DOMAIN, g_file_error_from_errno (err), strerror (err));
|
||||
*error = g_error_new (G_LOG_DOMAIN, g_file_error_from_errno (err), strerror (err));
|
||||
}
|
||||
g_free (dir);
|
||||
return NULL;
|
||||
@@ -62,21 +62,21 @@ g_error_vnew (gpointer domain, gint code, const char *format, va_list ap)
|
||||
}
|
||||
|
||||
void
|
||||
g_clear_error (GError **gerror)
|
||||
g_clear_error (GError **error)
|
||||
{
|
||||
if (gerror && *gerror) {
|
||||
g_error_free (*gerror);
|
||||
*gerror = NULL;
|
||||
if (error && *error) {
|
||||
g_error_free (*error);
|
||||
*error = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
g_error_free (GError *gerror)
|
||||
g_error_free (GError *error)
|
||||
{
|
||||
g_return_if_fail (gerror != NULL);
|
||||
g_return_if_fail (error != NULL);
|
||||
|
||||
g_free (gerror->message);
|
||||
g_free (gerror);
|
||||
g_free (error->message);
|
||||
g_free (error);
|
||||
}
|
||||
|
||||
void
|
||||
@@ -50,7 +50,7 @@ int mkstemp (char *tmp_template);
|
||||
#define OPEN_FLAGS (O_RDONLY | O_LARGEFILE)
|
||||
#endif
|
||||
gboolean
|
||||
g_file_get_contents (const gchar *filename, gchar **contents, gsize *length, GError **gerror)
|
||||
g_file_get_contents (const gchar *filename, gchar **contents, gsize *length, GError **error)
|
||||
{
|
||||
gchar *str;
|
||||
int fd;
|
||||
@@ -60,7 +60,7 @@ g_file_get_contents (const gchar *filename, gchar **contents, gsize *length, GEr
|
||||
|
||||
g_return_val_if_fail (filename != NULL, FALSE);
|
||||
g_return_val_if_fail (contents != NULL, FALSE);
|
||||
g_return_val_if_fail (gerror == NULL || *gerror == NULL, FALSE);
|
||||
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
|
||||
|
||||
*contents = NULL;
|
||||
if (length)
|
||||
@@ -68,17 +68,17 @@ g_file_get_contents (const gchar *filename, gchar **contents, gsize *length, GEr
|
||||
|
||||
fd = open (filename, OPEN_FLAGS);
|
||||
if (fd == -1) {
|
||||
if (gerror != NULL) {
|
||||
if (error != NULL) {
|
||||
int err = errno;
|
||||
*gerror = g_error_new (G_LOG_DOMAIN, g_file_error_from_errno (err), "Error opening file");
|
||||
*error = g_error_new (G_LOG_DOMAIN, g_file_error_from_errno (err), "Error opening file");
|
||||
}
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
if (fstat (fd, &st) != 0) {
|
||||
if (gerror != NULL) {
|
||||
if (error != NULL) {
|
||||
int err = errno;
|
||||
*gerror = g_error_new (G_LOG_DOMAIN, g_file_error_from_errno (err), "Error in fstat()");
|
||||
*error = g_error_new (G_LOG_DOMAIN, g_file_error_from_errno (err), "Error in fstat()");
|
||||
}
|
||||
close (fd);
|
||||
return FALSE;
|
||||
@@ -103,29 +103,29 @@ g_file_get_contents (const gchar *filename, gchar **contents, gsize *length, GEr
|
||||
}
|
||||
|
||||
gint
|
||||
g_file_open_tmp (const gchar *tmpl, gchar **name_used, GError **gerror)
|
||||
g_file_open_tmp (const gchar *tmpl, gchar **name_used, GError **error)
|
||||
{
|
||||
const static gchar *default_tmpl = ".XXXXXX";
|
||||
gchar *t;
|
||||
gint fd;
|
||||
size_t len;
|
||||
|
||||
g_return_val_if_fail (gerror == NULL || *gerror == NULL, -1);
|
||||
g_return_val_if_fail (error == NULL || *error == NULL, -1);
|
||||
|
||||
if (tmpl == NULL)
|
||||
tmpl = default_tmpl;
|
||||
|
||||
if (strchr (tmpl, G_DIR_SEPARATOR) != NULL) {
|
||||
if (gerror) {
|
||||
*gerror = g_error_new (G_LOG_DOMAIN, 24, "Template should not have any " G_DIR_SEPARATOR_S);
|
||||
if (error) {
|
||||
*error = g_error_new (G_LOG_DOMAIN, 24, "Template should not have any " G_DIR_SEPARATOR_S);
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
len = strlen (tmpl);
|
||||
if (len < 6 || strcmp (tmpl + len - 6, "XXXXXX")) {
|
||||
if (gerror) {
|
||||
*gerror = g_error_new (G_LOG_DOMAIN, 24, "Template should end with XXXXXX");
|
||||
if (error) {
|
||||
*error = g_error_new (G_LOG_DOMAIN, 24, "Template should end with XXXXXX");
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
@@ -135,9 +135,9 @@ g_file_open_tmp (const gchar *tmpl, gchar **name_used, GError **gerror)
|
||||
fd = mkstemp (t);
|
||||
|
||||
if (fd == -1) {
|
||||
if (gerror) {
|
||||
if (error) {
|
||||
int err = errno;
|
||||
*gerror = g_error_new (G_LOG_DOMAIN, g_file_error_from_errno (err), "Error in mkstemp()");
|
||||
*error = g_error_new (G_LOG_DOMAIN, g_file_error_from_errno (err), "Error in mkstemp()");
|
||||
}
|
||||
g_free (t);
|
||||
return -1;
|
||||
@@ -82,29 +82,11 @@ g_file_test (const gchar *filename, GFileTest test)
|
||||
gchar *
|
||||
g_mkdtemp (char *tmp_template)
|
||||
{
|
||||
/*
|
||||
* On systems without mkdtemp, use a reimplemented version
|
||||
* adapted from the Win32 version of this file. AIX is an
|
||||
* exception because i before version 7.2 lacks mkdtemp in
|
||||
* libc, and GCC can "fix" system headers so that it isn't
|
||||
* present without redefining it.
|
||||
*/
|
||||
#if defined(HAVE_MKDTEMP) && !defined(_AIX)
|
||||
#ifdef HAVE_MKDTEMP
|
||||
char *template_copy = g_strdup (tmp_template);
|
||||
|
||||
return mkdtemp (template_copy);
|
||||
#else
|
||||
char *template = g_strdup (tmp_template);
|
||||
|
||||
template = mktemp(template);
|
||||
if (template && *template) {
|
||||
/* 0700 is the mode specified in specs */
|
||||
if (mkdir (template, 0700) == 0){
|
||||
return template;
|
||||
}
|
||||
}
|
||||
|
||||
g_free (template);
|
||||
return NULL;
|
||||
g_error("Function not supported");
|
||||
#endif
|
||||
}
|
||||
File renamed without changes.
@@ -36,7 +36,7 @@
|
||||
#endif
|
||||
#include <errno.h>
|
||||
|
||||
static gpointer error_quark = (gpointer)"FileError";
|
||||
static gpointer error_quark = "FileError";
|
||||
|
||||
gpointer
|
||||
g_file_error_quark (void)
|
||||
@@ -545,9 +545,8 @@ void
|
||||
g_hash_table_destroy (GHashTable *hash)
|
||||
{
|
||||
int i;
|
||||
|
||||
if (!hash)
|
||||
return;
|
||||
|
||||
g_return_if_fail (hash != NULL);
|
||||
|
||||
for (i = 0; i < hash->table_size; i++){
|
||||
Slot *s, *next;
|
||||
@@ -254,16 +254,8 @@ g_iconv (GIConv cd, gchar **inbytes, gsize *inbytesleft,
|
||||
* Unicode encoders and decoders
|
||||
*/
|
||||
|
||||
static FORCE_INLINE (uint32_t)
|
||||
read_uint32_endian (unsigned char *inptr, unsigned endian)
|
||||
{
|
||||
if (endian == G_LITTLE_ENDIAN)
|
||||
return (inptr[3] << 24) | (inptr[2] << 16) | (inptr[1] << 8) | inptr[0];
|
||||
return (inptr[0] << 24) | (inptr[1] << 16) | (inptr[2] << 8) | inptr[3];
|
||||
}
|
||||
|
||||
static int
|
||||
decode_utf32_endian (char *inbuf, size_t inleft, gunichar *outchar, unsigned endian)
|
||||
decode_utf32be (char *inbuf, size_t inleft, gunichar *outchar)
|
||||
{
|
||||
unsigned char *inptr = (unsigned char *) inbuf;
|
||||
gunichar c;
|
||||
@@ -273,7 +265,7 @@ decode_utf32_endian (char *inbuf, size_t inleft, gunichar *outchar, unsigned end
|
||||
return -1;
|
||||
}
|
||||
|
||||
c = read_uint32_endian (inptr, endian);
|
||||
c = (inptr[0] << 24) | (inptr[1] << 16) | (inptr[2] << 8) | inptr[3];
|
||||
|
||||
if (c >= 0xd800 && c < 0xe000) {
|
||||
errno = EILSEQ;
|
||||
@@ -288,16 +280,30 @@ decode_utf32_endian (char *inbuf, size_t inleft, gunichar *outchar, unsigned end
|
||||
return 4;
|
||||
}
|
||||
|
||||
static int
|
||||
decode_utf32be (char *inbuf, size_t inleft, gunichar *outchar)
|
||||
{
|
||||
return decode_utf32_endian (inbuf, inleft, outchar, G_BIG_ENDIAN);
|
||||
}
|
||||
|
||||
static int
|
||||
decode_utf32le (char *inbuf, size_t inleft, gunichar *outchar)
|
||||
{
|
||||
return decode_utf32_endian (inbuf, inleft, outchar, G_LITTLE_ENDIAN);
|
||||
unsigned char *inptr = (unsigned char *) inbuf;
|
||||
gunichar c;
|
||||
|
||||
if (inleft < 4) {
|
||||
errno = EINVAL;
|
||||
return -1;
|
||||
}
|
||||
|
||||
c = (inptr[3] << 24) | (inptr[2] << 16) | (inptr[1] << 8) | inptr[0];
|
||||
|
||||
if (c >= 0xd800 && c < 0xe000) {
|
||||
errno = EILSEQ;
|
||||
return -1;
|
||||
} else if (c >= 0x110000) {
|
||||
errno = EILSEQ;
|
||||
return -1;
|
||||
}
|
||||
|
||||
*outchar = c;
|
||||
|
||||
return 4;
|
||||
}
|
||||
|
||||
static int
|
||||
@@ -336,16 +342,8 @@ encode_utf32le (gunichar c, char *outbuf, size_t outleft)
|
||||
return 4;
|
||||
}
|
||||
|
||||
static FORCE_INLINE (uint16_t)
|
||||
read_uint16_endian (unsigned char *inptr, unsigned endian)
|
||||
{
|
||||
if (endian == G_LITTLE_ENDIAN)
|
||||
return (inptr[1] << 8) | inptr[0];
|
||||
return (inptr[0] << 8) | inptr[1];
|
||||
}
|
||||
|
||||
static FORCE_INLINE (int)
|
||||
decode_utf16_endian (char *inbuf, size_t inleft, gunichar *outchar, unsigned endian)
|
||||
static int
|
||||
decode_utf16be (char *inbuf, size_t inleft, gunichar *outchar)
|
||||
{
|
||||
unsigned char *inptr = (unsigned char *) inbuf;
|
||||
gunichar2 c;
|
||||
@@ -356,7 +354,7 @@ decode_utf16_endian (char *inbuf, size_t inleft, gunichar *outchar, unsigned end
|
||||
return -1;
|
||||
}
|
||||
|
||||
u = read_uint16_endian (inptr, endian);
|
||||
u = (inptr[0] << 8) | inptr[1];
|
||||
|
||||
if (u < 0xd800) {
|
||||
/* 0x0000 -> 0xd7ff */
|
||||
@@ -369,7 +367,7 @@ decode_utf16_endian (char *inbuf, size_t inleft, gunichar *outchar, unsigned end
|
||||
return -2;
|
||||
}
|
||||
|
||||
c = read_uint16_endian (inptr + 2, endian);
|
||||
c = (inptr[2] << 8) | inptr[3];
|
||||
|
||||
if (c < 0xdc00 || c > 0xdfff) {
|
||||
errno = EILSEQ;
|
||||
@@ -392,31 +390,54 @@ decode_utf16_endian (char *inbuf, size_t inleft, gunichar *outchar, unsigned end
|
||||
}
|
||||
|
||||
static int
|
||||
decode_utf16be (char *inbuf, size_t inleft, gunichar *outchar)
|
||||
decode_utf16le (char *inbuf, size_t inleft, gunichar *outchar)
|
||||
{
|
||||
return decode_utf16_endian (inbuf, inleft, outchar, G_BIG_ENDIAN);
|
||||
unsigned char *inptr = (unsigned char *) inbuf;
|
||||
gunichar2 c;
|
||||
gunichar u;
|
||||
|
||||
if (inleft < 2) {
|
||||
errno = EINVAL;
|
||||
return -1;
|
||||
}
|
||||
|
||||
u = (inptr[1] << 8) | inptr[0];
|
||||
|
||||
if (u < 0xd800) {
|
||||
/* 0x0000 -> 0xd7ff */
|
||||
*outchar = u;
|
||||
return 2;
|
||||
} else if (u < 0xdc00) {
|
||||
/* 0xd800 -> 0xdbff */
|
||||
if (inleft < 4) {
|
||||
errno = EINVAL;
|
||||
return -2;
|
||||
}
|
||||
|
||||
c = (inptr[3] << 8) | inptr[2];
|
||||
|
||||
if (c < 0xdc00 || c > 0xdfff) {
|
||||
errno = EILSEQ;
|
||||
return -2;
|
||||
}
|
||||
|
||||
u = ((u - 0xd800) << 10) + (c - 0xdc00) + 0x0010000UL;
|
||||
*outchar = u;
|
||||
|
||||
return 4;
|
||||
} else if (u < 0xe000) {
|
||||
/* 0xdc00 -> 0xdfff */
|
||||
errno = EILSEQ;
|
||||
return -1;
|
||||
} else {
|
||||
/* 0xe000 -> 0xffff */
|
||||
*outchar = u;
|
||||
return 2;
|
||||
}
|
||||
}
|
||||
|
||||
static int
|
||||
decode_utf16le (char *inbuf, size_t inleft, gunichar *outchar)
|
||||
{
|
||||
return decode_utf16_endian (inbuf, inleft, outchar, G_LITTLE_ENDIAN);
|
||||
}
|
||||
|
||||
static FORCE_INLINE (void)
|
||||
write_uint16_endian (unsigned char *outptr, uint16_t c, unsigned endian)
|
||||
{
|
||||
if (endian == G_LITTLE_ENDIAN) {
|
||||
outptr[0] = c & 0xff;
|
||||
outptr[1] = (c >> 8) & 0xff;
|
||||
return;
|
||||
}
|
||||
outptr[0] = (c >> 8) & 0xff;
|
||||
outptr[1] = c & 0xff;
|
||||
}
|
||||
|
||||
static FORCE_INLINE (int)
|
||||
encode_utf16_endian (gunichar c, char *outbuf, size_t outleft, unsigned endian)
|
||||
encode_utf16be (gunichar c, char *outbuf, size_t outleft)
|
||||
{
|
||||
unsigned char *outptr = (unsigned char *) outbuf;
|
||||
gunichar2 ch;
|
||||
@@ -428,7 +449,9 @@ encode_utf16_endian (gunichar c, char *outbuf, size_t outleft, unsigned endian)
|
||||
return -1;
|
||||
}
|
||||
|
||||
write_uint16_endian (outptr, c, endian);
|
||||
outptr[0] = (c >> 8) & 0xff;
|
||||
outptr[1] = c & 0xff;
|
||||
|
||||
return 2;
|
||||
} else {
|
||||
if (outleft < 4) {
|
||||
@@ -439,24 +462,52 @@ encode_utf16_endian (gunichar c, char *outbuf, size_t outleft, unsigned endian)
|
||||
c2 = c - 0x10000;
|
||||
|
||||
ch = (gunichar2) ((c2 >> 10) + 0xd800);
|
||||
write_uint16_endian (outptr, ch, endian);
|
||||
|
||||
outptr[0] = (ch >> 8) & 0xff;
|
||||
outptr[1] = ch & 0xff;
|
||||
|
||||
ch = (gunichar2) ((c2 & 0x3ff) + 0xdc00);
|
||||
write_uint16_endian (outptr + 2, ch, endian);
|
||||
outptr[2] = (ch >> 8) & 0xff;
|
||||
outptr[3] = ch & 0xff;
|
||||
|
||||
return 4;
|
||||
}
|
||||
}
|
||||
|
||||
static int
|
||||
encode_utf16be (gunichar c, char *outbuf, size_t outleft)
|
||||
{
|
||||
return encode_utf16_endian (c, outbuf, outleft, G_BIG_ENDIAN);
|
||||
}
|
||||
|
||||
static int
|
||||
encode_utf16le (gunichar c, char *outbuf, size_t outleft)
|
||||
{
|
||||
return encode_utf16_endian (c, outbuf, outleft, G_LITTLE_ENDIAN);
|
||||
unsigned char *outptr = (unsigned char *) outbuf;
|
||||
gunichar2 ch;
|
||||
gunichar c2;
|
||||
|
||||
if (c < 0x10000) {
|
||||
if (outleft < 2) {
|
||||
errno = E2BIG;
|
||||
return -1;
|
||||
}
|
||||
|
||||
outptr[0] = c & 0xff;
|
||||
outptr[1] = (c >> 8) & 0xff;
|
||||
|
||||
return 2;
|
||||
} else {
|
||||
if (outleft < 4) {
|
||||
errno = E2BIG;
|
||||
return -1;
|
||||
}
|
||||
|
||||
c2 = c - 0x10000;
|
||||
|
||||
ch = (gunichar2) ((c2 >> 10) + 0xd800);
|
||||
outptr[0] = ch & 0xff;
|
||||
outptr[1] = (ch >> 8) & 0xff;
|
||||
|
||||
ch = (gunichar2) ((c2 & 0x3ff) + 0xdc00);
|
||||
outptr[2] = ch & 0xff;
|
||||
outptr[3] = (ch >> 8) & 0xff;
|
||||
|
||||
return 4;
|
||||
}
|
||||
}
|
||||
|
||||
static FORCE_INLINE (int)
|
||||
@@ -600,7 +651,7 @@ encode_latin1 (gunichar c, char *outbuf, size_t outleft)
|
||||
* Simple conversion API
|
||||
*/
|
||||
|
||||
static gpointer error_quark = (gpointer)"ConvertError";
|
||||
static gpointer error_quark = "ConvertError";
|
||||
|
||||
gpointer
|
||||
g_convert_error_quark (void)
|
||||
@@ -833,7 +884,7 @@ g_utf8_to_ucs4_fast (const gchar *str, glong len, glong *items_written)
|
||||
}
|
||||
|
||||
static gunichar2 *
|
||||
eg_utf8_to_utf16_general (const gchar *str, glong len, glong *items_read, glong *items_written, gboolean include_nuls, gboolean replace_invalid_codepoints, GError **err)
|
||||
eg_utf8_to_utf16_general (const gchar *str, glong len, glong *items_read, glong *items_written, gboolean include_nuls, GError **err)
|
||||
{
|
||||
gunichar2 *outbuf, *outptr;
|
||||
size_t outlen = 0;
|
||||
@@ -864,12 +915,8 @@ eg_utf8_to_utf16_general (const gchar *str, glong len, glong *items_read, glong
|
||||
break;
|
||||
|
||||
if ((u = g_unichar_to_utf16 (c, NULL)) < 0) {
|
||||
if (replace_invalid_codepoints) {
|
||||
u = 2;
|
||||
} else {
|
||||
errno = EILSEQ;
|
||||
goto error;
|
||||
}
|
||||
errno = EILSEQ;
|
||||
goto error;
|
||||
}
|
||||
|
||||
outlen += u;
|
||||
@@ -894,14 +941,7 @@ eg_utf8_to_utf16_general (const gchar *str, glong len, glong *items_read, glong
|
||||
if (c == 0 && !include_nuls)
|
||||
break;
|
||||
|
||||
u = g_unichar_to_utf16 (c, outptr);
|
||||
if ((u < 0) && replace_invalid_codepoints) {
|
||||
outptr[0] = 0xFFFD;
|
||||
outptr[1] = 0xFFFD;
|
||||
u = 2;
|
||||
}
|
||||
|
||||
outptr += u;
|
||||
outptr += g_unichar_to_utf16 (c, outptr);
|
||||
inleft -= n;
|
||||
inptr += n;
|
||||
}
|
||||
@@ -933,19 +973,13 @@ eg_utf8_to_utf16_general (const gchar *str, glong len, glong *items_read, glong
|
||||
gunichar2 *
|
||||
g_utf8_to_utf16 (const gchar *str, glong len, glong *items_read, glong *items_written, GError **err)
|
||||
{
|
||||
return eg_utf8_to_utf16_general (str, len, items_read, items_written, FALSE, FALSE, err);
|
||||
return eg_utf8_to_utf16_general (str, len, items_read, items_written, FALSE, err);
|
||||
}
|
||||
|
||||
gunichar2 *
|
||||
eg_utf8_to_utf16_with_nuls (const gchar *str, glong len, glong *items_read, glong *items_written, GError **err)
|
||||
{
|
||||
return eg_utf8_to_utf16_general (str, len, items_read, items_written, TRUE, FALSE, err);
|
||||
}
|
||||
|
||||
gunichar2 *
|
||||
eg_wtf8_to_utf16 (const gchar *str, glong len, glong *items_read, glong *items_written, GError **err)
|
||||
{
|
||||
return eg_utf8_to_utf16_general (str, len, items_read, items_written, TRUE, TRUE, err);
|
||||
return eg_utf8_to_utf16_general (str, len, items_read, items_written, TRUE, err);
|
||||
}
|
||||
|
||||
gunichar *
|
||||
@@ -17,16 +17,6 @@
|
||||
#include <inttypes.h>
|
||||
|
||||
#include <eglib-config.h>
|
||||
|
||||
// - Pointers should only be converted to or from pointer-sized integers.
|
||||
// - Any size integer can be converted to any other size integer.
|
||||
// - Therefore a pointer-sized integer is the intermediary between
|
||||
// a pointer and any integer type.
|
||||
#define GPOINTER_TO_INT(ptr) ((gint)(gssize)(ptr))
|
||||
#define GPOINTER_TO_UINT(ptr) ((guint)(gsize)(ptr))
|
||||
#define GINT_TO_POINTER(v) ((gpointer)(gssize)(v))
|
||||
#define GUINT_TO_POINTER(v) ((gpointer)(gsize)(v))
|
||||
|
||||
#ifndef EGLIB_NO_REMAP
|
||||
#include <eglib-remap.h>
|
||||
#endif
|
||||
@@ -99,12 +89,6 @@ typedef guint32 gunichar;
|
||||
#define G_MAXUSHORT USHRT_MAX
|
||||
#define G_MAXINT INT_MAX
|
||||
#define G_MININT INT_MIN
|
||||
#define G_MAXINT8 INT8_MAX
|
||||
#define G_MAXUINT8 UINT8_MAX
|
||||
#define G_MININT8 INT8_MIN
|
||||
#define G_MAXINT16 INT16_MAX
|
||||
#define G_MAXUINT16 UINT16_MAX
|
||||
#define G_MININT16 INT16_MIN
|
||||
#define G_MAXINT32 INT32_MAX
|
||||
#define G_MAXUINT32 UINT32_MAX
|
||||
#define G_MININT32 INT32_MIN
|
||||
@@ -123,14 +107,6 @@ typedef guint32 gunichar;
|
||||
#define ABS(a) ((a) > 0 ? (a) : -(a))
|
||||
#endif
|
||||
|
||||
#ifndef ALIGN_TO
|
||||
#define ALIGN_TO(val,align) ((((gssize)val) + ((align) - 1)) & ~((align) - 1))
|
||||
#endif
|
||||
|
||||
#ifndef ALIGN_PTR_TO
|
||||
#define ALIGN_PTR_TO(ptr,align) (gpointer)((((gssize)(ptr)) + (align - 1)) & (~(align - 1)))
|
||||
#endif
|
||||
|
||||
#define G_STRUCT_OFFSET(p_type,field) offsetof(p_type,field)
|
||||
|
||||
#define EGLIB_STRINGIFY(x) #x
|
||||
@@ -209,8 +185,8 @@ typedef struct {
|
||||
gchar *message;
|
||||
} GError;
|
||||
|
||||
void g_clear_error (GError **gerror);
|
||||
void g_error_free (GError *gerror);
|
||||
void g_clear_error (GError **error);
|
||||
void g_error_free (GError *error);
|
||||
GError *g_error_new (gpointer domain, gint code, const char *format, ...);
|
||||
void g_set_error (GError **err, gpointer domain, gint code, const gchar *format, ...);
|
||||
void g_propagate_error (GError **dest, GError *src);
|
||||
@@ -241,8 +217,8 @@ gchar *g_strnfill (gsize length, gchar fill_char);
|
||||
gchar *g_strdelimit (gchar *string, const gchar *delimiters, gchar new_delimiter);
|
||||
gchar *g_strescape (const gchar *source, const gchar *exceptions);
|
||||
|
||||
gchar *g_filename_to_uri (const gchar *filename, const gchar *hostname, GError **gerror);
|
||||
gchar *g_filename_from_uri (const gchar *uri, gchar **hostname, GError **gerror);
|
||||
gchar *g_filename_to_uri (const gchar *filename, const gchar *hostname, GError **error);
|
||||
gchar *g_filename_from_uri (const gchar *uri, gchar **hostname, GError **error);
|
||||
|
||||
gint g_printf (gchar const *format, ...);
|
||||
gint g_fprintf (FILE *file, gchar const *format, ...);
|
||||
@@ -269,8 +245,6 @@ gint g_ascii_xdigit_value (gchar c);
|
||||
#define g_ascii_isalpha(c) (isalpha (c) != 0)
|
||||
#define g_ascii_isprint(c) (isprint (c) != 0)
|
||||
#define g_ascii_isxdigit(c) (isxdigit (c) != 0)
|
||||
gboolean g_utf16_ascii_equal (const gunichar2 *utf16, size_t ulen, const char *ascii, size_t alen);
|
||||
gboolean g_utf16_asciiz_equal (const gunichar2 *utf16, const char *ascii);
|
||||
|
||||
/* FIXME: g_strcasecmp supports utf8 unicode stuff */
|
||||
#ifdef _MSC_VER
|
||||
@@ -550,7 +524,6 @@ void g_ptr_array_sort_with_data (GPtrArray *array, GCompareDataFunc co
|
||||
void g_ptr_array_set_size (GPtrArray *array, gint length);
|
||||
gpointer *g_ptr_array_free (GPtrArray *array, gboolean free_seg);
|
||||
void g_ptr_array_foreach (GPtrArray *array, GFunc func, gpointer user_data);
|
||||
guint g_ptr_array_capacity (GPtrArray *array);
|
||||
#define g_ptr_array_index(array,index) (array)->pdata[(index)]
|
||||
|
||||
/*
|
||||
@@ -593,7 +566,6 @@ typedef enum {
|
||||
G_LOG_LEVEL_MASK = ~(G_LOG_FLAG_RECURSION | G_LOG_FLAG_FATAL)
|
||||
} GLogLevelFlags;
|
||||
|
||||
void g_printv (const gchar *format, va_list args);
|
||||
void g_print (const gchar *format, ...);
|
||||
void g_printerr (const gchar *format, ...);
|
||||
GLogLevelFlags g_log_set_always_fatal (GLogLevelFlags fatal_mask);
|
||||
@@ -601,7 +573,6 @@ GLogLevelFlags g_log_set_fatal_mask (const gchar *log_domain, GLogLevelFlags f
|
||||
void g_logv (const gchar *log_domain, GLogLevelFlags log_level, const gchar *format, va_list args);
|
||||
void g_log (const gchar *log_domain, GLogLevelFlags log_level, const gchar *format, ...);
|
||||
void g_assertion_message (const gchar *format, ...) G_GNUC_NORETURN;
|
||||
const char * g_get_assertion_message (void);
|
||||
|
||||
#ifdef HAVE_C99_SUPPORT
|
||||
/* The for (;;) tells gc thats g_error () doesn't return, avoiding warnings */
|
||||
@@ -747,34 +718,9 @@ GUnicodeBreakType g_unichar_break_type (gunichar c);
|
||||
#define eg_unreachable()
|
||||
#endif
|
||||
|
||||
/* g_assert is a boolean expression; the precise value is not preserved, just true or false. */
|
||||
#define g_assert(x) (G_LIKELY((x)) ? 1 : (g_assertion_message ("* Assertion at %s:%d, condition `%s' not met\n", __FILE__, __LINE__, #x), 0))
|
||||
|
||||
#define g_assert(x) G_STMT_START { if (G_UNLIKELY (!(x))) g_assertion_message ("* Assertion at %s:%d, condition `%s' not met\n", __FILE__, __LINE__, #x); } G_STMT_END
|
||||
#define g_assert_not_reached() G_STMT_START { g_assertion_message ("* Assertion: should not be reached at %s:%d\n", __FILE__, __LINE__); eg_unreachable(); } G_STMT_END
|
||||
|
||||
/* f is format -- like printf and scanf
|
||||
* Where you might have said:
|
||||
* if (!(expr))
|
||||
* g_error("%s invalid bar:%d", __func__, bar)
|
||||
*
|
||||
* You can say:
|
||||
* g_assertf(expr, "bar:%d", bar);
|
||||
*
|
||||
* The usual assertion text of file/line/expr/newline are builtin, and __func__.
|
||||
*
|
||||
* g_assertf is a boolean expression -- the precise value is not preserved, just true or false.
|
||||
*
|
||||
* Other than expr, the parameters are not evaluated unless expr is false.
|
||||
*
|
||||
* format must be a string literal, in order to be concatenated.
|
||||
* If this is too restrictive, g_error remains.
|
||||
*/
|
||||
#if defined(_MSC_VER) && (_MSC_VER < 1910)
|
||||
#define g_assertf(x, format, ...) (G_LIKELY((x)) ? 1 : (g_assertion_message ("* Assertion at %s:%d, condition `%s' not met, function:%s, " format "\n", __FILE__, __LINE__, #x, __func__, __VA_ARGS__), 0))
|
||||
#else
|
||||
#define g_assertf(x, format, ...) (G_LIKELY((x)) ? 1 : (g_assertion_message ("* Assertion at %s:%d, condition `%s' not met, function:%s, " format "\n", __FILE__, __LINE__, #x, __func__, ##__VA_ARGS__), 0))
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Unicode conversion
|
||||
*/
|
||||
@@ -797,7 +743,6 @@ gunichar *g_utf8_to_ucs4_fast (const gchar *str, glong len, glong *items_writte
|
||||
gunichar *g_utf8_to_ucs4 (const gchar *str, glong len, glong *items_read, glong *items_written, GError **err);
|
||||
gunichar2 *g_utf8_to_utf16 (const gchar *str, glong len, glong *items_read, glong *items_written, GError **err);
|
||||
gunichar2 *eg_utf8_to_utf16_with_nuls (const gchar *str, glong len, glong *items_read, glong *items_written, GError **err);
|
||||
gunichar2 *eg_wtf8_to_utf16 (const gchar *str, glong len, glong *items_read, glong *items_written, GError **err);
|
||||
gchar *g_utf16_to_utf8 (const gunichar2 *str, glong len, glong *items_read, glong *items_written, GError **err);
|
||||
gunichar *g_utf16_to_ucs4 (const gunichar2 *str, glong len, glong *items_read, glong *items_written, GError **err);
|
||||
gchar *g_ucs4_to_utf8 (const gunichar *str, glong len, glong *items_read, glong *items_written, GError **err);
|
||||
@@ -834,8 +779,8 @@ gboolean g_ensure_directory_exists (const gchar *filename);
|
||||
* Shell
|
||||
*/
|
||||
|
||||
gboolean g_shell_parse_argv (const gchar *command_line, gint *argcp, gchar ***argvp, GError **gerror);
|
||||
gchar *g_shell_unquote (const gchar *quoted_string, GError **gerror);
|
||||
gboolean g_shell_parse_argv (const gchar *command_line, gint *argcp, gchar ***argvp, GError **error);
|
||||
gchar *g_shell_unquote (const gchar *quoted_string, GError **error);
|
||||
gchar *g_shell_quote (const gchar *unquoted_string);
|
||||
|
||||
/*
|
||||
@@ -853,9 +798,9 @@ typedef enum {
|
||||
|
||||
typedef void (*GSpawnChildSetupFunc) (gpointer user_data);
|
||||
|
||||
gboolean g_spawn_command_line_sync (const gchar *command_line, gchar **standard_output, gchar **standard_error, gint *exit_status, GError **gerror);
|
||||
gboolean g_spawn_command_line_sync (const gchar *command_line, gchar **standard_output, gchar **standard_error, gint *exit_status, GError **error);
|
||||
gboolean g_spawn_async_with_pipes (const gchar *working_directory, gchar **argv, gchar **envp, GSpawnFlags flags, GSpawnChildSetupFunc child_setup,
|
||||
gpointer user_data, GPid *child_pid, gint *standard_input, gint *standard_output, gint *standard_error, GError **gerror);
|
||||
gpointer user_data, GPid *child_pid, gint *standard_input, gint *standard_output, gint *standard_error, GError **error);
|
||||
|
||||
int eg_getdtablesize (void);
|
||||
|
||||
@@ -926,39 +871,16 @@ typedef enum {
|
||||
} GFileTest;
|
||||
|
||||
|
||||
gboolean g_file_set_contents (const gchar *filename, const gchar *contents, gssize length, GError **gerror);
|
||||
gboolean g_file_get_contents (const gchar *filename, gchar **contents, gsize *length, GError **gerror);
|
||||
gboolean g_file_set_contents (const gchar *filename, const gchar *contents, gssize length, GError **error);
|
||||
gboolean g_file_get_contents (const gchar *filename, gchar **contents, gsize *length, GError **error);
|
||||
GFileError g_file_error_from_errno (gint err_no);
|
||||
gint g_file_open_tmp (const gchar *tmpl, gchar **name_used, GError **gerror);
|
||||
gint g_file_open_tmp (const gchar *tmpl, gchar **name_used, GError **error);
|
||||
gboolean g_file_test (const gchar *filename, GFileTest test);
|
||||
|
||||
#ifdef G_OS_WIN32
|
||||
#define g_open _open
|
||||
#else
|
||||
#define g_open open
|
||||
#endif
|
||||
#define g_rename rename
|
||||
#define g_stat stat
|
||||
#ifdef G_OS_WIN32
|
||||
#define g_access _access
|
||||
#else
|
||||
#define g_access access
|
||||
#endif
|
||||
#ifdef G_OS_WIN32
|
||||
#define g_mktemp _mktemp
|
||||
#else
|
||||
#define g_mktemp mktemp
|
||||
#endif
|
||||
#ifdef G_OS_WIN32
|
||||
#define g_unlink _unlink
|
||||
#else
|
||||
#define g_unlink unlink
|
||||
#endif
|
||||
#ifdef G_OS_WIN32
|
||||
#define g_write _write
|
||||
#else
|
||||
#define g_write write
|
||||
#endif
|
||||
#define g_fopen fopen
|
||||
#define g_lstat lstat
|
||||
#define g_rmdir rmdir
|
||||
@@ -981,7 +903,7 @@ gboolean g_pattern_match_string (GPatternSpec *pspec, const gchar *string)
|
||||
* Directory
|
||||
*/
|
||||
typedef struct _GDir GDir;
|
||||
GDir *g_dir_open (const gchar *path, guint flags, GError **gerror);
|
||||
GDir *g_dir_open (const gchar *path, guint flags, GError **error);
|
||||
const gchar *g_dir_read_name (GDir *dir);
|
||||
void g_dir_rewind (GDir *dir);
|
||||
void g_dir_close (GDir *dir);
|
||||
@@ -1006,26 +928,26 @@ typedef struct {
|
||||
const gchar **attribute_names,
|
||||
const gchar **attribute_values,
|
||||
gpointer user_data,
|
||||
GError **gerror);
|
||||
GError **error);
|
||||
|
||||
void (*end_element) (GMarkupParseContext *context,
|
||||
const gchar *element_name,
|
||||
gpointer user_data,
|
||||
GError **gerror);
|
||||
GError **error);
|
||||
|
||||
void (*text) (GMarkupParseContext *context,
|
||||
const gchar *text,
|
||||
gsize text_len,
|
||||
gpointer user_data,
|
||||
GError **gerror);
|
||||
GError **error);
|
||||
|
||||
void (*passthrough) (GMarkupParseContext *context,
|
||||
const gchar *passthrough_text,
|
||||
gsize text_len,
|
||||
gpointer user_data,
|
||||
GError **gerror);
|
||||
GError **error);
|
||||
void (*error) (GMarkupParseContext *context,
|
||||
GError *gerror,
|
||||
GError *error,
|
||||
gpointer user_data);
|
||||
} GMarkupParser;
|
||||
|
||||
@@ -1036,9 +958,9 @@ GMarkupParseContext *g_markup_parse_context_new (const GMarkupParser *parser,
|
||||
void g_markup_parse_context_free (GMarkupParseContext *context);
|
||||
gboolean g_markup_parse_context_parse (GMarkupParseContext *context,
|
||||
const gchar *text, gssize text_len,
|
||||
GError **gerror);
|
||||
GError **error);
|
||||
gboolean g_markup_parse_context_end_parse (GMarkupParseContext *context,
|
||||
GError **gerror);
|
||||
GError **error);
|
||||
|
||||
/*
|
||||
* Character set conversion
|
||||
@@ -1052,14 +974,14 @@ int g_iconv_close (GIConv cd);
|
||||
gboolean g_get_charset (G_CONST_RETURN char **charset);
|
||||
gchar *g_locale_to_utf8 (const gchar *opsysstring, gssize len,
|
||||
gsize *bytes_read, gsize *bytes_written,
|
||||
GError **gerror);
|
||||
GError **error);
|
||||
gchar *g_locale_from_utf8 (const gchar *utf8string, gssize len, gsize *bytes_read,
|
||||
gsize *bytes_written, GError **gerror);
|
||||
gsize *bytes_written, GError **error);
|
||||
gchar *g_filename_from_utf8 (const gchar *utf8string, gssize len, gsize *bytes_read,
|
||||
gsize *bytes_written, GError **gerror);
|
||||
gsize *bytes_written, GError **error);
|
||||
gchar *g_convert (const gchar *str, gssize len,
|
||||
const gchar *to_codeset, const gchar *from_codeset,
|
||||
gsize *bytes_read, gsize *bytes_written, GError **gerror);
|
||||
gsize *bytes_read, gsize *bytes_written, GError **error);
|
||||
|
||||
/*
|
||||
* Unicode manipulation
|
||||
@@ -1152,3 +1074,6 @@ glong g_utf8_pointer_to_offset (const gchar *str, const gchar *pos);
|
||||
G_END_DECLS
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
File renamed without changes.
@@ -43,7 +43,7 @@
|
||||
#include <ctype.h>
|
||||
#include <glib.h>
|
||||
|
||||
#define set_error(msg, ...) do { if (gerror != NULL) *gerror = g_error_new (GINT_TO_POINTER (1), 1, msg, __VA_ARGS__); } while (0);
|
||||
#define set_error(msg, ...) do { if (error != NULL) *error = g_error_new (GINT_TO_POINTER (1), 1, msg, __VA_ARGS__); } while (0);
|
||||
|
||||
typedef enum {
|
||||
START,
|
||||
@@ -127,24 +127,6 @@ my_isalpha (char c)
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
static gboolean
|
||||
my_isnamestartchar (char c)
|
||||
{
|
||||
/* NameStartChar from https://www.w3.org/TR/xml/#sec-common-syn excluding non-ASCII and ':' */
|
||||
if (my_isalpha (c) || c == '_')
|
||||
return TRUE;
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
static gboolean
|
||||
my_isnamechar (char c)
|
||||
{
|
||||
/* NameChar from https://www.w3.org/TR/xml/#sec-common-syn excluding non-ASCII and ':' */
|
||||
if (my_isalnum (c) || c == '_' || c == '-' || c == '.')
|
||||
return TRUE;
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
static const char *
|
||||
skip_space (const char *p, const char *end)
|
||||
{
|
||||
@@ -154,7 +136,7 @@ skip_space (const char *p, const char *end)
|
||||
}
|
||||
|
||||
static const char *
|
||||
parse_value (const char *p, const char *end, char **value, GError **gerror)
|
||||
parse_value (const char *p, const char *end, char **value, GError **error)
|
||||
{
|
||||
const char *start;
|
||||
int l;
|
||||
@@ -184,9 +166,8 @@ parse_name (const char *p, const char *end, char **value)
|
||||
const char *start = p;
|
||||
int l;
|
||||
|
||||
if (p < end && my_isnamestartchar (*p))
|
||||
for (; p < end && my_isnamechar (*p); p++)
|
||||
;
|
||||
for (; p < end && my_isalnum (*p); p++)
|
||||
;
|
||||
if (p == end)
|
||||
return end;
|
||||
|
||||
@@ -200,7 +181,7 @@ parse_name (const char *p, const char *end, char **value)
|
||||
}
|
||||
|
||||
static const char *
|
||||
parse_attributes (const char *p, const char *end, char ***names, char ***values, GError **gerror, int *full_stop, int state)
|
||||
parse_attributes (const char *p, const char *end, char ***names, char ***values, GError **error, int *full_stop, int state)
|
||||
{
|
||||
int nnames = 0;
|
||||
|
||||
@@ -245,7 +226,7 @@ parse_attributes (const char *p, const char *end, char ***names, char ***values,
|
||||
return end;
|
||||
}
|
||||
|
||||
p = parse_value (p, end, &value, gerror);
|
||||
p = parse_value (p, end, &value, error);
|
||||
if (p == end){
|
||||
g_free (name);
|
||||
return p;
|
||||
@@ -280,7 +261,7 @@ destroy_parse_state (GMarkupParseContext *context)
|
||||
gboolean
|
||||
g_markup_parse_context_parse (GMarkupParseContext *context,
|
||||
const gchar *text, gssize text_len,
|
||||
GError **gerror)
|
||||
GError **error)
|
||||
{
|
||||
const char *p, *end;
|
||||
|
||||
@@ -328,12 +309,12 @@ g_markup_parse_context_parse (GMarkupParseContext *context,
|
||||
break;
|
||||
}
|
||||
|
||||
if (!my_isnamestartchar (*p)){
|
||||
if (!my_isalpha (*p)){
|
||||
set_error ("%s", "Expected an element name");
|
||||
goto fail;
|
||||
}
|
||||
|
||||
for (++p; p < end && my_isnamechar (*p); p++)
|
||||
for (++p; p < end && (my_isalnum (*p) || (*p == '.')); p++)
|
||||
;
|
||||
if (p == end){
|
||||
set_error ("%s", "Expected an element");
|
||||
@@ -347,14 +328,14 @@ g_markup_parse_context_parse (GMarkupParseContext *context,
|
||||
set_error ("%s", "Unfinished element");
|
||||
goto fail;
|
||||
}
|
||||
p = parse_attributes (p, end, &names, &values, gerror, &full_stop, context->state);
|
||||
p = parse_attributes (p, end, &names, &values, error, &full_stop, context->state);
|
||||
if (p == end){
|
||||
if (names != NULL) {
|
||||
g_strfreev (names);
|
||||
g_strfreev (values);
|
||||
}
|
||||
/* Only set the error if parse_attributes did not */
|
||||
if (gerror != NULL && *gerror == NULL)
|
||||
if (error != NULL && *error == NULL)
|
||||
set_error ("%s", "Unfinished sequence");
|
||||
goto fail;
|
||||
}
|
||||
@@ -370,22 +351,22 @@ g_markup_parse_context_parse (GMarkupParseContext *context,
|
||||
context->parser.start_element (context, ename,
|
||||
(const gchar **) names,
|
||||
(const gchar **) values,
|
||||
context->user_data, gerror);
|
||||
context->user_data, error);
|
||||
|
||||
if (names != NULL){
|
||||
g_strfreev (names);
|
||||
g_strfreev (values);
|
||||
}
|
||||
|
||||
if (gerror != NULL && *gerror != NULL){
|
||||
if (error != NULL && *error != NULL){
|
||||
g_free (ename);
|
||||
goto fail;
|
||||
}
|
||||
|
||||
if (full_stop){
|
||||
if (context->parser.end_element != NULL && context->state == START_ELEMENT){
|
||||
context->parser.end_element (context, ename, context->user_data, gerror);
|
||||
if (gerror != NULL && *gerror != NULL){
|
||||
context->parser.end_element (context, ename, context->user_data, error);
|
||||
if (error != NULL && *error != NULL){
|
||||
g_free (ename);
|
||||
goto fail;
|
||||
}
|
||||
@@ -425,8 +406,8 @@ g_markup_parse_context_parse (GMarkupParseContext *context,
|
||||
case FLUSH_TEXT:
|
||||
if (context->parser.text != NULL && context->text != NULL){
|
||||
context->parser.text (context, context->text->str, context->text->len,
|
||||
context->user_data, gerror);
|
||||
if (gerror != NULL && *gerror != NULL)
|
||||
context->user_data, error);
|
||||
if (error != NULL && *error != NULL)
|
||||
goto fail;
|
||||
}
|
||||
|
||||
@@ -449,8 +430,8 @@ g_markup_parse_context_parse (GMarkupParseContext *context,
|
||||
|
||||
text = current->data;
|
||||
if (context->parser.end_element != NULL){
|
||||
context->parser.end_element (context, text, context->user_data, gerror);
|
||||
if (gerror != NULL && *gerror != NULL){
|
||||
context->parser.end_element (context, text, context->user_data, error);
|
||||
if (error != NULL && *error != NULL){
|
||||
g_free (text);
|
||||
goto fail;
|
||||
}
|
||||
@@ -472,15 +453,15 @@ g_markup_parse_context_parse (GMarkupParseContext *context,
|
||||
|
||||
return TRUE;
|
||||
fail:
|
||||
if (context->parser.error && gerror != NULL && *gerror)
|
||||
context->parser.error (context, *gerror, context->user_data);
|
||||
if (context->parser.error && error != NULL && *error)
|
||||
context->parser.error (context, *error, context->user_data);
|
||||
|
||||
destroy_parse_state (context);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
gboolean
|
||||
g_markup_parse_context_end_parse (GMarkupParseContext *context, GError **gerror)
|
||||
g_markup_parse_context_end_parse (GMarkupParseContext *context, GError **error)
|
||||
{
|
||||
g_return_val_if_fail (context != NULL, FALSE);
|
||||
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -273,7 +273,7 @@ g_module_close (GModule *module)
|
||||
gchar *
|
||||
g_module_build_path (const gchar *directory, const gchar *module_name)
|
||||
{
|
||||
const char *lib_prefix = "";
|
||||
char *lib_prefix = "";
|
||||
|
||||
if (module_name == NULL)
|
||||
return NULL;
|
||||
@@ -281,8 +281,10 @@ g_module_build_path (const gchar *directory, const gchar *module_name)
|
||||
if (strncmp (module_name, "lib", 3) != 0)
|
||||
lib_prefix = LIBPREFIX;
|
||||
|
||||
if (directory && *directory)
|
||||
if (directory && *directory){
|
||||
|
||||
return g_strdup_printf ("%s/%s%s" LIBSUFFIX, directory, lib_prefix, module_name);
|
||||
}
|
||||
return g_strdup_printf ("%s%s" LIBSUFFIX, lib_prefix, module_name);
|
||||
}
|
||||
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -41,12 +41,17 @@ static void default_stdout_handler (const gchar *string);
|
||||
static void default_stderr_handler (const gchar *string);
|
||||
|
||||
void
|
||||
g_printv (const gchar *format, va_list args)
|
||||
g_print (const gchar *format, ...)
|
||||
{
|
||||
char *msg;
|
||||
va_list args;
|
||||
|
||||
if (g_vasprintf (&msg, format, args) < 0)
|
||||
va_start (args, format);
|
||||
if (g_vasprintf (&msg, format, args) < 0) {
|
||||
va_end (args);
|
||||
return;
|
||||
}
|
||||
va_end (args);
|
||||
|
||||
if (!stdout_handler)
|
||||
stdout_handler = default_stdout_handler;
|
||||
@@ -55,15 +60,6 @@ g_printv (const gchar *format, va_list args)
|
||||
g_free (msg);
|
||||
}
|
||||
|
||||
void
|
||||
g_print (const gchar *format, ...)
|
||||
{
|
||||
va_list args;
|
||||
va_start (args, format);
|
||||
g_printv (format, args);
|
||||
va_end (args);
|
||||
}
|
||||
|
||||
void
|
||||
g_printerr (const gchar *format, ...)
|
||||
{
|
||||
@@ -105,34 +101,19 @@ g_log_set_fatal_mask (const gchar *log_domain, GLogLevelFlags fatal_mask)
|
||||
return fatal_mask;
|
||||
}
|
||||
|
||||
#define g_logstr monoeg_g_logstr
|
||||
#define g_logv_nofree monoeg_g_logv_nofree
|
||||
|
||||
static void
|
||||
g_logstr (const gchar *log_domain, GLogLevelFlags log_level, const gchar *msg)
|
||||
{
|
||||
if (!default_log_func)
|
||||
default_log_func = g_log_default_handler;
|
||||
|
||||
default_log_func (log_domain, log_level, msg, default_log_func_user_data);
|
||||
}
|
||||
|
||||
static gchar*
|
||||
g_logv_nofree (const gchar *log_domain, GLogLevelFlags log_level, const gchar *format, va_list args)
|
||||
{
|
||||
char *msg;
|
||||
|
||||
if (g_vasprintf (&msg, format, args) < 0)
|
||||
return NULL;
|
||||
|
||||
g_logstr (log_domain, log_level, msg);
|
||||
return msg;
|
||||
}
|
||||
|
||||
void
|
||||
g_logv (const gchar *log_domain, GLogLevelFlags log_level, const gchar *format, va_list args)
|
||||
{
|
||||
g_free (g_logv_nofree (log_domain, log_level, format, args));
|
||||
char *msg;
|
||||
|
||||
if (!default_log_func)
|
||||
default_log_func = g_log_default_handler;
|
||||
|
||||
if (g_vasprintf (&msg, format, args) < 0)
|
||||
return;
|
||||
|
||||
default_log_func (log_domain, log_level, msg, default_log_func_user_data);
|
||||
g_free (msg);
|
||||
}
|
||||
|
||||
void
|
||||
@@ -145,28 +126,18 @@ g_log (const gchar *log_domain, GLogLevelFlags log_level, const gchar *format, .
|
||||
va_end (args);
|
||||
}
|
||||
|
||||
static char *failure_assertion = NULL;
|
||||
|
||||
const char *
|
||||
g_get_assertion_message (void)
|
||||
{
|
||||
return failure_assertion;
|
||||
}
|
||||
|
||||
void
|
||||
g_assertion_message (const gchar *format, ...)
|
||||
{
|
||||
va_list args;
|
||||
|
||||
va_start (args, format);
|
||||
|
||||
failure_assertion = g_logv_nofree (G_LOG_DOMAIN, G_LOG_LEVEL_ERROR, format, args);
|
||||
|
||||
g_logv (G_LOG_DOMAIN, G_LOG_LEVEL_ERROR, format, args);
|
||||
va_end (args);
|
||||
exit (0);
|
||||
}
|
||||
|
||||
#if HOST_ANDROID
|
||||
#if PLATFORM_ANDROID
|
||||
#include <android/log.h>
|
||||
|
||||
static android_LogPriority
|
||||
@@ -184,57 +155,10 @@ to_android_priority (GLogLevelFlags log_level)
|
||||
return ANDROID_LOG_UNKNOWN;
|
||||
}
|
||||
|
||||
#define LOG_MESSAGE_MAX_LEN 4096
|
||||
|
||||
static void
|
||||
android_log_line (gint log_priority, const gchar *log_domain, gchar *log_message, gint log_len)
|
||||
{
|
||||
gchar log_buf [LOG_MESSAGE_MAX_LEN];
|
||||
|
||||
g_assert (log_len <= LOG_MESSAGE_MAX_LEN - 1);
|
||||
|
||||
/* If line is longer than LOG_MESSAGE_MAX_LEN - 1, then we simply cut it out. This is consistent with the previous behavior. */
|
||||
strncpy (log_buf, log_message, log_len);
|
||||
log_buf [log_len] = '\0';
|
||||
|
||||
__android_log_write (log_priority, log_domain, log_buf);
|
||||
}
|
||||
|
||||
static void
|
||||
android_log (gint log_priority, const gchar *log_domain, const gchar *log_message)
|
||||
{
|
||||
gint log_message_len, log_message_p_len;
|
||||
gchar *log_message_p;
|
||||
|
||||
log_message_len = strlen (log_message);
|
||||
if (log_message_len <= LOG_MESSAGE_MAX_LEN) {
|
||||
__android_log_write (log_priority, log_domain, log_message);
|
||||
return;
|
||||
}
|
||||
|
||||
for (log_message_p = log_message; log_message_p < log_message + log_message_len;) {
|
||||
gchar *p = strstr (log_message_p, "\n");
|
||||
if (p == NULL) {
|
||||
/* There is no more "\n". */
|
||||
android_log_line (log_priority, log_domain, log_message_p, LOG_MESSAGE_MAX_LEN - 1);
|
||||
break;
|
||||
}
|
||||
|
||||
log_message_p_len = p - log_message_p;
|
||||
if (log_message_p_len > LOG_MESSAGE_MAX_LEN - 1)
|
||||
log_message_p_len = LOG_MESSAGE_MAX_LEN - 1;
|
||||
|
||||
android_log_line (log_priority, log_domain, log_message_p, log_message_p_len);
|
||||
|
||||
/* Set `log_message_p` to the character right after "\n" */
|
||||
log_message_p = p + 1;
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
g_log_default_handler (const gchar *log_domain, GLogLevelFlags log_level, const gchar *message, gpointer unused_data)
|
||||
{
|
||||
android_log (to_android_priority (log_level), log_domain, message);
|
||||
__android_log_write (to_android_priority (log_level), log_domain, message);
|
||||
if (log_level & fatal)
|
||||
abort ();
|
||||
}
|
||||
@@ -243,14 +167,14 @@ static void
|
||||
default_stdout_handler (const gchar *message)
|
||||
{
|
||||
/* TODO: provide a proper app name */
|
||||
android_log (ANDROID_LOG_ERROR, "mono", message);
|
||||
__android_log_write (ANDROID_LOG_ERROR, "mono", message);
|
||||
}
|
||||
|
||||
static void
|
||||
default_stderr_handler (const gchar *message)
|
||||
{
|
||||
/* TODO: provide a proper app name */
|
||||
android_log (ANDROID_LOG_ERROR, "mono", message);
|
||||
__android_log_write (ANDROID_LOG_ERROR, "mono", message);
|
||||
}
|
||||
|
||||
|
||||
@@ -160,8 +160,7 @@ g_path_get_basename (const char *filename)
|
||||
return g_strdup (&r[1]);
|
||||
}
|
||||
|
||||
//wasm does have strtok_r even though autoconf fails to find
|
||||
#if !defined (HAVE_STRTOK_R) && !defined (HOST_WASM)
|
||||
#ifndef HAVE_STRTOK_R
|
||||
// This is from BSD's strtok_r
|
||||
|
||||
char *
|
||||
@@ -251,13 +250,11 @@ g_find_program_in_path (const gchar *program)
|
||||
|
||||
x = NULL;
|
||||
probe_path = g_build_path (G_DIR_SEPARATOR_S, l, program, NULL);
|
||||
#ifdef HAVE_ACCESS
|
||||
if (g_access (probe_path, X_OK) == 0){ /* FIXME: on windows this is just a read permissions test */
|
||||
if (access (probe_path, X_OK) == 0){ /* FIXME: on windows this is just a read permissions test */
|
||||
g_free (curdir);
|
||||
g_free (p);
|
||||
return probe_path;
|
||||
}
|
||||
#endif
|
||||
g_free (probe_path);
|
||||
|
||||
#ifdef G_OS_WIN32
|
||||
@@ -267,14 +264,12 @@ g_find_program_in_path (const gchar *program)
|
||||
while (suffix_list[listx]) {
|
||||
program_exe = g_strjoin(NULL,program,suffix_list[listx],NULL);
|
||||
probe_path = g_build_path (G_DIR_SEPARATOR_S, l, program_exe, NULL);
|
||||
#ifdef HAVE_ACCESS
|
||||
if (g_access (probe_path, X_OK) == 0){ /* FIXME: on windows this is just a read permissions test */
|
||||
if (access (probe_path, X_OK) == 0){ /* FIXME: on windows this is just a read permissions test */
|
||||
g_free (curdir);
|
||||
g_free (p);
|
||||
g_free (program_exe);
|
||||
return probe_path;
|
||||
}
|
||||
#endif
|
||||
listx++;
|
||||
g_free (probe_path);
|
||||
g_free (program_exe);
|
||||
File renamed without changes.
@@ -225,8 +225,3 @@ g_ptr_array_sort_with_data (GPtrArray *array, GCompareDataFunc compare, gpointer
|
||||
g_qsort_with_data (array->pdata, array->len, sizeof (gpointer), compare, user_data);
|
||||
}
|
||||
|
||||
guint
|
||||
g_ptr_array_capacity (GPtrArray *array)
|
||||
{
|
||||
return ((GPtrArrayPriv *)array)->size;
|
||||
}
|
||||
File renamed without changes.
File renamed without changes.
@@ -29,7 +29,7 @@
|
||||
#include <glib.h>
|
||||
|
||||
static int
|
||||
split_cmdline (const gchar *cmdline, GPtrArray *array, GError **gerror)
|
||||
split_cmdline (const gchar *cmdline, GPtrArray *array, GError **error)
|
||||
{
|
||||
gchar *ptr;
|
||||
gchar c;
|
||||
@@ -81,15 +81,15 @@ split_cmdline (const gchar *cmdline, GPtrArray *array, GError **gerror)
|
||||
}
|
||||
|
||||
if (escaped) {
|
||||
if (gerror)
|
||||
*gerror = g_error_new (G_LOG_DOMAIN, 0, "Unfinished escape.");
|
||||
if (error)
|
||||
*error = g_error_new (G_LOG_DOMAIN, 0, "Unfinished escape.");
|
||||
g_string_free (str, TRUE);
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (quote_char) {
|
||||
if (gerror)
|
||||
*gerror = g_error_new (G_LOG_DOMAIN, 0, "Unfinished quote.");
|
||||
if (error)
|
||||
*error = g_error_new (G_LOG_DOMAIN, 0, "Unfinished quote.");
|
||||
g_string_free (str, TRUE);
|
||||
return -1;
|
||||
}
|
||||
@@ -104,17 +104,17 @@ split_cmdline (const gchar *cmdline, GPtrArray *array, GError **gerror)
|
||||
}
|
||||
|
||||
gboolean
|
||||
g_shell_parse_argv (const gchar *command_line, gint *argcp, gchar ***argvp, GError **gerror)
|
||||
g_shell_parse_argv (const gchar *command_line, gint *argcp, gchar ***argvp, GError **error)
|
||||
{
|
||||
GPtrArray *array;
|
||||
gint argc;
|
||||
gchar **argv;
|
||||
|
||||
g_return_val_if_fail (command_line, FALSE);
|
||||
g_return_val_if_fail (gerror == NULL || *gerror == NULL, FALSE);
|
||||
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
|
||||
|
||||
array = g_ptr_array_new();
|
||||
if (split_cmdline (command_line, array, gerror)) {
|
||||
if (split_cmdline (command_line, array, error)) {
|
||||
g_ptr_array_add (array, NULL);
|
||||
g_strfreev ((gchar **) array->pdata);
|
||||
g_ptr_array_free (array, FALSE);
|
||||
@@ -160,7 +160,7 @@ g_shell_quote (const gchar *unquoted_string)
|
||||
}
|
||||
|
||||
gchar *
|
||||
g_shell_unquote (const gchar *quoted_string, GError **gerror)
|
||||
g_shell_unquote (const gchar *quoted_string, GError **error)
|
||||
{
|
||||
GString *result;
|
||||
const char *p;
|
||||
@@ -192,7 +192,7 @@ g_shell_unquote (const gchar *quoted_string, GError **gerror)
|
||||
g_string_append_c (result, *p);
|
||||
}
|
||||
if (!*p){
|
||||
g_set_error (gerror, 0, 0, "Open quote");
|
||||
g_set_error (error, 0, 0, "Open quote");
|
||||
return NULL;
|
||||
}
|
||||
} else if (*p == '"'){
|
||||
@@ -203,7 +203,7 @@ g_shell_unquote (const gchar *quoted_string, GError **gerror)
|
||||
if (*p == '\\'){
|
||||
p++;
|
||||
if (*p == 0){
|
||||
g_set_error (gerror, 0, 0, "Open quote");
|
||||
g_set_error (error, 0, 0, "Open quote");
|
||||
return NULL;
|
||||
}
|
||||
switch (*p){
|
||||
@@ -220,7 +220,7 @@ g_shell_unquote (const gchar *quoted_string, GError **gerror)
|
||||
g_string_append_c (result, *p);
|
||||
}
|
||||
if (!*p){
|
||||
g_set_error (gerror, 0, 0, "Open quote");
|
||||
g_set_error (error, 0, 0, "Open quote");
|
||||
return NULL;
|
||||
}
|
||||
} else if (*p == '\\'){
|
||||
File renamed without changes.
@@ -68,9 +68,9 @@
|
||||
#define pipe(x) _pipe(x, 256, 0)
|
||||
#endif
|
||||
|
||||
#define set_error(msg, ...) do { if (gerror != NULL) *gerror = g_error_new (G_LOG_DOMAIN, 1, msg, __VA_ARGS__); } while (0)
|
||||
#define set_error_cond(cond,msg, ...) do { if ((cond) && gerror != NULL) *gerror = g_error_new (G_LOG_DOMAIN, 1, msg, __VA_ARGS__); } while (0)
|
||||
#define set_error_status(status,msg, ...) do { if (gerror != NULL) *gerror = g_error_new (G_LOG_DOMAIN, status, msg, __VA_ARGS__); } while (0)
|
||||
#define set_error(msg, ...) do { if (error != NULL) *error = g_error_new (G_LOG_DOMAIN, 1, msg, __VA_ARGS__); } while (0)
|
||||
#define set_error_cond(cond,msg, ...) do { if ((cond) && error != NULL) *error = g_error_new (G_LOG_DOMAIN, 1, msg, __VA_ARGS__); } while (0)
|
||||
#define set_error_status(status,msg, ...) do { if (error != NULL) *error = g_error_new (G_LOG_DOMAIN, status, msg, __VA_ARGS__); } while (0)
|
||||
#define NO_INTR(var,cmd) do { (var) = (cmd); } while ((var) == -1 && errno == EINTR)
|
||||
#define CLOSE_PIPE(p) do { close (p [0]); close (p [1]); } while (0)
|
||||
|
||||
@@ -94,7 +94,7 @@ extern char **environ;
|
||||
|
||||
#ifndef G_OS_WIN32
|
||||
static int
|
||||
safe_read (int fd, gchar *buffer, gint count, GError **gerror)
|
||||
safe_read (int fd, gchar *buffer, gint count, GError **error)
|
||||
{
|
||||
int res;
|
||||
|
||||
@@ -104,7 +104,7 @@ safe_read (int fd, gchar *buffer, gint count, GError **gerror)
|
||||
}
|
||||
|
||||
static int
|
||||
read_pipes (int outfd, gchar **out_str, int errfd, gchar **err_str, GError **gerror)
|
||||
read_pipes (int outfd, gchar **out_str, int errfd, gchar **err_str, GError **error)
|
||||
{
|
||||
fd_set rfds;
|
||||
int res;
|
||||
@@ -151,7 +151,7 @@ read_pipes (int outfd, gchar **out_str, int errfd, gchar **err_str, GError **ger
|
||||
if (buffer == NULL)
|
||||
buffer = g_malloc (1024);
|
||||
if (!out_closed && FD_ISSET (outfd, &rfds)) {
|
||||
nread = safe_read (outfd, buffer, 1024, gerror);
|
||||
nread = safe_read (outfd, buffer, 1024, error);
|
||||
if (nread < 0) {
|
||||
close (errfd);
|
||||
close (outfd);
|
||||
@@ -165,7 +165,7 @@ read_pipes (int outfd, gchar **out_str, int errfd, gchar **err_str, GError **ger
|
||||
}
|
||||
|
||||
if (!err_closed && FD_ISSET (errfd, &rfds)) {
|
||||
nread = safe_read (errfd, buffer, 1024, gerror);
|
||||
nread = safe_read (errfd, buffer, 1024, error);
|
||||
if (nread < 0) {
|
||||
close (errfd);
|
||||
close (outfd);
|
||||
@@ -191,7 +191,7 @@ read_pipes (int outfd, gchar **out_str, int errfd, gchar **err_str, GError **ger
|
||||
}
|
||||
|
||||
static gboolean
|
||||
create_pipe (int *fds, GError **gerror)
|
||||
create_pipe (int *fds, GError **error)
|
||||
{
|
||||
if (pipe (fds) == -1) {
|
||||
set_error ("%s", "Error creating pipe.");
|
||||
@@ -250,7 +250,7 @@ g_spawn_command_line_sync (const gchar *command_line,
|
||||
gchar **standard_output,
|
||||
gchar **standard_error,
|
||||
gint *exit_status,
|
||||
GError **gerror)
|
||||
GError **error)
|
||||
{
|
||||
#ifdef G_OS_WIN32
|
||||
#elif !defined (HAVE_FORK) || !defined (HAVE_EXECV)
|
||||
@@ -265,13 +265,13 @@ g_spawn_command_line_sync (const gchar *command_line,
|
||||
int status;
|
||||
int res;
|
||||
|
||||
if (!g_shell_parse_argv (command_line, &argc, &argv, gerror))
|
||||
if (!g_shell_parse_argv (command_line, &argc, &argv, error))
|
||||
return FALSE;
|
||||
|
||||
if (standard_output && !create_pipe (stdout_pipe, gerror))
|
||||
if (standard_output && !create_pipe (stdout_pipe, error))
|
||||
return FALSE;
|
||||
|
||||
if (standard_error && !create_pipe (stderr_pipe, gerror)) {
|
||||
if (standard_error && !create_pipe (stderr_pipe, error)) {
|
||||
if (standard_output) {
|
||||
CLOSE_PIPE (stdout_pipe);
|
||||
}
|
||||
@@ -317,7 +317,7 @@ g_spawn_command_line_sync (const gchar *command_line,
|
||||
close (stderr_pipe [1]);
|
||||
|
||||
if (standard_output || standard_error) {
|
||||
res = read_pipes (stdout_pipe [0], standard_output, stderr_pipe [0], standard_error, gerror);
|
||||
res = read_pipes (stdout_pipe [0], standard_output, stderr_pipe [0], standard_error, error);
|
||||
if (res) {
|
||||
waitpid (pid, &status, WNOHANG); /* avoid zombie */
|
||||
return FALSE;
|
||||
@@ -349,7 +349,7 @@ g_spawn_async_with_pipes (const gchar *working_directory,
|
||||
gint *standard_input,
|
||||
gint *standard_output,
|
||||
gint *standard_error,
|
||||
GError **gerror)
|
||||
GError **error)
|
||||
{
|
||||
#ifdef G_OS_WIN32
|
||||
#elif !defined (HAVE_FORK) || !defined (HAVE_EXECVE)
|
||||
@@ -365,21 +365,21 @@ g_spawn_async_with_pipes (const gchar *working_directory,
|
||||
|
||||
g_return_val_if_fail (argv != NULL, FALSE); /* Only mandatory arg */
|
||||
|
||||
if (!create_pipe (info_pipe, gerror))
|
||||
if (!create_pipe (info_pipe, error))
|
||||
return FALSE;
|
||||
|
||||
if (standard_output && !create_pipe (out_pipe, gerror)) {
|
||||
if (standard_output && !create_pipe (out_pipe, error)) {
|
||||
CLOSE_PIPE (info_pipe);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
if (standard_error && !create_pipe (err_pipe, gerror)) {
|
||||
if (standard_error && !create_pipe (err_pipe, error)) {
|
||||
CLOSE_PIPE (info_pipe);
|
||||
CLOSE_PIPE (out_pipe);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
if (standard_input && !create_pipe (in_pipe, gerror)) {
|
||||
if (standard_input && !create_pipe (in_pipe, error)) {
|
||||
CLOSE_PIPE (info_pipe);
|
||||
CLOSE_PIPE (out_pipe);
|
||||
CLOSE_PIPE (err_pipe);
|
||||
@@ -231,11 +231,10 @@ g_strerror (gint errnum)
|
||||
#ifdef HAVE_STRERROR_R
|
||||
char tmp_buff [128]; //Quite arbitrary, should be large enough
|
||||
char *buff = tmp_buff;
|
||||
size_t buff_len = sizeof (tmp_buff);
|
||||
int buff_len = sizeof (tmp_buff);
|
||||
int r;
|
||||
buff [0] = 0;
|
||||
|
||||
#ifndef STRERROR_R_CHAR_P
|
||||
int r;
|
||||
while ((r = strerror_r (errnum, buff, buff_len - 1))) {
|
||||
if (r != ERANGE) {
|
||||
buff = g_strdup_printf ("Invalid Error code '%d'", errnum);
|
||||
@@ -252,16 +251,10 @@ g_strerror (gint errnum)
|
||||
error_messages [errnum] = g_strdup (buff);
|
||||
if (buff != tmp_buff)
|
||||
g_free (buff);
|
||||
#else /* STRERROR_R_CHAR_P */
|
||||
buff = strerror_r (errnum, buff, buff_len);
|
||||
if (!error_messages [errnum])
|
||||
error_messages [errnum] = g_strdup (buff);
|
||||
#endif /* STRERROR_R_CHAR_P */
|
||||
|
||||
#else /* HAVE_STRERROR_R */
|
||||
#else
|
||||
if (!error_messages [errnum])
|
||||
error_messages [errnum] = g_strdup_printf ("Error code '%d'", errnum);
|
||||
#endif /* HAVE_STRERROR_R */
|
||||
#endif
|
||||
|
||||
|
||||
#ifndef G_OS_WIN32
|
||||
@@ -662,7 +655,7 @@ char_needs_encoding (char c)
|
||||
}
|
||||
|
||||
gchar *
|
||||
g_filename_to_uri (const gchar *filename, const gchar *hostname, GError **gerror)
|
||||
g_filename_to_uri (const gchar *filename, const gchar *hostname, GError **error)
|
||||
{
|
||||
size_t n;
|
||||
char *ret, *rp;
|
||||
@@ -679,8 +672,8 @@ g_filename_to_uri (const gchar *filename, const gchar *hostname, GError **gerror
|
||||
g_warning ("%s", "eglib: g_filename_to_uri: hostname not handled");
|
||||
|
||||
if (!g_path_is_absolute (filename)){
|
||||
if (gerror != NULL)
|
||||
*gerror = g_error_new (NULL, 2, "Not an absolute filename");
|
||||
if (error != NULL)
|
||||
*error = g_error_new (NULL, 2, "Not an absolute filename");
|
||||
|
||||
return NULL;
|
||||
}
|
||||
@@ -724,15 +717,15 @@ decode (char p)
|
||||
if (p >= '0' && p <= '9')
|
||||
return p - '0';
|
||||
if (p >= 'A' && p <= 'F')
|
||||
return (p - 'A') + 10;
|
||||
return p - 'A';
|
||||
if (p >= 'a' && p <= 'f')
|
||||
return (p - 'a') + 10;
|
||||
return p - 'a';
|
||||
g_assert_not_reached ();
|
||||
return 0;
|
||||
}
|
||||
|
||||
gchar *
|
||||
g_filename_from_uri (const gchar *uri, gchar **hostname, GError **gerror)
|
||||
g_filename_from_uri (const gchar *uri, gchar **hostname, GError **error)
|
||||
{
|
||||
const char *p;
|
||||
char *r, *result;
|
||||
@@ -744,8 +737,8 @@ g_filename_from_uri (const gchar *uri, gchar **hostname, GError **gerror)
|
||||
g_warning ("%s", "eglib: g_filename_from_uri: hostname not handled");
|
||||
|
||||
if (strncmp (uri, "file:///", 8) != 0){
|
||||
if (gerror != NULL)
|
||||
*gerror = g_error_new (NULL, 2, "URI does not start with the file: scheme");
|
||||
if (error != NULL)
|
||||
*error = g_error_new (NULL, 2, "URI does not start with the file: scheme");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@@ -754,8 +747,8 @@ g_filename_from_uri (const gchar *uri, gchar **hostname, GError **gerror)
|
||||
if (p [1] && p [2] && isxdigit (p [1]) && isxdigit (p [2])){
|
||||
p += 2;
|
||||
} else {
|
||||
if (gerror != NULL)
|
||||
*gerror = g_error_new (NULL, 2, "URI contains an invalid escape sequence");
|
||||
if (error != NULL)
|
||||
*error = g_error_new (NULL, 2, "URI contains an invalid escape sequence");
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
@@ -886,34 +879,6 @@ g_ascii_strcasecmp (const gchar *s1, const gchar *s2)
|
||||
return (*sp1) - (*sp2);
|
||||
}
|
||||
|
||||
gboolean
|
||||
g_utf16_ascii_equal (const gunichar2 *utf16, size_t ulen, const char *ascii, size_t alen)
|
||||
{
|
||||
size_t i;
|
||||
if (ulen != alen)
|
||||
return FALSE;
|
||||
for (i = 0; i < ulen; ++i) {
|
||||
if (utf16[i] != ascii[i])
|
||||
return FALSE;
|
||||
}
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
gboolean
|
||||
g_utf16_asciiz_equal (const gunichar2 *utf16, const char *ascii)
|
||||
// z for zero means null terminated
|
||||
{
|
||||
while (1)
|
||||
{
|
||||
char a = *ascii++;
|
||||
gunichar2 u = *utf16++;
|
||||
if (a != u)
|
||||
return FALSE;
|
||||
if (a == 0)
|
||||
return TRUE;
|
||||
}
|
||||
}
|
||||
|
||||
gchar *
|
||||
g_strdelimit (gchar *string, const gchar *delimiters, gchar new_delimiter)
|
||||
{
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -11,24 +11,24 @@
|
||||
#define CODESET 1
|
||||
#include <windows.h>
|
||||
|
||||
extern const char *eg_my_charset;
|
||||
extern const char *my_charset;
|
||||
static gboolean is_utf8;
|
||||
|
||||
gboolean
|
||||
g_get_charset (G_CONST_RETURN char **charset)
|
||||
{
|
||||
if (eg_my_charset == NULL) {
|
||||
if (my_charset == NULL) {
|
||||
static char buf [14];
|
||||
CPINFOEXW cp_info;
|
||||
CPINFOEXA cp_info;
|
||||
|
||||
GetCPInfoExW (CP_ACP, 0, &cp_info);
|
||||
GetCPInfoExA (CP_ACP, 0, &cp_info);
|
||||
sprintf (buf, "CP%u", cp_info.CodePage);
|
||||
eg_my_charset = buf;
|
||||
my_charset = buf;
|
||||
is_utf8 = FALSE;
|
||||
}
|
||||
|
||||
if (charset != NULL)
|
||||
*charset = eg_my_charset;
|
||||
*charset = my_charset;
|
||||
|
||||
return is_utf8;
|
||||
}
|
||||
@@ -11,21 +11,21 @@
|
||||
#define CODESET 1
|
||||
#include <windows.h>
|
||||
|
||||
extern const char *eg_my_charset;
|
||||
extern const char *my_charset;
|
||||
static gboolean is_utf8;
|
||||
|
||||
gboolean
|
||||
g_get_charset (G_CONST_RETURN char **charset)
|
||||
{
|
||||
if (eg_my_charset == NULL) {
|
||||
if (my_charset == NULL) {
|
||||
static char buf [14];
|
||||
sprintf (buf, "CP%u", GetACP ());
|
||||
eg_my_charset = buf;
|
||||
my_charset = buf;
|
||||
is_utf8 = FALSE;
|
||||
}
|
||||
|
||||
if (charset != NULL)
|
||||
*charset = eg_my_charset;
|
||||
*charset = my_charset;
|
||||
|
||||
return is_utf8;
|
||||
}
|
||||
@@ -45,7 +45,7 @@
|
||||
# endif
|
||||
#endif
|
||||
|
||||
const char *eg_my_charset;
|
||||
const char *my_charset;
|
||||
|
||||
/*
|
||||
* Character set conversion
|
||||
@@ -98,7 +98,7 @@ g_unichar_break_type (gunichar c)
|
||||
return G_UNICODE_BREAK_UNKNOWN;
|
||||
}
|
||||
|
||||
static gunichar
|
||||
gunichar
|
||||
g_unichar_case (gunichar c, gboolean upper)
|
||||
{
|
||||
gint8 i, i2;
|
||||
@@ -188,7 +188,7 @@ g_unichar_isspace (gunichar c)
|
||||
* This is broken, and assumes an UTF8 system, but will do for eglib's first user
|
||||
*/
|
||||
gchar *
|
||||
g_filename_from_utf8 (const gchar *utf8string, gssize len, gsize *bytes_read, gsize *bytes_written, GError **gerror)
|
||||
g_filename_from_utf8 (const gchar *utf8string, gssize len, gsize *bytes_read, gsize *bytes_written, GError **error)
|
||||
{
|
||||
char *res;
|
||||
|
||||
@@ -206,35 +206,35 @@ static gboolean is_utf8;
|
||||
gboolean
|
||||
g_get_charset (G_CONST_RETURN char **charset)
|
||||
{
|
||||
if (eg_my_charset == NULL) {
|
||||
if (my_charset == NULL) {
|
||||
/* These shouldn't be heap allocated */
|
||||
#if defined(HAVE_LOCALCHARSET_H)
|
||||
eg_my_charset = locale_charset ();
|
||||
my_charset = locale_charset ();
|
||||
#else
|
||||
eg_my_charset = "UTF-8";
|
||||
my_charset = "UTF-8";
|
||||
#endif
|
||||
is_utf8 = strcmp (eg_my_charset, "UTF-8") == 0;
|
||||
is_utf8 = strcmp (my_charset, "UTF-8") == 0;
|
||||
}
|
||||
|
||||
if (charset != NULL)
|
||||
*charset = eg_my_charset;
|
||||
*charset = my_charset;
|
||||
|
||||
return is_utf8;
|
||||
}
|
||||
#endif /* G_OS_WIN32 */
|
||||
|
||||
gchar *
|
||||
g_locale_to_utf8 (const gchar *opsysstring, gssize len, gsize *bytes_read, gsize *bytes_written, GError **gerror)
|
||||
g_locale_to_utf8 (const gchar *opsysstring, gssize len, gsize *bytes_read, gsize *bytes_written, GError **error)
|
||||
{
|
||||
g_get_charset (NULL);
|
||||
|
||||
return g_convert (opsysstring, len, "UTF-8", eg_my_charset, bytes_read, bytes_written, gerror);
|
||||
return g_convert (opsysstring, len, "UTF-8", my_charset, bytes_read, bytes_written, error);
|
||||
}
|
||||
|
||||
gchar *
|
||||
g_locale_from_utf8 (const gchar *utf8string, gssize len, gsize *bytes_read, gsize *bytes_written, GError **gerror)
|
||||
g_locale_from_utf8 (const gchar *utf8string, gssize len, gsize *bytes_read, gsize *bytes_written, GError **error)
|
||||
{
|
||||
g_get_charset (NULL);
|
||||
|
||||
return g_convert (utf8string, len, eg_my_charset, "UTF-8", bytes_read, bytes_written, gerror);
|
||||
return g_convert (utf8string, len, my_charset, "UTF-8", bytes_read, bytes_written, error);
|
||||
}
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -1,5 +1,3 @@
|
||||
include $(top_srcdir)/mk/common.mk
|
||||
|
||||
EXTRA_DIST = UTF-8.txt UTF-16BE.txt UTF-16LE.txt UTF-32BE.txt UTF-32LE.txt
|
||||
|
||||
SOURCES = \
|
||||
@@ -33,18 +31,13 @@ SOURCES = \
|
||||
|
||||
test_eglib_SOURCES = $(SOURCES)
|
||||
|
||||
CFLAGS += -Wall -DEGLIB_TESTS=1 -D_FORTIFY_SOURCE=2 -I$(srcdir)/.. -I.. -DDRIVER_NAME=\"EGlib\"
|
||||
test_eglib_LDADD = ../libeglib.la $(LTLIBICONV)
|
||||
assertf_LDADD = ../libeglib.la $(LTLIBICONV)
|
||||
|
||||
# Something amiss with subdirs ordering?
|
||||
../libeglib.la: ../goutput.c # etc
|
||||
make -C .. $(@F)
|
||||
test_eglib_CFLAGS = -Wall -DEGLIB_TESTS=1 -D_FORTIFY_SOURCE=2 -I$(srcdir)/../src -I../src -DDRIVER_NAME=\"EGlib\"
|
||||
test_eglib_LDADD = ../src/libeglib.la $(LIBICONV)
|
||||
|
||||
run-eglib: all
|
||||
srcdir=`readlink -f $(srcdir)` ./test-eglib
|
||||
|
||||
noinst_PROGRAMS = test-eglib assertf
|
||||
noinst_PROGRAMS = test-eglib
|
||||
|
||||
run-both: run-eglib
|
||||
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -4,8 +4,8 @@
|
||||
#include "test.h"
|
||||
|
||||
/* example from glib documentation */
|
||||
static RESULT
|
||||
test_array_big (void)
|
||||
RESULT
|
||||
test_array_big ()
|
||||
{
|
||||
GArray *garray;
|
||||
gint i;
|
||||
@@ -25,8 +25,8 @@ test_array_big (void)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static RESULT
|
||||
test_array_index (void)
|
||||
RESULT
|
||||
test_array_index ()
|
||||
{
|
||||
GArray *array = g_array_new (FALSE, FALSE, sizeof (int));
|
||||
int v;
|
||||
@@ -42,8 +42,8 @@ test_array_index (void)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static RESULT
|
||||
test_array_append_zero_terminated (void)
|
||||
RESULT
|
||||
test_array_append_zero_terminated ()
|
||||
{
|
||||
GArray *array = g_array_new (TRUE, FALSE, sizeof (int));
|
||||
int v;
|
||||
@@ -62,8 +62,8 @@ test_array_append_zero_terminated (void)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static RESULT
|
||||
test_array_append (void)
|
||||
RESULT
|
||||
test_array_append ()
|
||||
{
|
||||
GArray *array = g_array_new (FALSE, FALSE, sizeof (int));
|
||||
int v;
|
||||
@@ -83,8 +83,8 @@ test_array_append (void)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static RESULT
|
||||
test_array_insert_val (void)
|
||||
RESULT
|
||||
test_array_insert_val ()
|
||||
{
|
||||
GArray *array = g_array_new (FALSE, FALSE, sizeof (gpointer));
|
||||
gpointer ptr0, ptr1, ptr2, ptr3;
|
||||
@@ -126,8 +126,8 @@ test_array_insert_val (void)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static RESULT
|
||||
test_array_remove (void)
|
||||
RESULT
|
||||
test_array_remove ()
|
||||
{
|
||||
GArray *array = g_array_new (FALSE, FALSE, sizeof (int));
|
||||
int v[] = {30, 29, 28, 27, 26, 25};
|
||||
@@ -11,11 +11,11 @@
|
||||
#include "test.h"
|
||||
|
||||
/* This test is just to be used with valgrind */
|
||||
static RESULT
|
||||
test_dir (void)
|
||||
RESULT
|
||||
test_dir ()
|
||||
{
|
||||
GDir *dir;
|
||||
GError *gerror;
|
||||
GError *error;
|
||||
const gchar *name;
|
||||
|
||||
/*
|
||||
@@ -29,18 +29,18 @@ test_dir (void)
|
||||
if (dir != NULL)
|
||||
return FAILED ("2 Should be an error");
|
||||
|
||||
gerror = NULL;
|
||||
dir = g_dir_open (".ljasdslakjd", 9, &gerror);
|
||||
error = NULL;
|
||||
dir = g_dir_open (".ljasdslakjd", 9, &error);
|
||||
if (dir != NULL)
|
||||
return FAILED ("3 opendir should fail");
|
||||
if (gerror == NULL)
|
||||
if (error == NULL)
|
||||
return FAILED ("4 got no error");
|
||||
g_error_free (gerror);
|
||||
gerror = NULL;
|
||||
dir = g_dir_open (g_get_tmp_dir (), 9, &gerror);
|
||||
g_error_free (error);
|
||||
error = NULL;
|
||||
dir = g_dir_open (g_get_tmp_dir (), 9, &error);
|
||||
if (dir == NULL)
|
||||
return FAILED ("5 opendir should succeed");
|
||||
if (gerror != NULL)
|
||||
if (error != NULL)
|
||||
return FAILED ("6 got an error");
|
||||
name = NULL;
|
||||
name = g_dir_read_name (dir);
|
||||
@@ -62,3 +62,5 @@ static Test dir_tests [] = {
|
||||
};
|
||||
|
||||
DEFINE_TEST_GROUP_INIT(dir_tests_init, dir_tests)
|
||||
|
||||
|
||||
@@ -54,16 +54,16 @@ typedef struct _StringArray {
|
||||
static StringArray *
|
||||
string_array_append(StringArray *array, gchar *string)
|
||||
{
|
||||
if (array == NULL) {
|
||||
if(array == NULL) {
|
||||
array = g_new0(StringArray, 1);
|
||||
array->length = 1;
|
||||
array->strings = g_malloc(sizeof(gchar *) * 2);
|
||||
} else {
|
||||
array->length++;
|
||||
array->strings = g_realloc(array->strings, sizeof(gchar *)
|
||||
array->strings = g_realloc(array->strings, sizeof(gchar *)
|
||||
* (array->length + 1));
|
||||
}
|
||||
|
||||
|
||||
array->strings[array->length - 1] = string;
|
||||
array->strings[array->length] = NULL;
|
||||
|
||||
@@ -82,7 +82,7 @@ string_array_free(StringArray *array)
|
||||
static void print_help(char *s)
|
||||
{
|
||||
gint i;
|
||||
|
||||
|
||||
printf("Usage: %s [OPTION]... [TESTGROUP]...\n\n", s);
|
||||
printf("OPTIONS are:\n");
|
||||
printf(" -h, --help show this help\n");
|
||||
@@ -96,8 +96,8 @@ static void print_help(char *s)
|
||||
"debug the driver itself for valgrind\n\n");
|
||||
printf("TESTGROUPS available:\n");
|
||||
|
||||
for (i = 0; test_groups[i].name != NULL; i++) {
|
||||
if (test_groups[i].handler != fake_tests_init) {
|
||||
for(i = 0; test_groups[i].name != NULL; i++) {
|
||||
if(test_groups[i].handler != fake_tests_init) {
|
||||
printf(" %s\n", test_groups[i].name);
|
||||
}
|
||||
}
|
||||
@@ -153,8 +153,8 @@ gint main(gint argc, gchar **argv)
|
||||
}
|
||||
}
|
||||
|
||||
for (i = optind; i < argc; i++) {
|
||||
if (argv[i][0] == '-') {
|
||||
for(i = optind; i < argc; i++) {
|
||||
if(argv[i][0] == '-') {
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -163,52 +163,52 @@ gint main(gint argc, gchar **argv)
|
||||
#endif
|
||||
|
||||
time_start = get_timestamp();
|
||||
|
||||
for (j = 0; test_groups[j].name != NULL; j++) {
|
||||
|
||||
for(j = 0; test_groups[j].name != NULL; j++) {
|
||||
gboolean run = TRUE;
|
||||
gchar *tests = NULL;
|
||||
gchar *group = NULL;
|
||||
|
||||
if (tests_to_run != NULL) {
|
||||
|
||||
if(tests_to_run != NULL) {
|
||||
gint k;
|
||||
run = FALSE;
|
||||
|
||||
for (k = 0; k < tests_to_run->length; k++) {
|
||||
|
||||
for(k = 0; k < tests_to_run->length; k++) {
|
||||
gchar *user = tests_to_run->strings[k];
|
||||
const gchar *table = test_groups[j].name;
|
||||
size_t user_len = strlen(user);
|
||||
size_t table_len = strlen(table);
|
||||
|
||||
if (strncmp(user, table, table_len) == 0) {
|
||||
if (user_len > table_len && user[table_len] != ':') {
|
||||
|
||||
if(strncmp(user, table, table_len) == 0) {
|
||||
if(user_len > table_len && user[table_len] != ':') {
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
run = TRUE;
|
||||
group = tests_to_run->strings[k];
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (run) {
|
||||
|
||||
if(run) {
|
||||
gboolean passed;
|
||||
gchar **split = NULL;
|
||||
|
||||
if (debug && test_groups[j].handler != fake_tests_init) {
|
||||
printf("Skipping %s, in driver debug mode\n",
|
||||
|
||||
if(debug && test_groups[j].handler != fake_tests_init) {
|
||||
printf("Skipping %s, in driver debug mode\n",
|
||||
test_groups[j].name);
|
||||
continue;
|
||||
} else if (!debug && test_groups[j].handler == fake_tests_init) {
|
||||
} else if(!debug && test_groups[j].handler == fake_tests_init) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (group != NULL) {
|
||||
split = eg_strsplit(group, ":", -1);
|
||||
if (split != NULL) {
|
||||
if(group != NULL) {
|
||||
split = eg_strsplit(group, ":", -1);
|
||||
if(split != NULL) {
|
||||
gint m;
|
||||
for (m = 0; split[m] != NULL; m++) {
|
||||
if (m == 1) {
|
||||
for(m = 0; split[m] != NULL; m++) {
|
||||
if(m == 1) {
|
||||
tests = strdup(split[m]);
|
||||
break;
|
||||
}
|
||||
@@ -216,38 +216,40 @@ gint main(gint argc, gchar **argv)
|
||||
eg_strfreev(split);
|
||||
}
|
||||
}
|
||||
|
||||
passed = run_group(&(test_groups[j]),
|
||||
|
||||
passed = run_group(&(test_groups[j]),
|
||||
iterations, quiet, report_time, tests);
|
||||
|
||||
if (tests != NULL) {
|
||||
if(tests != NULL) {
|
||||
g_free(tests);
|
||||
}
|
||||
|
||||
if (!passed && !global_failure) {
|
||||
if(!passed && !global_failure) {
|
||||
global_failure = TRUE;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (!quiet) {
|
||||
|
||||
if(!quiet) {
|
||||
gdouble pass_percentage = ((gdouble)global_passed / (gdouble)global_tests) * 100.0;
|
||||
printf("=============================\n");
|
||||
printf("Overall result: %s : %d / %d (%g%%)\n", global_failure ? "FAILED" : "OK", global_passed, global_tests, pass_percentage);
|
||||
}
|
||||
|
||||
if (report_time) {
|
||||
|
||||
if(report_time) {
|
||||
gdouble duration = get_timestamp() - time_start;
|
||||
if (no_final_time_labels) {
|
||||
if(no_final_time_labels) {
|
||||
printf("%g\n", duration);
|
||||
} else {
|
||||
printf("%s Total Time: %g\n", DRIVER_NAME, duration);
|
||||
}
|
||||
}
|
||||
|
||||
if (tests_to_run != NULL) {
|
||||
if(tests_to_run != NULL) {
|
||||
string_array_free(tests_to_run);
|
||||
}
|
||||
|
||||
return global_tests - global_passed;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#include "test.h"
|
||||
|
||||
static RESULT
|
||||
test_swap (void)
|
||||
RESULT
|
||||
test_swap ()
|
||||
{
|
||||
guint32 a = 0xabcdef01, res32;
|
||||
guint64 b = (((guint64)a) << 32) | a, res64;
|
||||
@@ -35,3 +35,4 @@ static Test endian_tests [] = {
|
||||
};
|
||||
|
||||
DEFINE_TEST_GROUP_INIT(endian_tests_init, endian_tests)
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
|
||||
#include "test.h"
|
||||
|
||||
static RESULT
|
||||
test_fake (void)
|
||||
RESULT
|
||||
test_fake()
|
||||
{
|
||||
return OK;
|
||||
}
|
||||
@@ -16,3 +16,4 @@ static Test fake_tests [] = {
|
||||
};
|
||||
|
||||
DEFINE_TEST_GROUP_INIT(fake_tests_init, fake_tests)
|
||||
|
||||
@@ -13,10 +13,10 @@
|
||||
#define close _close
|
||||
#endif
|
||||
|
||||
static RESULT
|
||||
test_file_get_contents (void)
|
||||
RESULT
|
||||
test_file_get_contents ()
|
||||
{
|
||||
GError *gerror;
|
||||
GError *error;
|
||||
gchar *content;
|
||||
gboolean ret;
|
||||
gsize length;
|
||||
@@ -32,24 +32,24 @@ test_file_get_contents (void)
|
||||
contents != NULL
|
||||
ret = g_file_get_contents ("", NULL, NULL, NULL);
|
||||
error no such file and fails for 'error' not being null too
|
||||
ret = g_file_get_contents ("", &content, NULL, &gerror);
|
||||
ret = g_file_get_contents ("", &content, NULL, &error);
|
||||
*/
|
||||
|
||||
gerror = NULL;
|
||||
ret = g_file_get_contents ("", &content, NULL, &gerror);
|
||||
error = NULL;
|
||||
ret = g_file_get_contents ("", &content, NULL, &error);
|
||||
if (ret)
|
||||
return FAILED ("HAH!");
|
||||
if (gerror == NULL)
|
||||
if (error == NULL)
|
||||
return FAILED ("Got nothing as error.");
|
||||
if (content != NULL)
|
||||
return FAILED ("Content is uninitialized");
|
||||
|
||||
g_error_free (gerror);
|
||||
gerror = NULL;
|
||||
ret = g_file_get_contents (filename, &content, &length, &gerror);
|
||||
g_error_free (error);
|
||||
error = NULL;
|
||||
ret = g_file_get_contents (filename, &content, &length, &error);
|
||||
if (!ret)
|
||||
return FAILED ("The error is %d %s\n", gerror->code, gerror->message);
|
||||
if (gerror != NULL)
|
||||
return FAILED ("The error is %d %s\n", error->code, error->message);
|
||||
if (error != NULL)
|
||||
return FAILED ("Got an error returning TRUE");
|
||||
if (content == NULL)
|
||||
return FAILED ("Content is NULL");
|
||||
@@ -60,10 +60,10 @@ test_file_get_contents (void)
|
||||
return OK;
|
||||
}
|
||||
|
||||
static RESULT
|
||||
test_open_tmp (void)
|
||||
RESULT
|
||||
test_open_tmp ()
|
||||
{
|
||||
GError *gerror;
|
||||
GError *error;
|
||||
gint fd;
|
||||
gchar *name = GINT_TO_POINTER (-1);
|
||||
|
||||
@@ -74,29 +74,29 @@ test_open_tmp (void)
|
||||
* return FAILED ("Default failed.");
|
||||
* close (fd);
|
||||
*/
|
||||
gerror = NULL;
|
||||
fd = g_file_open_tmp ("invalidtemplate", NULL, &gerror);
|
||||
error = NULL;
|
||||
fd = g_file_open_tmp ("invalidtemplate", NULL, &error);
|
||||
if (fd != -1)
|
||||
return FAILED ("The template was invalid and accepted");
|
||||
if (gerror == NULL)
|
||||
if (error == NULL)
|
||||
return FAILED ("No error returned.");
|
||||
g_error_free (gerror);
|
||||
g_error_free (error);
|
||||
|
||||
gerror = NULL;
|
||||
fd = g_file_open_tmp ("i/nvalidtemplate", &name, &gerror);
|
||||
error = NULL;
|
||||
fd = g_file_open_tmp ("i/nvalidtemplate", &name, &error);
|
||||
if (fd != -1)
|
||||
return FAILED ("The template was invalid and accepted");
|
||||
if (gerror == NULL)
|
||||
if (error == NULL)
|
||||
return FAILED ("No error returned.");
|
||||
if (name == NULL)
|
||||
return FAILED ("'name' is not reset");
|
||||
g_error_free (gerror);
|
||||
g_error_free (error);
|
||||
|
||||
gerror = NULL;
|
||||
fd = g_file_open_tmp ("valid-XXXXXX", &name, &gerror);
|
||||
error = NULL;
|
||||
fd = g_file_open_tmp ("valid-XXXXXX", &name, &error);
|
||||
if (fd == -1)
|
||||
return FAILED ("This should be valid");
|
||||
if (gerror != NULL)
|
||||
if (error != NULL)
|
||||
return FAILED ("No error returned.");
|
||||
if (name == NULL)
|
||||
return FAILED ("No name returned.");
|
||||
@@ -106,8 +106,8 @@ test_open_tmp (void)
|
||||
return OK;
|
||||
}
|
||||
|
||||
static RESULT
|
||||
test_file (void)
|
||||
RESULT
|
||||
test_file ()
|
||||
{
|
||||
gboolean res;
|
||||
const gchar *tmp;
|
||||
@@ -224,3 +224,5 @@ static Test file_tests [] = {
|
||||
};
|
||||
|
||||
DEFINE_TEST_GROUP_INIT(file_tests_init, file_tests)
|
||||
|
||||
|
||||
Loaded 100 of 4358 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user