grpc-native: Rename grpcpp_c to kgrpc

Signed-off-by: Johannes Zottele <[email protected]>

Author: Jozott00

cinterop-c/BUILD.bazel

@@ -1,16 +1,16 @@
 load("@rules_cc//cc:defs.bzl", "cc_library")
 
 cc_static_library(
-    name = "grpcpp_c_static",
+    name = "kgrpc_static",
     deps = [
-        ":grpcpp_c",
+        ":kgrpc",
     ],
 )
 
 cc_library(
-    name = "grpcpp_c",
-    srcs = ["src/grpcpp_c.cpp"],
-    hdrs = glob(["include/**/*.h"]),
+    name = "kgrpc",
+    srcs = ["src/kgrpc.cpp"],
+    hdrs = glob(["include/kgrpc.h"]),
     copts = ["-std=c++20"],
     includes = ["include"],
     visibility = ["//visibility:public"],
@@ -35,7 +35,7 @@ cc_static_library(
 cc_library(
     name = "protowire",
     srcs = ["src/protowire.cpp"],
-    hdrs = glob(["include/*.h"]),
+    hdrs = glob(["include/protowire.h"]),
     copts = ["-std=c++20"],
     includes = ["include"],
     visibility = ["//visibility:public"],

cinterop-c/include/grpcpp_c.h renamed to cinterop-c/include/kgrpc.h

@@ -23,7 +23,7 @@ extern "C" {
 typedef struct {
     grpc_completion_queue_functor functor;
     void *user_data;
-} grpc_cb_tag;
+} kgrpc_cb_tag;
 
 /*
  * Call to grpc_iomgr_run_in_background(), which is not exposed as extern "C" and therefore must be wrapped.

cinterop-c/src/grpcpp_c.cpp renamed to cinterop-c/src/kgrpc.cpp

@@ -2,7 +2,7 @@
  * Copyright 2023-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
  */
 
-#include <grpcpp_c.h>
+#include <kgrpc.h>
 
 #include "src/core/lib/iomgr/iomgr.h"
 

grpc/grpc-core/build.gradle.kts

@@ -70,9 +70,9 @@ kotlin {
         }
     }
 
-    configureCLibCInterop(project, ":grpcpp_c_static") { cinteropCLib ->
+    configureCLibCInterop(project, ":kgrpc_static") { cinteropCLib ->
         @Suppress("unused")
-        val libgrpcpp_c by creating {
+        val libkgrpc by creating {
             includeDirs(
                 cinteropCLib.resolve("include"),
                 cinteropCLib.resolve("bazel-cinterop-c/external/grpc+/include"),

grpc/grpc-core/src/nativeInterop/cinterop/libgrpcpp_c.def renamed to grpc/grpc-core/src/nativeInterop/cinterop/libkgrpc.def

@@ -1,11 +1,11 @@
-headers = grpcpp_c.h grpc/grpc.h grpc/credentials.h grpc/byte_buffer_reader.h \
+headers = kgrpc.h grpc/grpc.h grpc/credentials.h grpc/byte_buffer_reader.h \
     grpc/support/alloc.h
 
-headerFilter= grpcpp_c.h grpc/slice.h grpc/byte_buffer.h grpc/grpc.h \
+headerFilter= kgrpc.h grpc/slice.h grpc/byte_buffer.h grpc/grpc.h \
     grpc/impl/grpc_types.h grpc/credentials.h grpc/support/time.h grpc/byte_buffer_reader.h \
     grpc/support/alloc.h
 
 noStringConversion = grpc_slice_from_copied_buffer my_grpc_slice_from_copied_buffer
 strictEnums = grpc_status_code grpc_connectivity_state grpc_call_error
 
-staticLibraries = libgrpcpp_c_static.a
+staticLibraries = libkgrpc_static.a

grpc/grpc-core/src/nativeMain/kotlin/kotlinx/rpc/grpc/internal/CompletionQueue.kt

@@ -10,7 +10,7 @@ import kotlinx.atomicfu.atomic
 import kotlinx.atomicfu.locks.SynchronizedObject
 import kotlinx.atomicfu.locks.synchronized
 import kotlinx.cinterop.*
-import libgrpcpp_c.*
+import libkgrpc.*
 import platform.posix.memset
 import kotlin.experimental.ExperimentalNativeApi
 import kotlin.native.ref.createCleaner
@@ -49,7 +49,7 @@ internal class CompletionQueue {
 
     private val thisStableRef = StableRef.create(this)
 
-    private val shutdownFunctor = nativeHeap.alloc<grpc_cb_tag> {
+    private val shutdownFunctor = nativeHeap.alloc<kgrpc_cb_tag> {
         functor.functor_run = SHUTDOWN_CB
         user_data = thisStableRef.asCPointer()
     }.reinterpret<grpc_completion_queue_functor>()
@@ -127,15 +127,15 @@ internal class CompletionQueue {
 // kq stands for kompletion_queue lol
 @CName("kq_ops_complete_cb")
 private fun opsCompleteCb(functor: CPointer<grpc_completion_queue_functor>?, ok: Int) {
-    val tag = functor!!.reinterpret<grpc_cb_tag>()
+    val tag = functor!!.reinterpret<kgrpc_cb_tag>()
     val cont = tag.pointed.user_data!!.asStableRef<CallbackFuture<Boolean>>().get()
     deleteCbTag(tag)
     cont.complete(ok != 0)
 }
 
 @CName("kq_shutdown_cb")
 private fun shutdownCb(functor: CPointer<grpc_completion_queue_functor>?, ok: Int) {
-    val tag = functor!!.reinterpret<grpc_cb_tag>()
+    val tag = functor!!.reinterpret<kgrpc_cb_tag>()
     val cq = tag.pointed.user_data!!.asStableRef<CompletionQueue>().get()
     cq._shutdownDone.complete(Unit)
     cq._state.value = CompletionQueue.State.CLOSED
@@ -148,16 +148,16 @@ private val SHUTDOWN_CB = staticCFunction(::shutdownCb)
 private fun newCbTag(
     userData: Any,
     cb: CPointer<CFunction<(CPointer<grpc_completion_queue_functor>?, Int) -> Unit>>,
-): CPointer<grpc_cb_tag> {
-    val tag = nativeHeap.alloc<grpc_cb_tag>()
-    memset(tag.ptr, 0, sizeOf<grpc_cb_tag>().convert())
+): CPointer<kgrpc_cb_tag> {
+    val tag = nativeHeap.alloc<kgrpc_cb_tag>()
+    memset(tag.ptr, 0, sizeOf<kgrpc_cb_tag>().convert())
     tag.functor.functor_run = cb
     tag.user_data = StableRef.create(userData).asCPointer()
     return tag.ptr
 }
 
-@CName("grpc_cb_tag_destroy")
-private fun deleteCbTag(tag: CPointer<grpc_cb_tag>) {
+@CName("kgrpc_cb_tag_destroy")
+private fun deleteCbTag(tag: CPointer<kgrpc_cb_tag>) {
     tag.pointed.user_data!!.asStableRef<Any>().dispose()
     nativeHeap.free(tag)
 }

grpc/grpc-core/src/nativeMain/kotlin/kotlinx/rpc/grpc/internal/NativeClientCall.kt

@@ -16,7 +16,7 @@ import kotlinx.rpc.grpc.Status
 import kotlinx.rpc.grpc.StatusCode
 import kotlinx.rpc.protobuf.input.stream.asInputStream
 import kotlinx.rpc.protobuf.input.stream.asSource
-import libgrpcpp_c.*
+import libkgrpc.*
 import kotlin.experimental.ExperimentalNativeApi
 import kotlin.native.ref.createCleaner
 

grpc/grpc-core/src/nativeMain/kotlin/kotlinx/rpc/grpc/internal/NativeGrpcLibrary.kt

@@ -10,8 +10,8 @@ import kotlinx.atomicfu.atomic
 import kotlinx.atomicfu.locks.reentrantLock
 import kotlinx.atomicfu.locks.withLock
 import kotlinx.cinterop.ExperimentalForeignApi
-import libgrpcpp_c.grpc_init
-import libgrpcpp_c.grpc_shutdown
+import libkgrpc.grpc_init
+import libkgrpc.grpc_shutdown
 import kotlin.experimental.ExperimentalNativeApi
 
 internal object GrpcRuntime {

grpc/grpc-core/src/nativeMain/kotlin/kotlinx/rpc/grpc/internal/NativeManagedChannel.kt

@@ -13,7 +13,7 @@ import kotlinx.cinterop.ExperimentalForeignApi
 import kotlinx.coroutines.*
 import kotlinx.rpc.grpc.ManagedChannel
 import kotlinx.rpc.grpc.ManagedChannelPlatform
-import libgrpcpp_c.*
+import libkgrpc.*
 import kotlin.coroutines.cancellation.CancellationException
 import kotlin.experimental.ExperimentalNativeApi
 import kotlin.native.ref.createCleaner

grpc/grpc-core/src/nativeMain/kotlin/kotlinx/rpc/grpc/internal/utils.kt

@@ -10,7 +10,7 @@ import kotlinx.cinterop.*
 import kotlinx.io.*
 import kotlinx.io.unsafe.UnsafeBufferOperations
 import kotlinx.rpc.grpc.StatusCode
-import libgrpcpp_c.*
+import libkgrpc.*
 import platform.posix.memcpy
 
 @OptIn(ExperimentalForeignApi::class, InternalIoApi::class, UnsafeIoApi::class)