Skip to content

Commit 953b583

Browse files
committed
Add native impl for HPyTupleBuilder
1 parent dbfc8ff commit 953b583

File tree

2 files changed

+142
-0
lines changed

2 files changed

+142
-0
lines changed
Lines changed: 137 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,137 @@
1+
/*
2+
* Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
3+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
*
5+
* The Universal Permissive License (UPL), Version 1.0
6+
*
7+
* Subject to the condition set forth below, permission is hereby granted to any
8+
* person obtaining a copy of this software, associated documentation and/or
9+
* data (collectively the "Software"), free of charge and under any and all
10+
* copyright rights in the Software, and any and all patent rights owned or
11+
* freely licensable by each licensor hereunder covering either (i) the
12+
* unmodified Software as contributed to or provided by such licensor, or (ii)
13+
* the Larger Works (as defined below), to deal in both
14+
*
15+
* (a) the Software, and
16+
*
17+
* (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
18+
* one is included with the Software each a "Larger Work" to which the Software
19+
* is contributed by such licensors),
20+
*
21+
* without restriction, including without limitation the rights to copy, create
22+
* derivative works of, display, perform, and distribute the Software and make,
23+
* use, sell, offer for sale, import, export, have made, and have sold the
24+
* Software and the Larger Work(s), and to sublicense the foregoing rights on
25+
* either these or other terms.
26+
*
27+
* This license is subject to the following condition:
28+
*
29+
* The above copyright notice and either this complete permission notice or at a
30+
* minimum a reference to the UPL must be included in all copies or substantial
31+
* portions of the Software.
32+
*
33+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
34+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
35+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
36+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
37+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
38+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
39+
* SOFTWARE.
40+
*/
41+
42+
/*
43+
* Native implementation of HPyTupleBuilder.
44+
* This is written in a way that we could also use the internal functions
45+
* 'builder_*' to implement HPyListBuilder.
46+
*/
47+
48+
49+
#include <stddef.h>
50+
#include "hpy.h"
51+
52+
typedef struct {
53+
HPy_ssize_t capacity; // allocated handles
54+
HPy handles[0];
55+
} _HPyBuilder_s;
56+
57+
static inline _HPyBuilder_s *_ht2hb(HPyTupleBuilder ht) {
58+
return (_HPyBuilder_s *) (ht)._tup;
59+
}
60+
61+
static inline HPyTupleBuilder _hb2ht(_HPyBuilder_s *hp) {
62+
return (HPyTupleBuilder) {(HPy_ssize_t) (hp)};
63+
}
64+
65+
static inline _HPyBuilder_s *builder_new(HPy_ssize_t size) {
66+
_HPyBuilder_s *hb = calloc(1, sizeof(_HPyBuilder_s) + size * sizeof(HPy));
67+
if (hb == NULL) {
68+
/* delay the MemoryError */
69+
/* note: it's done this way so that the caller doesn't need to
70+
check if HPyTupleBuilder_New() or every HPyTupleBuilder_Set()
71+
raised. If there is a rare error like a MemoryError somewhere,
72+
further calls to the HPyTupleBuilder are ignored. The final
73+
HPyTupleBuilder_Build() will re-raise the MemoryError and so
74+
it's enough for the caller to check at that point. */
75+
} else {
76+
hb->capacity = size;
77+
}
78+
return hb;
79+
}
80+
static inline void builder_set(HPyContext *ctx, _HPyBuilder_s *hb, HPy_ssize_t index, HPy h_item)
81+
{
82+
if (hb != NULL) {
83+
assert(index >= 0 && index < hb->capacity);
84+
assert(HPy_IsNull(hb->handles[index]));
85+
hb->handles[index] = HPy_Dup(ctx, h_item);
86+
}
87+
}
88+
89+
static inline void builder_cancel(HPyContext *ctx, _HPyBuilder_s *hb)
90+
{
91+
if (hb == NULL) {
92+
// we don't report the memory error here: the builder
93+
// is being cancelled (so the result of the builder is not being used)
94+
// and likely it's being cancelled during the handling of another error
95+
return;
96+
}
97+
for (HPy_ssize_t i = 0; i < hb->capacity; i++) {
98+
HPy_Close(ctx, hb->handles[i]);
99+
}
100+
free(hb);
101+
}
102+
103+
_HPy_HIDDEN HPyTupleBuilder
104+
ctx_TupleBuilder_New(HPyContext *ctx, HPy_ssize_t size)
105+
{
106+
return _hb2ht(builder_new(size));
107+
}
108+
109+
_HPy_HIDDEN void
110+
ctx_TupleBuilder_Set(HPyContext *ctx, HPyTupleBuilder builder,
111+
HPy_ssize_t index, HPy h_item)
112+
{
113+
builder_set(ctx, _ht2hb(builder), index, h_item);
114+
}
115+
116+
_HPy_HIDDEN HPy
117+
ctx_TupleBuilder_Build(HPyContext *ctx, HPyTupleBuilder builder)
118+
{
119+
_HPyBuilder_s *hb = _ht2hb(builder);
120+
if (hb == NULL) {
121+
HPyErr_NoMemory(ctx);
122+
return HPy_NULL;
123+
}
124+
/* TODO(fa): we could have an internal upcall that steals the references */
125+
HPy res = HPyTuple_FromArray(ctx, hb->handles, hb->capacity);
126+
for (HPy_ssize_t i = 0; i < hb->capacity; i++) {
127+
HPy_Close(ctx, hb->handles[i]);
128+
}
129+
free(hb);
130+
return res;
131+
}
132+
133+
_HPy_HIDDEN void
134+
ctx_TupleBuilder_Cancel(HPyContext *ctx, HPyTupleBuilder builder)
135+
{
136+
builder_cancel(ctx, _ht2hb(builder));
137+
}

graalpython/com.oracle.graal.python.jni/src/hpy_jni.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -533,6 +533,11 @@ JNIEXPORT jint JNICALL Java_com_oracle_graal_python_builtins_objects_cext_hpy_Gr
533533
context->ctx_Tracker_ForgetAll = ctx_Tracker_ForgetAll;
534534
context->ctx_Tracker_Close = ctx_Tracker_Close;
535535

536+
context->ctx_TupleBuilder_New = ctx_TupleBuilder_New;
537+
context->ctx_TupleBuilder_Set = ctx_TupleBuilder_Set;
538+
context->ctx_TupleBuilder_Build = ctx_TupleBuilder_Build;
539+
context->ctx_TupleBuilder_Cancel = ctx_TupleBuilder_Cancel;
540+
536541
graal_hpy_context_get_native_context(context)->jni_context = (void *) (*env)->NewGlobalRef(env, ctx);
537542
assert(clazz != NULL);
538543

0 commit comments

Comments
 (0)