grpc 1.50.0.pre1 → 1.52.0.pre2

data/src/core/ext/transport/chttp2/transport/stream_map.cc

@@ -1,20 +1,20 @@
-/*
- *
- * Copyright 2015 gRPC authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
+//
+//
+// Copyright 2015 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//
 
 #include <grpc/support/port_platform.h>
 
@@ -80,8 +80,8 @@ void grpc_chttp2_stream_map_add(grpc_chttp2_stream_map* map, uint32_t key,
       count = compact(keys, values, count);
       map->free = 0;
     } else {
-      /* resize when less than 25% of the table is free, because compaction
-         won't help much */
+      // resize when less than 25% of the table is free, because compaction
+      // won't help much
       map->capacity = capacity = 2 * capacity;
       map->keys = keys = static_cast<uint32_t*>(
           gpr_realloc(keys, capacity * sizeof(uint32_t)));
@@ -108,7 +108,7 @@ static void** find(grpc_chttp2_stream_map* map, uint32_t key) {
   if (!strict_find && max_idx == 0) return nullptr;
 
   while (min_idx < max_idx) {
-    /* find the midpoint, avoiding overflow */
+    // find the midpoint, avoiding overflow
     mid_idx = min_idx + ((max_idx - min_idx) / 2);
     mid_key = keys[mid_idx];
 
@@ -116,7 +116,7 @@ static void** find(grpc_chttp2_stream_map* map, uint32_t key) {
       min_idx = mid_idx + 1;
     } else if (mid_key > key) {
       max_idx = mid_idx;
-    } else /* mid_key == key */
+    } else  // mid_key == key
     {
       return &values[mid_idx];
     }
@@ -133,8 +133,8 @@ void* grpc_chttp2_stream_map_delete(grpc_chttp2_stream_map* map, uint32_t key) {
   GPR_DEBUG_ASSERT(out != nullptr);
   *pvalue = nullptr;
   map->free++;
-  /* recognize complete emptyness and ensure we can skip
-     defragmentation later */
+  // recognize complete emptyness and ensure we can skip
+  // defragmentation later
   if (map->free == map->count) {
     map->free = map->count = 0;
   }

data/src/core/ext/transport/chttp2/transport/stream_map.h

@@ -1,20 +1,20 @@
-/*
- *
- * Copyright 2015 gRPC authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
+//
+//
+// Copyright 2015 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//
 
 #ifndef GRPC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_STREAM_MAP_H
 #define GRPC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_STREAM_MAP_H
@@ -24,12 +24,12 @@
 #include <stddef.h>
 #include <stdint.h>
 
-/* Data structure to map a uint32_t to a data object (represented by a void*)
+// Data structure to map a uint32_t to a data object (represented by a void*)
 
-   Represented as a sorted array of keys, and a corresponding array of values.
-   Lookups are performed with binary search.
-   Adds are restricted to strictly higher keys than previously seen (this is
-   guaranteed by http2). */
+// Represented as a sorted array of keys, and a corresponding array of values.
+// Lookups are performed with binary search.
+// Adds are restricted to strictly higher keys than previously seen (this is
+// guaranteed by http2).
 struct grpc_chttp2_stream_map {
   uint32_t* keys;
   void** values;
@@ -41,28 +41,28 @@ void grpc_chttp2_stream_map_init(grpc_chttp2_stream_map* map,
                                  size_t initial_capacity);
 void grpc_chttp2_stream_map_destroy(grpc_chttp2_stream_map* map);
 
-/* Add a new key: given http2 semantics, new keys must always be greater than
-   existing keys - this is asserted */
+// Add a new key: given http2 semantics, new keys must always be greater than
+// existing keys - this is asserted
 void grpc_chttp2_stream_map_add(grpc_chttp2_stream_map* map, uint32_t key,
                                 void* value);
 
-/* Delete an existing key - returns the previous value of the key if it existed,
-   or NULL otherwise */
+// Delete an existing key - returns the previous value of the key if it existed,
+// or NULL otherwise
 void* grpc_chttp2_stream_map_delete(grpc_chttp2_stream_map* map, uint32_t key);
 
-/* Return an existing key, or NULL if it does not exist */
+// Return an existing key, or NULL if it does not exist
 void* grpc_chttp2_stream_map_find(grpc_chttp2_stream_map* map, uint32_t key);
 
-/* Return a random entry */
+// Return a random entry
 void* grpc_chttp2_stream_map_rand(grpc_chttp2_stream_map* map);
 
-/* How many (populated) entries are in the stream map? */
+// How many (populated) entries are in the stream map?
 size_t grpc_chttp2_stream_map_size(grpc_chttp2_stream_map* map);
 
-/* Callback on each stream */
+// Callback on each stream
 void grpc_chttp2_stream_map_for_each(grpc_chttp2_stream_map* map,
                                      void (*f)(void* user_data, uint32_t key,
                                                void* value),
                                      void* user_data);
 
-#endif /* GRPC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_STREAM_MAP_H */
+#endif  // GRPC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_STREAM_MAP_H

data/src/core/ext/transport/chttp2/transport/varint.cc

@@ -1,20 +1,20 @@
-/*
- *
- * Copyright 2015 gRPC authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
+//
+//
+// Copyright 2015 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//
 
 #include <grpc/support/port_platform.h>
 
@@ -24,7 +24,7 @@
 
 namespace grpc_core {
 
-uint32_t VarintLength(uint32_t tail_value) {
+size_t VarintLength(size_t tail_value) {
   if (tail_value < (1 << 7)) {
     return 2;
   } else if (tail_value < (1 << 14)) {
@@ -38,8 +38,7 @@ uint32_t VarintLength(uint32_t tail_value) {
   }
 }
 
-void VarintWriteTail(uint32_t tail_value, uint8_t* target,
-                     uint32_t tail_length) {
+void VarintWriteTail(size_t tail_value, uint8_t* target, size_t tail_length) {
   switch (tail_length) {
     case 5:
       target[4] = static_cast<uint8_t>((tail_value >> 28) | 0x80);

data/src/core/ext/transport/chttp2/transport/varint.h

@@ -1,20 +1,20 @@
-/*
- *
- * Copyright 2015 gRPC authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
+//
+//
+// Copyright 2015 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//
 
 #ifndef GRPC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_VARINT_H
 #define GRPC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_VARINT_H
@@ -22,36 +22,39 @@
 #include <grpc/support/port_platform.h>
 
 #include <stdint.h>
+#include <stdlib.h>
 
-/* Helpers for hpack varint encoding */
+#include <grpc/support/log.h>
+
+// Helpers for hpack varint encoding
 
 namespace grpc_core {
 
-/* maximum value that can be bitpacked with the opcode if the opcode has a
-   prefix of length prefix_bits */
+// maximum value that can be bitpacked with the opcode if the opcode has a
+// prefix of length prefix_bits
 constexpr uint32_t MaxInVarintPrefix(uint8_t prefix_bits) {
   return (1 << (8 - prefix_bits)) - 1;
 }
 
-/* length of a value that needs varint tail encoding (it's bigger than can be
-   bitpacked into the opcode byte) - returned value includes the length of the
-   opcode byte */
-uint32_t VarintLength(uint32_t tail_value);
-void VarintWriteTail(uint32_t tail_value, uint8_t* target,
-                     uint32_t tail_length);
+// length of a value that needs varint tail encoding (it's bigger than can be
+// bitpacked into the opcode byte) - returned value includes the length of the
+// opcode byte
+size_t VarintLength(size_t tail_value);
+void VarintWriteTail(size_t tail_value, uint8_t* target, size_t tail_length);
 
 template <uint8_t kPrefixBits>
 class VarintWriter {
  public:
   static constexpr uint32_t kMaxInPrefix = MaxInVarintPrefix(kPrefixBits);
 
-  explicit VarintWriter(uint32_t value)
+  explicit VarintWriter(size_t value)
       : value_(value),
         length_(value < kMaxInPrefix ? 1 : VarintLength(value - kMaxInPrefix)) {
+    GPR_ASSERT(value <= UINT32_MAX);
   }
 
-  uint32_t value() const { return value_; }
-  uint32_t length() const { return length_; }
+  size_t value() const { return value_; }
+  size_t length() const { return length_; }
 
   void Write(uint8_t prefix, uint8_t* target) const {
     if (length_ == 1) {
@@ -63,11 +66,11 @@ class VarintWriter {
   }
 
  private:
-  const uint32_t value_;
+  const size_t value_;
   // length required to bitpack value_
-  const uint32_t length_;
+  const size_t length_;
 };
 
 }  // namespace grpc_core
 
-#endif /* GRPC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_VARINT_H */
+#endif  // GRPC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_VARINT_H