mirrors/cosmopolitan
1
0
Fork 0
mirror of https://github.com/jart/cosmopolitan.git synced 2025-05-25 06:42:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Bring back gc() function

Browse source 
Renaming gc() to _gc() was a mistake since the better thing to do is put
it behind the _COSMO_SOURCE macro. We need this change because I haven't
wanted to use my amazing garbage collector ever since we renamed it. You
now need to define _COSMO_SOURCE yourself when using amalgamation header
and cosmocc users need to pass the -mcosmo flag to get the gc() function

Some other issues relating to cancelation have been fixed along the way.
We're also now putting cosmocc in a folder named `.cosmocc` so it can be
more safely excluded by grep --exclude-dir=.cosmocc --exclude-dir=o etc.
This commit is contained in:
Justine Tunney 2024-01-08 10:07:35 -08:00
parent 6cb0354e19
commit a4b455185b
No known key found for this signature in database
GPG key ID: BE714B4575D6E328
280 changed files with 1362 additions and 1407 deletions
Download patch file Download diff file Expand all files Collapse all files

8
third_party/python/Python/import.c vendored
View file

@ -886,7 +886,7 @@ PyImport_ExecCodeModuleWithPathnames(const char *name, PyObject *co,
else if (cpathobj != NULL) {
// cpathobj != NULL means cpathname != NULL
size_t cpathlen = strlen(cpathname);
char *pathname2 = _gc(strdup(cpathname));
char *pathname2 = gc(strdup(cpathname));
if (_endswith(pathname2, ".pyc"))
{
pathname2[cpathlen-2] = '\0'; // so now ends with .py
@ -2152,7 +2152,7 @@ static PyObject *_imp_path_isdir(PyObject *module, PyObject *arg) {
Py_ssize_t n;
const char *path;
if (!PyArg_Parse(arg, "z#:_path_isdir", &path, &n)) return 0;
if (path == NULL) path = _gc(getcwd(NULL, 0));
if (path == NULL) path = gc(getcwd(NULL, 0));
return _check_path_mode(path, S_IFDIR);
}
PyDoc_STRVAR(_imp_path_isdir_doc, "check if path is dir");
@ -2172,7 +2172,7 @@ static PyObject *_imp_calc_mtime_and_size(PyObject *module, PyObject *arg) {
Py_ssize_t n;
const char *path;
if (!PyArg_Parse(arg, "z#:_calc_mtime_and_size", &path, &n)) return 0;
if (path == NULL) path = _gc(getcwd(NULL, 0));
if (path == NULL) path = gc(getcwd(NULL, 0));
if (stat(path, &stinfo))
return PyTuple_Pack(2, PyLong_FromLong((long)-1), PyLong_FromLong((long)0));
return PyTuple_Pack(2, PyLong_FromLong((long)stinfo.st_mtime),
@ -2774,7 +2774,7 @@ static PyObject *CosmoImporter_find_spec(PyObject *cls, PyObject **args,
*/
newpathsize = sizeof(basepath) + cnamelen + sizeof("/__init__.pyc") + 1;
newpath = _gc(malloc(newpathsize));
newpath = gc(malloc(newpathsize));
bzero(newpath, newpathsize);
/* performing a memccpy sequence equivalent to:
* snprintf(newpath, newpathsize, "/zip/.python/%s.pyc", cname); */

2
third_party/python/Python/marshal.c vendored
View file

@ -9,7 +9,7 @@
#include "libc/calls/calls.h"
#include "libc/calls/weirdtypes.h"
#include "libc/mem/mem.h"
#include "libc/mem/gc.internal.h"
#include "libc/mem/gc.h"
#include "third_party/python/Include/abstract.h"
#include "third_party/python/Include/boolobject.h"
#include "third_party/python/Include/code.h"

2
third_party/python/Python/sysmodule.c vendored
View file

@ -6,7 +6,7 @@
╚─────────────────────────────────────────────────────────────────────────────*/
#include "libc/calls/calls.h"
#include "libc/dce.h"
#include "libc/mem/gc.internal.h"
#include "libc/mem/gc.h"
#include "libc/mem/mem.h"
#include "libc/nt/dll.h"
#include "libc/nt/version.h"