Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(106)

Side by Side Diff: ppapi/native_client/src/trusted/plugin/pnacl_translate_thread.h

Issue 292743011: Pepper: Simplify Pnacl manifest id logic. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PNACL_TRANSLATE_THREAD_H_ 5 #ifndef NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PNACL_TRANSLATE_THREAD_H_
6 #define NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PNACL_TRANSLATE_THREAD_H_ 6 #define NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PNACL_TRANSLATE_THREAD_H_
7 7
8 #include <deque> 8 #include <deque>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 24 matching lines...) Expand all
35 class TempFile; 35 class TempFile;
36 36
37 class PnaclTranslateThread { 37 class PnaclTranslateThread {
38 public: 38 public:
39 PnaclTranslateThread(); 39 PnaclTranslateThread();
40 ~PnaclTranslateThread(); 40 ~PnaclTranslateThread();
41 41
42 // Start the translation process. It will continue to run and consume data 42 // Start the translation process. It will continue to run and consume data
43 // as it is passed in with PutBytes. 43 // as it is passed in with PutBytes.
44 void RunTranslate(const pp::CompletionCallback& finish_callback, 44 void RunTranslate(const pp::CompletionCallback& finish_callback,
45 int32_t manifest_id,
46 const std::vector<TempFile*>* obj_files, 45 const std::vector<TempFile*>* obj_files,
47 TempFile* nexe_file, 46 TempFile* nexe_file,
48 nacl::DescWrapper* invalid_desc_wrapper, 47 nacl::DescWrapper* invalid_desc_wrapper,
49 ErrorInfo* error_info, 48 ErrorInfo* error_info,
50 PnaclResources* resources, 49 PnaclResources* resources,
51 PP_PNaClOptions* pnacl_options, 50 PP_PNaClOptions* pnacl_options,
52 const nacl::string &architecture_attributes, 51 const nacl::string &architecture_attributes,
53 PnaclCoordinator* coordinator, 52 PnaclCoordinator* coordinator,
54 Plugin* plugin); 53 Plugin* plugin);
55 54
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 // Data buffers from FileDownloader are enqueued here to pass from the 102 // Data buffers from FileDownloader are enqueued here to pass from the
104 // main thread to the SRPC thread. Protected by cond_mu_ 103 // main thread to the SRPC thread. Protected by cond_mu_
105 std::deque<std::vector<char> > data_buffers_; 104 std::deque<std::vector<char> > data_buffers_;
106 // Whether all data has been downloaded and copied to translation thread. 105 // Whether all data has been downloaded and copied to translation thread.
107 // Associated with buffer_cond_ 106 // Associated with buffer_cond_
108 bool done_; 107 bool done_;
109 108
110 int64_t compile_time_; 109 int64_t compile_time_;
111 110
112 // Data about the translation files, owned by the coordinator 111 // Data about the translation files, owned by the coordinator
113 int32_t manifest_id_;
114 const std::vector<TempFile*>* obj_files_; 112 const std::vector<TempFile*>* obj_files_;
115 TempFile* nexe_file_; 113 TempFile* nexe_file_;
116 nacl::DescWrapper* invalid_desc_wrapper_; 114 nacl::DescWrapper* invalid_desc_wrapper_;
117 ErrorInfo* coordinator_error_info_; 115 ErrorInfo* coordinator_error_info_;
118 PnaclResources* resources_; 116 PnaclResources* resources_;
119 PP_PNaClOptions* pnacl_options_; 117 PP_PNaClOptions* pnacl_options_;
120 nacl::string architecture_attributes_; 118 nacl::string architecture_attributes_;
121 PnaclCoordinator* coordinator_; 119 PnaclCoordinator* coordinator_;
122 Plugin* plugin_; 120 Plugin* plugin_;
123 private: 121 private:
124 NACL_DISALLOW_COPY_AND_ASSIGN(PnaclTranslateThread); 122 NACL_DISALLOW_COPY_AND_ASSIGN(PnaclTranslateThread);
125 }; 123 };
126 124
127 } 125 }
128 #endif // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PNACL_TRANSLATE_THREAD_H_ 126 #endif // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PNACL_TRANSLATE_THREAD_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698