mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 387049 - "Remove nsIObservableInputStream, nsIObservableOutputStream" [p=WeirdAl r=biesi a1.9=damons]

This commit is contained in:
reed@reedloden.com 2007-11-13 02:27:26 -08:00
Родитель dd0d254232
Коммит a389f02605
3 изменённых файлов: 0 добавлений и 254 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

67
xpcom/io/nsIObservableInputStream.idl
Просмотреть файл

@ -1,67 +0,0 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (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.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is Mozilla.
*
* The Initial Developer of the Original Code is
* Netscape Communications Corp.
* Portions created by the Initial Developer are Copyright (C) 2002
* the Initial Developer. All Rights Reserved.
*
* Contributor(s): Darin Fisher <darin@netscape.com>
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
#include "nsISupports.idl"
interface nsIInputStream;
interface nsIInputStreamObserver;
[scriptable, uuid(6f489efe-1dd2-11b2-af78-fb84ae21591b)]
interface nsIObservableInputStream : nsISupports
{
/**
* Allows users to set an observer on an input stream to receive notifications
* about the consumer emptying the input stream's underlying buffer, or closing the
* stream. This is necessary for non-blocking streams so that the producer can suspend
* itself until more data can be written.
*/
attribute nsIInputStreamObserver observer;
};
[scriptable, uuid(019d67cc-61b4-11d4-9877-00c04fa0cf4a)]
interface nsIInputStreamObserver : nsISupports
{
/**
* Called when the input stream's consumer has read all the existing data from the stream.
*/
void onEmpty(in nsIInputStream inStr);
/**
* Called when the consumer closes its end of the stream.
*/
void onClose(in nsIInputStream inStr);
};

67
xpcom/io/nsIObservableOutputStream.idl
Просмотреть файл

@ -1,67 +0,0 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (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.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is Mozilla.
*
* The Initial Developer of the Original Code is
* Netscape Communications Corp.
* Portions created by the Initial Developer are Copyright (C) 2002
* the Initial Developer. All Rights Reserved.
*
* Contributor(s): Darin Fisher <darin@netscape.com>
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
#include "nsISupports.idl"
interface nsIOutputStream;
interface nsIOutputStreamObserver;
[scriptable, uuid(15b374f8-1dd2-11b2-87ab-c3299d704fd3)]
interface nsIObservableOutputStream : nsISupports
{
/**
* Allows users to set an observer on an input stream to receive notifications
* about the consumer emptying the input stream's underlying buffer, or closing the
* stream. This is necessary for non-blocking streams so that the producer can suspend
* itself until more data can be written.
*/
attribute nsIOutputStreamObserver observer;
};
[scriptable, uuid(12314194-61b4-11d4-9877-00c04fa0cf4a)]
interface nsIOutputStreamObserver : nsISupports
{
/**
* Called when the output stream's producer has written more data into the stream.
*/
void onWrite(in nsIOutputStream outStr, in unsigned long amount);
/**
* Called when the stream's underlying buffer becomes full.
*/
void onFull(in nsIOutputStream outStr);
};

120
xpcom/tests/TestPipes.cpp
Просмотреть файл

@ -286,126 +286,6 @@ TestShortWrites(nsIInputStream* in, nsIOutputStream* out)
////////////////////////////////////////////////////////////////////////////////
#if 0
class nsPipeObserver : public nsIInputStreamObserver,
public nsIOutputStreamObserver
{
public:
NS_DECL_ISUPPORTS
NS_IMETHOD OnFull(nsIOutputStream *outStr) {
printf("OnFull outStr=%p\n", outStr);
return NS_OK;
}
NS_IMETHOD OnWrite(nsIOutputStream *outStr, PRUint32 amount) {
printf("OnWrite outStr=%p amount=%d\n", outStr, amount);
return NS_OK;
}
NS_IMETHOD OnEmpty(nsIInputStream* inStr) {
printf("OnEmpty inStr=%p\n", inStr);
return NS_OK;
}
NS_IMETHOD OnClose(nsIInputStream* inStr) {
printf("OnClose inStr=%p\n", inStr);
return NS_OK;
}
nsPipeObserver() { }
private:
~nsPipeObserver() {}
};
NS_IMPL_ISUPPORTS2(nsPipeObserver, nsIInputStreamObserver, nsIOutputStreamObserver)
nsresult
TestPipeObserver()
{
nsresult rv;
nsPipeObserver* obs = new nsPipeObserver();
if (obs == nsnull) return NS_ERROR_OUT_OF_MEMORY;
NS_ADDREF(obs);
printf("TestPipeObserver: OnWrite and OnFull should be called once, OnEmpty should be called twice.\n");
nsIInputStream* in;
nsIOutputStream* out;
rv = NS_NewPipe(&in, &out, 18, 36, PR_TRUE, PR_TRUE);
if (NS_FAILED(rv)) return rv;
nsCOMPtr<nsIObservableInputStream> observableIn(do_QueryInterface(in, &rv));
if (NS_FAILED(rv)) return rv;
nsCOMPtr<nsIObservableInputStream> observableOut(do_QueryInterface(out, &rv));
if (NS_FAILED(rv)) return rv;
rv = observableIn->SetObserver(obs);
if (NS_FAILED(rv)) return rv;
rv = observableOut->SetObserver(obs);
if (NS_FAILED(rv)) return rv;
char buf[] = "puirt a beul: a style of Gaelic vocal music intended for dancing.";
PRUint32 cnt;
printf("> should see OnWrite message:\n");
rv = out->Write(buf, 20, &cnt);
if (NS_FAILED(rv)) return rv;
NS_ASSERTION(cnt == 20, "Write failed");
printf("> should see OnWrite message followed by OnFull message:\n");
rv = out->Write(buf + 20, 20, &cnt);
if (NS_FAILED(rv)) return rv;
NS_ASSERTION(cnt == 16, "Write failed");
rv = in->Available(&cnt);
if (NS_FAILED(rv)) return rv;
printf("available = %u\n", cnt);
NS_ASSERTION(cnt == 36, "Available failed");
char buf2[40];
printf("> should see OnEmpty message:\n");
rv = in->Read(buf2, 40, &cnt);
if (NS_FAILED(rv)) return rv;
printf("cnt = %u\n", cnt);
NS_ASSERTION(cnt == 36, "Read failed");
NS_ASSERTION(nsCRT::strncmp(buf, buf2, 36) == 0, "Read wrong stuff");
rv = in->Available(&cnt);
if (NS_FAILED(rv)) return rv;
printf("available = %u\n", cnt);
NS_ASSERTION(cnt == 0, "Available failed");
printf("> should see OnEmpty message:\n");
rv = in->Read(buf2, 2, &cnt);
if (NS_FAILED(rv) && rv != NS_BASE_STREAM_WOULD_BLOCK) return rv;
NS_ASSERTION(cnt == 0 && rv == NS_BASE_STREAM_WOULD_BLOCK, "Read failed");
printf("> should see OnWrite message:\n");
rv = out->Write(buf, 20, &cnt);
if (NS_FAILED(rv)) return rv;
NS_ASSERTION(cnt == 20, "Write failed");
rv = in->Available(&cnt);
if (NS_FAILED(rv)) return rv;
printf("available = %u\n", cnt);
NS_ASSERTION(cnt == 20, "Available failed");
printf("> should see OnEmpty message:\n");
rv = in->Read(buf2, 20, &cnt);
if (NS_FAILED(rv)) return rv;
NS_ASSERTION(cnt == 20, "Read failed");
printf("> should see OnClose message:\n");
NS_RELEASE(obs);
NS_RELEASE(in);
NS_RELEASE(out);
return NS_OK;
}
#endif
////////////////////////////////////////////////////////////////////////////////
class nsPump : public nsIRunnable
{
public: