fix streams floating point web-platform tests

Author: anonrig

src/workerd/api/streams/queue.c++

@@ -96,7 +96,7 @@ void ValueQueue::Consumer::reset() {
   impl.reset();
 };
 
-size_t ValueQueue::Consumer::size() {
+double ValueQueue::Consumer::size() {
   return impl.size();
 }
 
@@ -121,13 +121,13 @@ void ValueQueue::Consumer::visitForGc(jsg::GcVisitor& visitor) {
 
 #pragma endregion ValueQueue::Consumer
 
-ValueQueue::ValueQueue(size_t highWaterMark): impl(highWaterMark) {}
+ValueQueue::ValueQueue(double highWaterMark): impl(highWaterMark) {}
 
 void ValueQueue::close(jsg::Lock& js) {
   impl.close(js);
 }
 
-ssize_t ValueQueue::desiredSize() const {
+double ValueQueue::desiredSize() const {
   return impl.desiredSize();
 }
 
@@ -143,7 +143,7 @@ void ValueQueue::push(jsg::Lock& js, kj::Rc<Entry> entry) {
   impl.push(js, kj::mv(entry));
 }
 
-size_t ValueQueue::size() const {
+double ValueQueue::size() const {
   return impl.size();
 }
 
@@ -373,7 +373,7 @@ void ByteQueue::Consumer::reset() {
   impl.reset();
 }
 
-size_t ByteQueue::Consumer::size() const {
+double ByteQueue::Consumer::size() const {
   return impl.size();
 }
 
@@ -535,7 +535,7 @@ v8::Local<v8::Uint8Array> ByteQueue::ByobRequest::getView(jsg::Lock& js) {
 
 #pragma endregion ByteQueue::ByobRequest
 
-ByteQueue::ByteQueue(size_t highWaterMark): impl(highWaterMark) {}
+ByteQueue::ByteQueue(double highWaterMark): impl(highWaterMark) {}
 
 void ByteQueue::close(jsg::Lock& js) {
   KJ_IF_SOME(ready, impl.state.tryGet<ByteQueue::QueueImpl::Ready>()) {
@@ -548,7 +548,7 @@ void ByteQueue::close(jsg::Lock& js) {
   impl.close(js);
 }
 
-ssize_t ByteQueue::desiredSize() const {
+double ByteQueue::desiredSize() const {
   return impl.desiredSize();
 }
 
@@ -573,7 +573,7 @@ void ByteQueue::push(jsg::Lock& js, kj::Rc<Entry> entry) {
   impl.push(js, kj::mv(entry));
 }
 
-size_t ByteQueue::size() const {
+double ByteQueue::size() const {
   return impl.size();
 }
 

src/workerd/api/streams/queue.h

@@ -153,7 +153,7 @@ class QueueImpl final {
   using Entry = typename Self::Entry;
   using State = typename Self::State;
 
-  explicit QueueImpl(size_t highWaterMark): highWaterMark(highWaterMark) {}
+  explicit QueueImpl(double highWaterMark): highWaterMark(highWaterMark) {}
 
   QueueImpl(QueueImpl&&) = default;
   QueueImpl& operator=(QueueImpl&&) = default;
@@ -176,7 +176,7 @@ class QueueImpl final {
   // The value can be zero or negative, in which case backpressure is
   // signaled on the queue.
   // If the queue is already closed or errored, return 0.
-  inline ssize_t desiredSize() const {
+  inline double desiredSize() const {
     return state.template is<Ready>() ? highWaterMark - size() : 0;
   }
 
@@ -231,7 +231,7 @@ class QueueImpl final {
   }
 
   // The current size of consumer with the most stored data.
-  size_t size() const {
+  double size() const {
     return totalQueueSize;
   }
 
@@ -293,8 +293,8 @@ class QueueImpl final {
     SmallSet<ConsumerImpl*> consumers;
   };
 
-  size_t highWaterMark;
-  size_t totalQueueSize = 0;
+  double highWaterMark;
+  double totalQueueSize = 0;
   kj::OneOf<Ready, Closed, Errored> state = Ready();
 
   void addConsumer(ConsumerImpl* consumer) {
@@ -432,7 +432,7 @@ class ConsumerImpl final {
   }
 
   // The current total calculated size of the consumer's internal buffer.
-  size_t size() const {
+  double size() const {
     KJ_SWITCH_ONEOF(state) {
       KJ_CASE_ONEOF(e, Errored) {
         return 0;
@@ -550,7 +550,7 @@ class ConsumerImpl final {
   struct Ready {
     workerd::RingBuffer<kj::OneOf<QueueEntry, Close>, 16> buffer;
     std::list<ReadRequest> readRequests;
-    size_t queueTotalSize = 0;
+    double queueTotalSize = 0;
 
     inline kj::StringPtr jsgGetMemoryName() const;
     inline size_t jsgGetMemorySelfSize() const;
@@ -712,7 +712,7 @@ class ValueQueue final {
 
     void reset();
 
-    size_t size();
+    double size();
 
     kj::Own<Consumer> clone(
         jsg::Lock& js, kj::Maybe<ConsumerImpl::StateListener&> stateListener = kj::none);
@@ -732,19 +732,19 @@ class ValueQueue final {
     friend class ValueQueue;
   };
 
-  explicit ValueQueue(size_t highWaterMark);
+  explicit ValueQueue(double highWaterMark);
 
   void close(jsg::Lock& js);
 
-  ssize_t desiredSize() const;
+  double desiredSize() const;
 
   void error(jsg::Lock& js, jsg::Value reason);
 
   void maybeUpdateBackpressure();
 
   void push(jsg::Lock& js, kj::Rc<Entry> entry);
 
-  size_t size() const;
+  double size() const;
 
   size_t getConsumerCount();
 
@@ -932,7 +932,7 @@ class ByteQueue final {
 
     void reset();
 
-    size_t size() const;
+    double size() const;
 
     kj::Own<Consumer> clone(
         jsg::Lock& js, kj::Maybe<ConsumerImpl::StateListener&> stateListener = kj::none);
@@ -949,19 +949,19 @@ class ByteQueue final {
     ConsumerImpl impl;
   };
 
-  explicit ByteQueue(size_t highWaterMark);
+  explicit ByteQueue(double highWaterMark);
 
   void close(jsg::Lock& js);
 
-  ssize_t desiredSize() const;
+  double desiredSize() const;
 
   void error(jsg::Lock& js, jsg::Value reason);
 
   void maybeUpdateBackpressure();
 
   void push(jsg::Lock& js, kj::Rc<Entry> entry);
 
-  size_t size() const;
+  double size() const;
 
   size_t getConsumerCount();
 

src/wpt/streams-test.ts

@@ -442,15 +442,7 @@ export default {
       'getReader() should call ToString() on mode',
     ],
   },
-  'readable-streams/floating-point-total-queue-size.any.js': {
-    comment: 'Queue size needs to use double math',
-    expectedFailures: [
-      'Floating point arithmetic must manifest near NUMBER.MAX_SAFE_INTEGER (total ends up positive)',
-      'Floating point arithmetic must manifest near 0 (total ends up positive, but clamped)',
-      'Floating point arithmetic must manifest near 0 (total ends up positive, and not clamped)',
-      'Floating point arithmetic must manifest near 0 (total ends up zero)',
-    ],
-  },
+  'readable-streams/floating-point-total-queue-size.any.js': {},
   'readable-streams/from.any.js': {
     comment: 'See comments on tests',
     disabledTests: [
@@ -796,15 +788,7 @@ export default {
   'writable-streams/count-queuing-strategy.any.js': {},
   'writable-streams/crashtests/garbage-collection.any.js': {},
   'writable-streams/error.any.js': {},
-  'writable-streams/floating-point-total-queue-size.any.js': {
-    comment: 'Seems we should be using a double for queue size',
-    expectedFailures: [
-      'Floating point arithmetic must manifest near NUMBER.MAX_SAFE_INTEGER (total ends up positive)',
-      'Floating point arithmetic must manifest near 0 (total ends up positive, but clamped)',
-      'Floating point arithmetic must manifest near 0 (total ends up positive, and not clamped)',
-      'Floating point arithmetic must manifest near 0 (total ends up zero)',
-    ],
-  },
+  'writable-streams/floating-point-total-queue-size.any.js': {},
   'writable-streams/garbage-collection.any.js': {},
   'writable-streams/general.any.js': {
     comment: 'To be investigated',