Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into robj/update-limitation
Browse files Browse the repository at this point in the history
  • Loading branch information
rtjohnso committed Jul 25, 2023
2 parents e65738f + a7547cd commit 5d3f573
Show file tree
Hide file tree
Showing 61 changed files with 652 additions and 623 deletions.
13 changes: 13 additions & 0 deletions ci/apply-pipeline.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,19 @@
# Copyright 2018-2021 VMware, Inc.
# SPDX-License-Identifier: Apache-2.0

# Reconfigure the Concourse CI pipeline for this project.
# See https://runway.eng.vmware.com/docs/
#
# Pre-reqs:
# - Install Carvel ytt: https://carvel.dev/ytt/
# - Connect to the VMware network
# - Download the `fly` CLI by clicking the icon on the bottom-right
# corner of this UI: https://runway-ci.eng.vmware.com
# - Set a fly target and log in:
# fly -t runway login -c https://runway-ci.eng.vmware.com/ -n splinterdb
#
# For more info, see: https://runway.eng.vmware.com/docs/#/getting_started/hello_world

set -euo pipefail

TARGET_CONCOURSE=runway
Expand Down
12 changes: 11 additions & 1 deletion ci/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,17 @@ resource_types:
- name: pull-request
type: registry-image
source:
repository: harbor-repo.vmware.com/dockerhub-proxy-cache/teliaoss/github-pr-resource
#! this image is built from https://github.com/cloudfoundry-community/github-pr-resource
#! which is maintained by VMware staff
repository: harbor-repo.vmware.com/dockerhub-proxy-cache/loggregatorbot/github-pr-resource

#! Attempt to fix a problem with image pulls failing
#! see: https://vmware.slack.com/archives/CEUC18KQA/p1689754476227109?thread_ts=1689753436.440569&cid=CEUC18KQA
- name: registry-image
type: registry-image
source:
repository: harbor-repo.vmware.com/dockerhub-proxy-cache/concourse/registry-image-resource
tag: 1.8.0

resources:

Expand Down
3 changes: 1 addition & 2 deletions include/splinterdb/platform_linux/public_platform.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
* compiler/processor.
*/
#include <stdint.h>
#include <stdbool.h>

// Types
typedef unsigned char uchar;
Expand Down Expand Up @@ -61,8 +62,6 @@ static_assert(sizeof(uint64) == 8, "incorrect type");
# define FALSE (0)
#endif

typedef uint8 bool8;

typedef FILE platform_log_handle;

// By default, info messages sent from platform_default_log() go to /dev/null
Expand Down
2 changes: 1 addition & 1 deletion src/allocator.h
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ allocator_print_allocated(allocator *al)
return al->ops->print_allocated(al);
}

static inline bool
static inline bool32
allocator_page_valid(allocator *al, uint64 addr)
{
allocator_config *allocator_cfg = allocator_get_config(al);
Expand Down
Loading

0 comments on commit 5d3f573

Please sign in to comment.