mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Remove Fx 3.6 and 4.0-specific code

Browse source
This commit is contained in:
Simon Kornblith 2012-02-09 03:44:40 -05:00
parent 4fc7600387
commit 0f6b151ea4
2 changed files with 0 additions and 168 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

102
chrome/content/zotero/xpcom/ipc.js
View file

@ -132,11 +132,6 @@ Zotero.IPC = new function() {
var mode = 0x0001;
if(!block) mode = mode | (Zotero.isMac ? 0x0004 : 00004000);
// Also append to plain files to get things working with Fx 3.6 polling
// On OS X, O_APPEND = 0x0008
// On Linux, O_APPEND = 00002000
if(pipe.isFile()) mode = mode | (Zotero.isMac ? 0x0008 : 00002000);
var fd = open(pipe.path, mode);
if(fd === -1) return false;
write(fd, string, string.length);
@ -375,10 +370,6 @@ Zotero.IPC.Pipe = new function() {
getService(Components.interfaces.nsIXULAppInfo);
if(verComp.compare("2.2a1pre", appInfo.platformVersion) <= 0) { // Gecko 5
_pipeClass = Zotero.IPC.Pipe.DeferredOpen;
} else if(verComp.compare("2.0b9pre", appInfo.platformVersion) <= 0) { // Gecko 2.0b9+
_pipeClass = Zotero.IPC.Pipe.WorkerThread;
} else { // Gecko 1.9.2
_pipeClass = Zotero.IPC.Pipe.Poll;
}
}
@ -482,97 +473,4 @@ Zotero.IPC.Pipe.DeferredOpen.prototype = {
this._openTime = Date.now();
}
};
/**
* Listens synchronously for data on the integration pipe on a separate JS thread and reads it
* when available
*
* Used to read from pipe on Gecko 2
*/
Zotero.IPC.Pipe.WorkerThread = function(file, callback) {
this._callback = callback;
if(!Zotero.IPC.Pipe.mkfifo(file)) return;
// set up worker
var worker = Components.classes["@mozilla.org/threads/workerfactory;1"]
.createInstance(Components.interfaces.nsIWorkerFactory)
.newChromeWorker("chrome://zotero/content/xpcom/pipe_worker.js");
worker.onmessage = this.onmessage.bind(this);
worker.postMessage({"path":file.path, "libc":Zotero.IPC.getLibcPath()});
// add shutdown listener
Zotero.addShutdownListener(Zotero.IPC.Pipe.writeShutdownMessage.bind(null, this, file));
}
Zotero.IPC.Pipe.WorkerThread.prototype = {
/**
* onmessage call for worker thread, to get data from it
*/
"onmessage":function(event) {
if(event.data[0] === "Exception") {
throw event.data[1];
} else if(event.data[0] === "Debug") {
Zotero.debug(event.data[1]);
} else if(event.data[0] === "Read") {
this._callback(event.data[1]);
} else if(event.data[0] === "Open") {
this._openTime = Date.now();
}
}
}
/**
* Polling mechanism for file
*
* Used to read from integration "pipe" on Gecko 1.9.2/Firefox 3.6
*/
Zotero.IPC.Pipe.Poll = function(file, callback) {
this._file = file;
this._callback = callback;
// create empty file
this._clearFile();
// no deferred open capability, so we need to poll
this._timer = Components.classes["@mozilla.org/timer;1"].
createInstance(Components.interfaces.nsITimer);
this._timer.initWithCallback(this, 1000,
Components.interfaces.nsITimer.TYPE_REPEATING_SLACK);
// this has to be in global scope so we don't get garbage collected
Zotero.IPC.Pipe.Poll._activePipes.push(this);
// add shutdown listener
var me = this;
Zotero.addShutdownListener(function() { file.remove(false) });
}
Zotero.IPC.Pipe.Poll._activePipes = [];
Zotero.IPC.Pipe.Poll.prototype = {
/**
* Called every second to check if there is new data to be read
*/
"notify":function() {
if(this._file.fileSize === 0) return;
// read from pipe (file, actually)
var string = Zotero.File.getContents(this._file);
this._clearFile();
// run command
this._callback(string);
},
/**
* Clears the old contents of the fifo file
*/
"_clearFile":function() {
// clear file
var foStream = Components.classes["@mozilla.org/network/file-output-stream;1"].
createInstance(Components.interfaces.nsIFileOutputStream);
foStream.init(this._file, 0x02 | 0x08 | 0x20, 0666, 0);
foStream.close();
}
};

66
chrome/content/zotero/xpcom/pipe_worker.js
View file

@ -1,66 +0,0 @@
/*
***** BEGIN LICENSE BLOCK *****
Copyright © 2009 Center for History and New Media
George Mason University, Fairfax, Virginia, USA
http://zotero.org
This file is part of Zotero.
Zotero is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Zotero is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with Zotero. If not, see <http://www.gnu.org/licenses/>.
***** END LICENSE BLOCK *****
*/
onmessage = function(event) {
var path = event.data.path;
// ctypes declarations follow
var lib = ctypes.open(event.data.libc);
// int open(const char *path, int oflag, ...);
var open = lib.declare("open", ctypes.default_abi, ctypes.int, ctypes.char.ptr, ctypes.int);
// ssize_t read(int fildes, void *buf, size_t nbyte);
var read = lib.declare("read", ctypes.default_abi, ctypes.ssize_t, ctypes.int,
ctypes.char.ptr, ctypes.size_t);
// int close(int fildes);
var close = lib.declare("close", ctypes.default_abi, ctypes.int, ctypes.int);
// define buffer for reading from fifo
const BUFFER_SIZE = 4096;
postMessage(["Open", null]);
while(true) {
var buf = ctypes.char.array(BUFFER_SIZE)("");
// open fifo (this will block until something writes to it)
var fd = open(path, 0);
// read from fifo and close it
read(fd, buf, BUFFER_SIZE-1);
close(fd);
// extract message
var string = buf.readString();
if(string === "Zotero shutdown\n") {
postMessage(["Debug", "IPC: Worker closing "+event.data.path]);
lib.close();
return;
}
postMessage(["Read", string]);
}
};