parchive2-cvs Mailing List for parchive2
Status: Pre-Alpha
Brought to you by:
coppit
Menu
▾
▴
parchive2-cvs — A list for tracking CVS activity
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
(90) |
May
(196) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|---|
|
From: <gu...@us...> - 2003-05-07 09:30:15
|
Update of /cvsroot/parchive2/library/src/file
In directory sc8-pr-cvs1:/tmp/cvs-serv11036
Modified Files:
file.cc
Log Message:
sync() seems to be buggy. Broke the library.
Index: file.cc
===================================================================
RCS file: /cvsroot/parchive2/library/src/file/file.cc,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** file.cc 6 May 2003 22:57:00 -0000 1.25
--- file.cc 7 May 2003 09:30:09 -0000 1.26
***************
*** 154,158 ****
if (reference_counts[the_stream] == 0)
! delete the_stream;
}
--- 154,160 ----
if (reference_counts[the_stream] == 0)
! {the_stream->close();
! delete the_stream;
! }
}
***************
*** 192,197 ****
istream& File::read(char* __s, streamsize __n)
{
! the_stream->read(__s, __n);
! the_stream->sync();
return (*(ifstream*)the_stream);
}
--- 194,199 ----
istream& File::read(char* __s, streamsize __n)
{
! return the_stream->read(__s, __n);
! // the_stream->sync();
return (*(ifstream*)the_stream);
}
***************
*** 199,203 ****
ostream& File::write(char* __s, streamsize __n)
{
! the_stream->write(__s, __n);
return the_stream->flush();
}
--- 201,205 ----
ostream& File::write(char* __s, streamsize __n)
{
! return the_stream->write(__s, __n);
return the_stream->flush();
}
|
|
From: <gu...@us...> - 2003-05-07 09:27:07
|
Update of /cvsroot/parchive2/library/src/parchive2
In directory sc8-pr-cvs1:/tmp/cvs-serv8822
Modified Files:
parchive2.cc
Log Message:
Fixed a bug.
Index: parchive2.cc
===================================================================
RCS file: /cvsroot/parchive2/library/src/parchive2/parchive2.cc,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** parchive2.cc 6 May 2003 21:55:26 -0000 1.57
--- parchive2.cc 7 May 2003 09:27:05 -0000 1.58
***************
*** 99,103 ****
f.open( (p->Get_File_Name()).c_str() ); // open the file
f.read(&temp,1); //Read one byte
! if(f.eof())
{
p++;// if end, goto next file
--- 99,103 ----
f.open( (p->Get_File_Name()).c_str() ); // open the file
f.read(&temp,1); //Read one byte
! if(f.eof() || !f.is_open())
{
p++;// if end, goto next file
|
|
From: <gu...@us...> - 2003-05-07 09:13:15
|
Update of /cvsroot/parchive2/library/src/slice
In directory sc8-pr-cvs1:/tmp/cvs-serv31023
Modified Files:
file_slice.cc file_slice.h
Log Message:
Just checked to make sure everything was working, was delightfully (well....) surprised to find that two assertions were failing. Was checking a non pointer against the NULL value.. dunno why it even compiled. Anyway- the library is again creating/restoring data.
Index: file_slice.cc
===================================================================
RCS file: /cvsroot/parchive2/library/src/slice/file_slice.cc,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** file_slice.cc 7 May 2003 03:13:54 -0000 1.25
--- file_slice.cc 7 May 2003 09:13:11 -0000 1.26
***************
*** 90,95 ****
(*file).seekg(offset);
! if(((*file).read(slice_bytes, size)) == NULL)
! assert(false);
// Make sure we zero pad the rest
--- 90,96 ----
(*file).seekg(offset);
! if(&((*file).read(slice_bytes, size)) == NULL)
! assert(false);
!
// Make sure we zero pad the rest
***************
*** 132,136 ****
(*file).seekp(offset);
! if(((*file).write(slice_bytes, size)) == NULL)
assert(false);
--- 133,137 ----
(*file).seekp(offset);
! if(&((*file).write(slice_bytes, size)) == NULL)
assert(false);
Index: file_slice.h
===================================================================
RCS file: /cvsroot/parchive2/library/src/slice/file_slice.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** file_slice.h 7 May 2003 01:39:22 -0000 1.8
--- file_slice.h 7 May 2003 09:13:12 -0000 1.9
***************
*** 34,40 ****
protected:
// We know what to read/write, our own data
void Read_From_File() const;
void Write_To_File();
!
bool autoflush;
mutable bool gotbytes;
--- 34,41 ----
protected:
// We know what to read/write, our own data
+
void Read_From_File() const;
void Write_To_File();
!
bool autoflush;
mutable bool gotbytes;
|
|
From: <na...@us...> - 2003-05-07 06:08:54
|
Update of /cvsroot/parchive2/library/src/tests/parchive2
In directory sc8-pr-cvs1:/tmp/cvs-serv11936
Modified Files:
test_parchive2.cc
Log Message:
rewrote the whole test file for Parchive2... Jeff will finish it tomorrow
Index: test_parchive2.cc
===================================================================
RCS file: /cvsroot/parchive2/library/src/tests/parchive2/test_parchive2.cc,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** test_parchive2.cc 7 May 2003 01:53:30 -0000 1.16
--- test_parchive2.cc 7 May 2003 06:08:51 -0000 1.17
***************
*** 8,11 ****
--- 8,12 ----
#include "slice/slice.h"
#include "slice/file_slice.h"
+ #include "tests/tests.h"
#include "creator_information/creator_information.h"
#include "file/file.h"
***************
*** 14,17 ****
--- 15,21 ----
#include "parchive2/parchive2.h"
#include <iostream>
+ #include <unistd.h>
+ #include <fstream>
+ #include <stdio.h>
using namespace std;
***************
*** 32,36 ****
list<Slice*> Create_File_Slices(list<File> file_list) const
{
! return Parchive2::Create_File_Slices(file_list);
}
--- 36,41 ----
list<Slice*> Create_File_Slices(list<File> file_list) const
{
! list<Slice*> back = Parchive2::Create_File_Slices(file_list);
! return back;
}
***************
*** 84,273 ****
int main()
{
- // Constructor
- cout << "Parchive2:Constructor: BEGIN" << endl;
- Parchive2_Tester p;
! cout << "Parchive2:Constructor: SUCCESS" << endl;
! // Constructor 2
! cout << "Parchive2:Constructor2: BEGIN" << endl;
! string str = "test";
! Parchive2_Tester p2;
! cout << "Parchive2:Constructor2:SUCCESS"<<endl;
!
! // Get_Creator_Information
! cout << "Parchive2:Get_Creator_Information: BEGIN" <<endl;
! string client = "";
! Creator_Information c(client);
! c = p.Get_Creator_Information();
! if (c.Get_Client_ID() == ""){
! cout << "Parchive2:Get_Creator_Information: FAILED"<<endl;
! return 1;
! } else
! cout << "Parchive2:Get_Creator_Information: SUCCESS"<<endl;
!
! //Get_Data_File_Information
! cout << "Parchive2:Get_Data_File_Information: NOT IMPLEMENTED" <<endl;
! //list<File> ufile = p.Get_Data_File_Information();
!
! //if(!sizeof(ufile))
! // cout <<"Parchive2:Get_Data_File_Information: SUCCESS" <<endl;
! //else
! // cout <<"Parchive2:Get_Data_File_Information: FAILED" <<endl;
! // Create_File_Slices
! cout << "Parchive2:Create_File_Slices: BEGIN" << endl;
! list<Slice*> dslice;
! //File dum("dummyfile.txt","/dummy");
! cout <<"Can't open File" <<endl;
! list<File> xpointer;
! //xpointer.push_back(dum);
!
! dslice = p.Create_File_Slices(xpointer);
! if (!sizeof(dslice))
! {
! cout << "Parchive2:Create_File_Slices: FAILED" << endl;
! return 1;
! }
! else
! cout << "Parchive2:Create_File_Slices: SUCCESS" << endl;
! // Make_Data_Files
! cout << "Parchive2:Make_Data_Files: NOT IMPLEMENTED" << endl;
! //list<File> dfile;
! // dfile.clear();
! //dfile = p.Make_Data_Files("/dummy");
! //if (!sizeof(dfile))
! // cout << "Parchive2:Make_Data_Files: SUCCESS" << endl;
! //else
! // cout << "Parchive2:Make_Data_Files: FAILED" << endl;
!
! // Make_Parity_Files
! cout << "Parchive2:Make_Parity_Files: BEGIN" << endl;
! list<File> pfile;
! pfile.clear();
! pfile = p.Make_Parity_Files("/dummy");
! if (!sizeof(pfile))
! {
! cout << "Parchive2:Make_Parity_Files: FAILED" << endl;
! return 1;
}
- else
- cout << "Parchive2:Make_Parity_Files: SUCCESS" << endl;
!
!
! // Set_Slice_Size and Get_Slice_Size
! cout <<"Parchive2:Set_Slice_Size and Get_Slice_Size: BEGIN"<<endl;
! p.Set_Slice_Size(5);
! int n = p.Get_Slice_Size();
! if (n==5)
! cout <<"Parchive2:Set_Slice_Size and Get_Slice_Size:SUCCESS"<<endl;
! else
{
! cout <<"Parchive2:Set_Slice_Size and Get_Slice_Size:FAILED"<<endl;
! return 1;
}
!
!
! // Set_Protected_Files
! cout << "Parchive2:Set_Protected_Files:BEGIN" << endl;
! File s1("filename1", "path1");
! File s2("filename2", "path2");
! File s3("filename3", "path3");
! list<File> spointer;
! spointer.push_back(s1);
! spointer.push_back(s2);
! spointer.push_back(s3);
! p.Set_Protected_Files(spointer);
! cout<<"Parchive2:Set_Protected_Files:SUCCESS" << endl;
! //cout <<"Parchive2:Set_Protected_Files:FAILED"<<endl;
! // Set_Unprotected_Files
! cout << "Parchive2:Set_Unprotected_Files:BEGIN" << endl;
! File e1("filename1","path1");
! File e2("filename2","path2");
! File e3("filename3","path3");
! list<File> epointer;
! epointer.push_back(e1);
! epointer.push_back(e2);
! epointer.push_back(e3);
! p.Set_Unprotected_Files(epointer);
! cout<<"Parchive2:Set_Unprotected_Files:SUCCESS" <<endl;
! //cout <<"Parchive2:Set_Unprotected_Files:FAILED"<<endl;
!
! // Find_Valid_Existing_Protected_Files
! cout << "Parchive2:Find_Valid_Existing_Protected_Files:NOT IMPLEMENTED" << endl;
! //list<File> Find_Valid_Existing_Protected_Files();
!
!
! // Find_Valid_Existing_Unprotected_Files
! cout << "Parchive2:Find_Valid_Existing_Unprotected_Files:NOT IMPLEMENTED" << endl;
! // list<File> Find_Valid_Existing_Unprotected_Files();
! // Make_Packets_From File
! cout << "Parchive2:Make_Packets_From_Files:BEGIN"<<endl;
! list <Packet*> dpacket;
! list<File> Flist;
!
! File somefile("dummyfile.txt","/dummy");
! Flist.push_back(somefile);
! dpacket = p.Make_Packets_From_Files(Flist);
! if (!sizeof(dpacket))
{
! cout << "Parchive2:Make_Packets_From_Files: FAILED" << endl;
! return 1;
}
! else
! cout << "Parchive2:Make_Packets_From_Files: SUCCESS" << endl;
!
!
! //Check_Data_Files
! cout << "Parchive2:Check_Data_Files:BEGIN"<<endl;
! list<File> inbase1;
! map<string,bool> torf;
! bool torf2;
! p.Check_Data_Files(inbase1,torf, torf2);
! cout <<"Parchive2:Check_Data_Files:SUCCESS"<<endl;
!
! //Recover_Data_Files
! cout << "Parchive2:Recover_Data_Files:BEGIN"<<endl;
! list<File> inbase;
! string indirect = "/dummy";
! cout <<"Parchive2:Recover_Data_Files:SUCCESS"<<endl;
!
! //Ignore_Case
! cout << "Parchive2:IgnoreCase:NOT IMPLEMENTED"<<endl;
! //Create_Parity_Files
! cout << "Parchive2:Create_Parity_Files:BEGIN"<<endl;
! list<File> protfiles;
! list<File> unprotfiles;
! string destindirect = "/dummy";
! string base = "dum";
! p.Create_Parity_Files(protfiles, unprotfiles, destindirect, base);
! cout <<"Parchive2:Create_Parity_Files:SUCCESS"<<endl;
! // Create_Parchive_Files
! cout << "Parchive2:Create_Parchive_Files: BEGIN" << endl;
! list<File> hfile;
! hfile.clear();
! hfile = p.Create_Parchive_Files("/dummy","dum");
! if (!sizeof(hfile))
! cout << "Parchive2:Create_Parchive_Files: SUCCESS" << endl;
! else
{
! cout << "Parchive2:Create_Parchive_Files: FAILED" << endl;
! return 1;
}
return 0;
}
--- 89,278 ----
int main()
{
! //default constructor
! {
! Parchive2_Tester first_par;
! Parchive2_Tester second_par;
! compare(first_par.Get_Slice_Size(),second_par.Get_Slice_Size());
! compare(first_par.Get_Creator_Information(),second_par.Get_Creator_Information());
!
! cerr<<"PASS: Parchive2: default constructor"<<endl;
! }
! //overloaded constructor
! {
+ string in_creator_info = "PAR2 Tester";
! Parchive2_Tester my_par2(in_creator_info);
! Creator_Information back_creator_info(my_par2.Get_Creator_Information());
! compare(back_creator_info,in_creator_info); //sanity check
!
! cerr<<"PASS: Parchive2: overloaded constructor and Get_Creator_Information()"<<endl;
}
+ //make a little file
+ ofstream out;
+ out.open("parchive2_tester_file");
! char str_passed_in[] = "Parchive2 is going to fly... parchive2 is going to fly";
! out<<str_passed_in;
! out.close(); //write file and close it
!
! //Create_File_Slices
{
! string ici = "PAR2 TESTER";
!
! Parchive2_Tester* my_par2 = new Parchive2_Tester(ici);
!
! Parchive2_Tester* my_par2_copy = new Parchive2_Tester(ici);
!
! File fd_in("parchive2_tester_file","tests/parchive2/");
!
! string path = fd_in.Get_Path();
!
! cout<<"the path string is: "<<path;
!
! list<File> original_file_list;
!
! original_file_list.push_back(fd_in);
!
! list<Slice*> back_file_slices1;
!
! back_file_slices1 = my_par2->Create_File_Slices(original_file_list);
!
! list<Slice*> back_file_slices2 = my_par2_copy->Create_File_Slices(original_file_list);
!
! compare(back_file_slices1.size(),back_file_slices2.size());
!
! //we must do a for loop comparing each slice because it wont
! //work with the overloaded == operator... stl got confused
! list<Slice*>::iterator slice_it1 = back_file_slices1.begin();
!
! list<Slice*>::iterator slice_it2 = back_file_slices2.begin();
!
! for(;
! slice_it1 != back_file_slices1.end();
! slice_it1++,slice_it2++)
! {
! compare(*slice_it1,*slice_it2);
! }
!
! cerr<<"PASS: Parchive2: Create_File_Slices"<<endl;
!
}
! //Make_Packets_From_Files
! {
! string ici = "PAR2 TESTER";
! Parchive2_Tester* my_par2 = new Parchive2_Tester(ici);
! Parchive2_Tester* my_par2_copy = new Parchive2_Tester(ici);
!
! File fd_in("parchive2_tester_file","tests/parchive2/");
! string path = fd_in.Get_Path();
! cout<<"the path string is: "<<path;
!
! list<File> original_file_list;
! original_file_list.push_back(fd_in);
! list<Packet*> back_file_packets1;
!
! back_file_packets1 = my_par2->Make_Packets_From_Files(original_file_list);
!
! list<Packet*> back_file_packets2;
!
! back_file_packets2 = my_par2_copy->Make_Packets_From_Files(original_file_list);
!
! compare(back_file_packets1.size(),back_file_packets2.size());
!
! list<Packet*>::iterator packet_it1 = back_file_packets1.begin();
!
! list<Packet*>::iterator packet_it2 = back_file_packets2.begin();
!
! for(;
! packet_it1 != back_file_packets1.end();
! packet_it1++,packet_it2++)
! {
! compare(*packet_it1,*packet_it2);
! }
!
! cerr<<"PASS: Parchive2: Make_Packets_From_Files"<<endl;
! }
!
! //Make_Parity_Files
{
! string ici = "PAR2 TESTER";
!
! Parchive2_Tester* my_par2 = new Parchive2_Tester(ici);
!
! Parchive2_Tester* my_par2_copy = new Parchive2_Tester(ici);
!
! list<File> back_files_list1;
!
! back_files_list1 = my_par2->Make_Parity_Files("/doesntexist");
!
! list<File> back_files_list2;
!
! back_files_list2 = my_par2_copy->Make_Parity_Files("/doesnotexist");
!
! compare(back_files_list1.size(),0); //since the file doesn't exist
! compare(back_files_list2.size(),0);
!
! list<File>::iterator file_it1 = back_files_list1.begin();
!
! list<File>::iterator file_it2 = back_files_list2.begin();
!
! for(;
! file_it1 != back_files_list1.end();
! file_it1++,file_it2++)
! {
! compare(*file_it1,*file_it2);
! }
!
! cerr<<"PASS: Parchive2: Make_Parity_Files"<<endl;
}
! //Create_Parchive_Files
! {
! string ici = "PAR2 TESTER";
!
! Parchive2_Tester p2tester(ici);
! list<File> files_back = p2tester.Create_Parchive_Files("/doesntexist","stuff");
! compare(files_back.size(),0);
! files_back = p2tester.Create_Parchive_Files("tests/parchive2/","parchive2_tester_file");
! compare((files_back.size() > 0),true);
!
! cerr<<"PASS: Parchive2: Create_Parchive_Files"<<endl;
!
! }
! //set slice size and get slice size
{
! string ici = "PAR2 TEST";
!
! Parchive2_Tester p2tester(ici);
!
! int size = 20;
!
! p2tester.Set_Slice_Size(size);
!
! compare(p2tester.Get_Slice_Size(),size);
!
! cerr<<"PASS: Parchive2: Set_Slice_Size()"<<endl;
}
+
+
+
+
+ unlink("parchive2_tester_file");
+
return 0;
}
|
|
From: <el...@us...> - 2003-05-07 03:50:57
|
Update of /cvsroot/parchive2/library/src/packet
In directory sc8-pr-cvs1:/tmp/cvs-serv6653/src/packet
Modified Files:
packet.cc
Log Message:
Put delete[] buf back in. Prof. Coppit forgot it (hey, i'm a poet and didn't even realize it)
Index: packet.cc
===================================================================
RCS file: /cvsroot/parchive2/library/src/packet/packet.cc,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** packet.cc 7 May 2003 03:41:56 -0000 1.32
--- packet.cc 7 May 2003 03:50:54 -0000 1.33
***************
*** 66,69 ****
--- 66,71 ----
curpos = NULL;
+ delete[] buf;
+
return temp_md5;
}
|
|
From: <co...@us...> - 2003-05-07 03:41:59
|
Update of /cvsroot/parchive2/library/src/tests/packet
In directory sc8-pr-cvs1:/tmp/cvs-serv4822/src/tests/packet
Modified Files:
test_input_file_slice_checksum_packet.cc
Log Message:
Fixed a bug in length computation
Index: test_input_file_slice_checksum_packet.cc
===================================================================
RCS file: /cvsroot/parchive2/library/src/tests/packet/test_input_file_slice_checksum_packet.cc,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** test_input_file_slice_checksum_packet.cc 7 May 2003 03:23:00 -0000 1.16
--- test_input_file_slice_checksum_packet.cc 7 May 2003 03:41:56 -0000 1.17
***************
*** 248,254 ****
md5 expected_packet_hash;
! //expected_packet_hash.Set_MD5_Hex("11108ab5a6007164D110626bbcc5888D");
! expected_packet_hash.Set_MD5_Hex("77982fb0e971d3ec99fa7bb5bb14e8f2");
!
compare(ifscp1.Get_Packet_Hash(),expected_packet_hash);
--- 248,253 ----
md5 expected_packet_hash;
! expected_packet_hash.Set_MD5_Hex("2830ec8725d1094a2e90be5c8b4b4449");
!
compare(ifscp1.Get_Packet_Hash(),expected_packet_hash);
|
|
From: <co...@us...> - 2003-05-07 03:41:59
|
Update of /cvsroot/parchive2/library/src/packet
In directory sc8-pr-cvs1:/tmp/cvs-serv4822/src/packet
Modified Files:
input_file_slice_checksum_packet.cc packet.cc
Log Message:
Fixed a bug in length computation
Index: input_file_slice_checksum_packet.cc
===================================================================
RCS file: /cvsroot/parchive2/library/src/packet/input_file_slice_checksum_packet.cc,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** input_file_slice_checksum_packet.cc 6 May 2003 04:16:27 -0000 1.24
--- input_file_slice_checksum_packet.cc 7 May 2003 03:41:56 -0000 1.25
***************
*** 31,36 ****
const unsigned long long Input_File_Slice_Checksum_Packet::Get_Packet_Length() const
{
! return (Packet::Get_Packet_Length() + sizeof(md5) +
! md5s.size()*(sizeof(md5) + sizeof(crc)));
}
--- 31,50 ----
const unsigned long long Input_File_Slice_Checksum_Packet::Get_Packet_Length() const
{
! // I don't know why this works and the other way below fails...
! unsigned long long length = Packet::Get_Packet_Length();
! length += sizeof(md5);
!
! list<md5>::const_iterator i = md5s.begin();
! do
! {
! length += sizeof(md5);
! i++;
! length += sizeof(crc);
! } while(i != md5s.end());
!
! return length;
!
! // return (Packet::Get_Packet_Length() + sizeof(md5) +
! // md5s.size()*(sizeof(md5) + sizeof(crc)));
}
Index: packet.cc
===================================================================
RCS file: /cvsroot/parchive2/library/src/packet/packet.cc,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** packet.cc 7 May 2003 03:22:59 -0000 1.31
--- packet.cc 7 May 2003 03:41:56 -0000 1.32
***************
*** 47,60 ****
const md5 Packet::calculateHash()
{
! const unsigned long long int len = Get_Packet_Length() - 32;
char *buf = new char[len];
char *curpos = buf;
! memcpy(curpos, recovery_set_id.Get_MD5(), 16);
! curpos += 16;
! memcpy(curpos, type.get_type(), 16);
! curpos += 16;
serializeData(curpos);
--- 47,62 ----
const md5 Packet::calculateHash()
{
! const unsigned long long int len =
! Get_Packet_Length() - Packet::Get_Packet_Length() +
! sizeof(md5) + sizeof(packet_type) /*for below*/;
char *buf = new char[len];
char *curpos = buf;
! memcpy(curpos, recovery_set_id.Get_MD5(), sizeof(md5));
! curpos += sizeof(md5);
! memcpy(curpos, type.get_type(), sizeof(packet_type));
! curpos += sizeof(packet_type);
serializeData(curpos);
|
|
From: <co...@us...> - 2003-05-07 03:41:59
|
Update of /cvsroot/parchive2/library/src/math
In directory sc8-pr-cvs1:/tmp/cvs-serv4822/src/math
Modified Files:
md5.cc md5.h
Log Message:
Fixed a bug in length computation
Index: md5.cc
===================================================================
RCS file: /cvsroot/parchive2/library/src/math/md5.cc,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** md5.cc 4 May 2003 04:44:18 -0000 1.14
--- md5.cc 7 May 2003 03:41:56 -0000 1.15
***************
*** 8,12 ****
// This takes a string and length and returns an md5 which is a char array
! md5::md5(const char* in_str, unsigned int len)
{
memset(_md5,0,16);
--- 8,12 ----
// This takes a string and length and returns an md5 which is a char array
! md5::md5(const char* const in_str, unsigned int len)
{
memset(_md5,0,16);
Index: md5.h
===================================================================
RCS file: /cvsroot/parchive2/library/src/math/md5.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** md5.h 4 May 2003 04:57:16 -0000 1.15
--- md5.h 7 May 2003 03:41:56 -0000 1.16
***************
*** 24,28 ****
md5();
md5( const md5& m);
! md5(const char*,unsigned int);
md5(istream&);
--- 24,28 ----
md5();
md5( const md5& m);
! md5(const char* const,unsigned int);
md5(istream&);
|
|
From: <el...@us...> - 2003-05-07 03:32:08
|
Update of /cvsroot/parchive2/library/src/tests/slice
In directory sc8-pr-cvs1:/tmp/cvs-serv2478/src/tests/slice
Modified Files:
test_file_slice.cc
Log Message:
Fixed a bad CVS UPDATE
Index: test_file_slice.cc
===================================================================
RCS file: /cvsroot/parchive2/library/src/tests/slice/test_file_slice.cc,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** test_file_slice.cc 7 May 2003 03:13:56 -0000 1.15
--- test_file_slice.cc 7 May 2003 03:32:04 -0000 1.16
***************
*** 116,144 ****
int off3 = 10;
- <<<<<<< test_file_slice.cc
- File* temp2 = new File(*temp);
- if((temp2->open(fstream::out|fstream::binary)) == NULL)
- cerr<"File_Slice:Could not open temp2 file"<<endl;
- File_Slice* tempSlice2 = new File_Slice(temp2,off2,size);
- tempSlice2->setAutoFlush(true);
- tempSlice2->Set_Slice_Bytes(in_bytes);
- cerr << "File_Slice:Set_Slice_Bytes: CALL SUCCESS" << endl;
-
- temp2->close();
- //code taken from Ross
- ifstream in;
- char file_slice_buffer[S];
- areVectorsEqual = true;
- if((in.open(filename.c_str(), ios::in)) == NULL)
- cerr<<"File_Slice:Could not open file"<<endl;
- in.seekg(off2); // move filepos pointer to offset mark
-
- int i = 0;
- while(i < S){
- if(!in.eof()){
- in.read(&file_slice_buffer[i], 1);
- if(!(file_slice_buffer[i]==in_bytes[i])) areVectorsEqual=false;
- }
- =======
File temp3("temp_file_slice_test_3.txt");
temp3.open(fstream::out|fstream::binary);
--- 116,119 ----
***************
*** 161,165 ****
areVectorsEqual=false;
}
- >>>>>>> 1.14
i++;
} // end while
--- 136,139 ----
|
|
From: <el...@us...> - 2003-05-07 03:23:04
|
Update of /cvsroot/parchive2/library/src/packet
In directory sc8-pr-cvs1:/tmp/cvs-serv32018/src/packet
Modified Files:
packet.cc
Log Message:
Polished off a few bugs in tests, stoped core dumps, fixed output bug in test_main_packet.cc
Index: packet.cc
===================================================================
RCS file: /cvsroot/parchive2/library/src/packet/packet.cc,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** packet.cc 6 May 2003 04:16:27 -0000 1.30
--- packet.cc 7 May 2003 03:22:59 -0000 1.31
***************
*** 63,67 ****
curpos = NULL;
- delete[] buf;
return temp_md5;
--- 63,66 ----
|
|
From: <el...@us...> - 2003-05-07 03:23:04
|
Update of /cvsroot/parchive2/library/src/tests/packet
In directory sc8-pr-cvs1:/tmp/cvs-serv32018/src/tests/packet
Modified Files:
test_input_file_slice_checksum_packet.cc test_main_packet.cc
Log Message:
Polished off a few bugs in tests, stoped core dumps, fixed output bug in test_main_packet.cc
Index: test_input_file_slice_checksum_packet.cc
===================================================================
RCS file: /cvsroot/parchive2/library/src/tests/packet/test_input_file_slice_checksum_packet.cc,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** test_input_file_slice_checksum_packet.cc 7 May 2003 02:54:32 -0000 1.15
--- test_input_file_slice_checksum_packet.cc 7 May 2003 03:23:00 -0000 1.16
***************
*** 248,253 ****
md5 expected_packet_hash;
! expected_packet_hash.Set_MD5_Hex("11108ab5a6007164D110626bbcc5888D");
!
compare(ifscp1.Get_Packet_Hash(),expected_packet_hash);
--- 248,254 ----
md5 expected_packet_hash;
! //expected_packet_hash.Set_MD5_Hex("11108ab5a6007164D110626bbcc5888D");
! expected_packet_hash.Set_MD5_Hex("77982fb0e971d3ec99fa7bb5bb14e8f2");
!
compare(ifscp1.Get_Packet_Hash(),expected_packet_hash);
Index: test_main_packet.cc
===================================================================
RCS file: /cvsroot/parchive2/library/src/tests/packet/test_main_packet.cc,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** test_main_packet.cc 6 May 2003 05:44:57 -0000 1.18
--- test_main_packet.cc 7 May 2003 03:23:00 -0000 1.19
***************
*** 212,216 ****
compare((mp1.Get_Packet_Length()>64),true);
! cout << "PASS: File description packet: Get_Packet_Length" << endl;
}
--- 212,216 ----
compare((mp1.Get_Packet_Length()>64),true);
! cout << "PASS: Main packet: Get_Packet_Length" << endl;
}
|
|
From: <jm...@us...> - 2003-05-07 03:14:01
|
Update of /cvsroot/parchive2/library/src/slice
In directory sc8-pr-cvs1:/tmp/cvs-serv29371/src/slice
Modified Files:
file_slice.cc
Log Message:
put in tests for files being opened, written to, and read from in test_file_slice.cc. Also did handling for files not able to be opened, read from, or written to. Just asserted false if the above failed.
Index: file_slice.cc
===================================================================
RCS file: /cvsroot/parchive2/library/src/slice/file_slice.cc,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** file_slice.cc 7 May 2003 01:39:22 -0000 1.24
--- file_slice.cc 7 May 2003 03:13:54 -0000 1.25
***************
*** 75,79 ****
{
if (!(*file).is_open()) {
! (*file).open(ios::in|ios::binary);
}
--- 75,81 ----
{
if (!(*file).is_open()) {
! (*file).open(ios::in|ios::binary);
! if(!(*file).is_open())
! assert(false);
}
***************
*** 88,92 ****
(*file).seekg(offset);
! (*file).read(slice_bytes, size);
// Make sure we zero pad the rest
--- 90,95 ----
(*file).seekg(offset);
! if(((*file).read(slice_bytes, size)) == NULL)
! assert(false);
// Make sure we zero pad the rest
***************
*** 106,118 ****
// unless we throw an exception
if (!(*file).is_open()) {
! (*file).open(ios::out|ios::binary);
}
!
if (!(*file).is_open()) {
! // Call with append to create
! (*file).open(ios::out|ios::binary|ios::app);
(*file).close();
// Now open normally, instead of always writing to the end
(*file).open(ios::out|ios::binary);
}
--- 109,127 ----
// unless we throw an exception
if (!(*file).is_open()) {
! (*file).open(ios::out|ios::binary);
! if(!(*file).is_open())
! assert(false);
}
!
if (!(*file).is_open()) {
! // Call with append to create
! (*file).open(ios::out|ios::binary|ios::app);
! if(!(*file).is_open())
! assert(false);
(*file).close();
// Now open normally, instead of always writing to the end
(*file).open(ios::out|ios::binary);
+ if(!(*file).is_open())
+ assert(false);
}
***************
*** 123,127 ****
(*file).seekp(offset);
! (*file).write(slice_bytes, size);
dirty = false;
--- 132,137 ----
(*file).seekp(offset);
! if(((*file).write(slice_bytes, size)) == NULL)
! assert(false);
dirty = false;
|
|
From: <jm...@us...> - 2003-05-07 03:14:01
|
Update of /cvsroot/parchive2/library/src/tests/slice
In directory sc8-pr-cvs1:/tmp/cvs-serv29371/src/tests/slice
Modified Files:
test_file_slice.cc
Log Message:
put in tests for files being opened, written to, and read from in test_file_slice.cc. Also did handling for files not able to be opened, read from, or written to. Just asserted false if the above failed.
Index: test_file_slice.cc
===================================================================
RCS file: /cvsroot/parchive2/library/src/tests/slice/test_file_slice.cc,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** test_file_slice.cc 7 May 2003 01:22:19 -0000 1.14
--- test_file_slice.cc 7 May 2003 03:13:56 -0000 1.15
***************
*** 100,104 ****
while(i < S){
if(!in.eof()){
! in.read(&file_slice_buffer_1[i], 1);
if(!(file_slice_buffer_1[i]==in_bytes[i]))
areVectorsEqual=false;
--- 100,105 ----
while(i < S){
if(!in.eof()){
! if((in.read(&file_slice_buffer_1[i], 1))==NULL)
! cerr<<"File_slice:Could not read in from file"<<endl;
if(!(file_slice_buffer_1[i]==in_bytes[i]))
areVectorsEqual=false;
***************
*** 115,118 ****
--- 116,144 ----
int off3 = 10;
+ <<<<<<< test_file_slice.cc
+ File* temp2 = new File(*temp);
+ if((temp2->open(fstream::out|fstream::binary)) == NULL)
+ cerr<"File_Slice:Could not open temp2 file"<<endl;
+ File_Slice* tempSlice2 = new File_Slice(temp2,off2,size);
+ tempSlice2->setAutoFlush(true);
+ tempSlice2->Set_Slice_Bytes(in_bytes);
+ cerr << "File_Slice:Set_Slice_Bytes: CALL SUCCESS" << endl;
+
+ temp2->close();
+ //code taken from Ross
+ ifstream in;
+ char file_slice_buffer[S];
+ areVectorsEqual = true;
+ if((in.open(filename.c_str(), ios::in)) == NULL)
+ cerr<<"File_Slice:Could not open file"<<endl;
+ in.seekg(off2); // move filepos pointer to offset mark
+
+ int i = 0;
+ while(i < S){
+ if(!in.eof()){
+ in.read(&file_slice_buffer[i], 1);
+ if(!(file_slice_buffer[i]==in_bytes[i])) areVectorsEqual=false;
+ }
+ =======
File temp3("temp_file_slice_test_3.txt");
temp3.open(fstream::out|fstream::binary);
***************
*** 135,138 ****
--- 161,165 ----
areVectorsEqual=false;
}
+ >>>>>>> 1.14
i++;
} // end while
|
|
From: <co...@us...> - 2003-05-07 03:00:55
|
Update of /cvsroot/parchive2/library/src/tests/packet
In directory sc8-pr-cvs1:/tmp/cvs-serv26035/src/tests/packet
Modified Files:
test_recovery_slice_packet.cc
Log Message:
Forgot to remove a note
Index: test_recovery_slice_packet.cc
===================================================================
RCS file: /cvsroot/parchive2/library/src/tests/packet/test_recovery_slice_packet.cc,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** test_recovery_slice_packet.cc 7 May 2003 02:54:33 -0000 1.21
--- test_recovery_slice_packet.cc 7 May 2003 03:00:51 -0000 1.22
***************
*** 51,55 ****
cout<<"PASS: Recovery copy constructor"<<endl;
}
- cout << "NOTE: Recovery copy constructor: See task #77348" << endl;
//exponent set and get
--- 51,54 ----
|
|
From: <co...@us...> - 2003-05-07 02:54:36
|
Update of /cvsroot/parchive2/library/src/tests/packet
In directory sc8-pr-cvs1:/tmp/cvs-serv23700/src/tests/packet
Modified Files:
test_input_file_slice_checksum_packet.cc
test_recovery_slice_packet.cc
Log Message:
- Fixed bugs in recovery_slice_packet. Basically, we shouldn't trust
recovery_slice not to be NULL. I checked everywhere else and it looks okay.
- Uncommented test cases in test_input_file_slice_checksum_packet. The first
one passes on my system, and the second is supposed to fail until task 77151
is done.
- Uncommented test case in test_recovery_slice_packet since I fixed the bug.
Index: test_input_file_slice_checksum_packet.cc
===================================================================
RCS file: /cvsroot/parchive2/library/src/tests/packet/test_input_file_slice_checksum_packet.cc,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** test_input_file_slice_checksum_packet.cc 7 May 2003 02:25:14 -0000 1.14
--- test_input_file_slice_checksum_packet.cc 7 May 2003 02:54:32 -0000 1.15
***************
*** 201,205 ****
}
- /*
// Serialize and unserialize
{
--- 201,204 ----
***************
*** 238,245 ****
cout << "PASS: Input file slice checksum packet: Serialize and UnSerialize" << endl;
! }*/
! cerr << "NOTE: Input file slice checksum packet: Serialize and Unserialize: See task #77348" << endl;
- /*
// Get_Packet_Hash
{
--- 237,242 ----
cout << "PASS: Input file slice checksum packet: Serialize and UnSerialize" << endl;
! }
// Get_Packet_Hash
{
***************
*** 256,262 ****
cout << "PASS: Input file slice checksum packet: Get_Packet_Hash" << endl;
! }*/
! cerr << "NOTE: Input file slice checksum packet: Get_Packet_Hash(): See task #77348" << endl;
!
return 0;
} // main
--- 253,258 ----
cout << "PASS: Input file slice checksum packet: Get_Packet_Hash" << endl;
! }
!
return 0;
} // main
Index: test_recovery_slice_packet.cc
===================================================================
RCS file: /cvsroot/parchive2/library/src/tests/packet/test_recovery_slice_packet.cc,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** test_recovery_slice_packet.cc 7 May 2003 02:25:14 -0000 1.20
--- test_recovery_slice_packet.cc 7 May 2003 02:54:33 -0000 1.21
***************
*** 37,41 ****
}
- /*
//copy constructor
{
--- 37,40 ----
***************
*** 51,55 ****
cout<<"PASS: Recovery copy constructor"<<endl;
! }*/
cout << "NOTE: Recovery copy constructor: See task #77348" << endl;
--- 50,54 ----
cout<<"PASS: Recovery copy constructor"<<endl;
! }
cout << "NOTE: Recovery copy constructor: See task #77348" << endl;
|
|
From: <co...@us...> - 2003-05-07 02:54:36
|
Update of /cvsroot/parchive2/library/src/packet
In directory sc8-pr-cvs1:/tmp/cvs-serv23700/src/packet
Modified Files:
recovery_slice_packet.cc
Log Message:
- Fixed bugs in recovery_slice_packet. Basically, we shouldn't trust
recovery_slice not to be NULL. I checked everywhere else and it looks okay.
- Uncommented test cases in test_input_file_slice_checksum_packet. The first
one passes on my system, and the second is supposed to fail until task 77151
is done.
- Uncommented test case in test_recovery_slice_packet since I fixed the bug.
Index: recovery_slice_packet.cc
===================================================================
RCS file: /cvsroot/parchive2/library/src/packet/recovery_slice_packet.cc,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** recovery_slice_packet.cc 5 May 2003 14:24:18 -0000 1.31
--- recovery_slice_packet.cc 7 May 2003 02:54:32 -0000 1.32
***************
*** 41,45 ****
Recovery_Slice_Packet:: ~Recovery_Slice_Packet()
{
! delete recovery_slice;
}
--- 41,46 ----
Recovery_Slice_Packet:: ~Recovery_Slice_Packet()
{
! if (recovery_slice)
! delete recovery_slice;
}
***************
*** 118,122 ****
const unsigned long long Recovery_Slice_Packet::Get_Packet_Length() const
{
! return Packet::Get_Packet_Length() + 4 + recovery_slice->Get_Size();
}
--- 119,126 ----
const unsigned long long Recovery_Slice_Packet::Get_Packet_Length() const
{
! if (recovery_slice == NULL)
! return Packet::Get_Packet_Length() + 4 + 0;
! else
! return Packet::Get_Packet_Length() + 4 + recovery_slice->Get_Size();
}
***************
*** 133,138 ****
const bool Recovery_Slice_Packet::operator==(const Recovery_Slice_Packet& other) const
{
return exponent == other.exponent &&
- *recovery_slice == *(other.recovery_slice) &&
*((Packet*)this) == *((Packet*)&other);
}
--- 137,149 ----
const bool Recovery_Slice_Packet::operator==(const Recovery_Slice_Packet& other) const
{
+ if (recovery_slice == NULL && other.recovery_slice != NULL ||
+ recovery_slice != NULL && other.recovery_slice == NULL)
+ return false;
+
+ if (recovery_slice != NULL && other.recovery_slice != NULL &&
+ *recovery_slice != *other.recovery_slice)
+ return false;
+
return exponent == other.exponent &&
*((Packet*)this) == *((Packet*)&other);
}
|
|
From: <co...@us...> - 2003-05-07 02:29:02
|
Update of /cvsroot/parchive2/library/src/tests/slice In directory sc8-pr-cvs1:/tmp/cvs-serv16438/src/tests/slice Modified Files: test_slice.cc Log Message: - Fixed a bug in slice where it wasn't setting empty to false after reading bytes in from the file. (Testing rocks!) - Fixed test cases to compare string values instead of pointers to string values. Index: test_slice.cc =================================================================== RCS file: /cvsroot/parchive2/library/src/tests/slice/test_slice.cc,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** test_slice.cc 7 May 2003 01:39:25 -0000 1.6 --- test_slice.cc 7 May 2003 02:28:59 -0000 1.7 *************** *** 58,67 **** Slice my_slice(size); //bytes are not set yet ! compare(my_slice.Get_Slice_Bytes(),""); //should be empty //now set them my_slice.Set_Slice_Bytes(slice_bytes_in); ! compare(my_slice.Get_Slice_Bytes(),slice_bytes_in); cout<<"PASS: Slice: Get_Slice_Bytes()"<<endl; --- 58,67 ---- Slice my_slice(size); //bytes are not set yet ! compare(strncmp(my_slice.Get_Slice_Bytes(),"",my_slice.Get_Size()),0); //now set them my_slice.Set_Slice_Bytes(slice_bytes_in); ! compare(strncmp(my_slice.Get_Slice_Bytes(),slice_bytes_in,my_slice.Get_Size()),0); cout<<"PASS: Slice: Get_Slice_Bytes()"<<endl; *************** *** 100,104 **** compare(my_slice.Get_Size() ,size); compare(my_slice.Empty() ,false); ! compare(my_slice.Get_Slice_Bytes(),str_passed_in); cout<<"PASS: Slice: read"<<endl; --- 100,104 ---- compare(my_slice.Get_Size() ,size); compare(my_slice.Empty() ,false); ! compare(strncmp(my_slice.Get_Slice_Bytes(),str_passed_in,my_slice.Get_Size()),0); cout<<"PASS: Slice: read"<<endl; |
|
From: <co...@us...> - 2003-05-07 02:29:02
|
Update of /cvsroot/parchive2/library/src/slice
In directory sc8-pr-cvs1:/tmp/cvs-serv16438/src/slice
Modified Files:
slice.cc
Log Message:
- Fixed a bug in slice where it wasn't setting empty to false after reading
bytes in from the file. (Testing rocks!)
- Fixed test cases to compare string values instead of pointers to string
values.
Index: slice.cc
===================================================================
RCS file: /cvsroot/parchive2/library/src/slice/slice.cc,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** slice.cc 7 May 2003 01:39:22 -0000 1.18
--- slice.cc 7 May 2003 02:28:59 -0000 1.19
***************
*** 72,75 ****
--- 72,76 ----
{
in.read(slice_bytes, size);
+ empty = false;
}
|
|
From: <el...@us...> - 2003-05-07 02:25:20
|
Update of /cvsroot/parchive2/library/src/tests/packet
In directory sc8-pr-cvs1:/tmp/cvs-serv15600/src/tests/packet
Modified Files:
test_input_file_slice_checksum_packet.cc
test_recovery_slice_packet.cc
Log Message:
Commented out erroneous test cases. Their bugs are related to task #77348
Index: test_input_file_slice_checksum_packet.cc
===================================================================
RCS file: /cvsroot/parchive2/library/src/tests/packet/test_input_file_slice_checksum_packet.cc,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** test_input_file_slice_checksum_packet.cc 6 May 2003 05:40:12 -0000 1.13
--- test_input_file_slice_checksum_packet.cc 7 May 2003 02:25:14 -0000 1.14
***************
*** 201,204 ****
--- 201,205 ----
}
+ /*
// Serialize and unserialize
{
***************
*** 237,242 ****
cout << "PASS: Input file slice checksum packet: Serialize and UnSerialize" << endl;
! }
// Get_Packet_Hash
{
--- 238,245 ----
cout << "PASS: Input file slice checksum packet: Serialize and UnSerialize" << endl;
! }*/
! cerr << "NOTE: Input file slice checksum packet: Serialize and Unserialize: See task #77348" << endl;
+ /*
// Get_Packet_Hash
{
***************
*** 253,257 ****
cout << "PASS: Input file slice checksum packet: Get_Packet_Hash" << endl;
! }
return 0;
--- 256,261 ----
cout << "PASS: Input file slice checksum packet: Get_Packet_Hash" << endl;
! }*/
! cerr << "NOTE: Input file slice checksum packet: Get_Packet_Hash(): See task #77348" << endl;
return 0;
Index: test_recovery_slice_packet.cc
===================================================================
RCS file: /cvsroot/parchive2/library/src/tests/packet/test_recovery_slice_packet.cc,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** test_recovery_slice_packet.cc 6 May 2003 05:44:57 -0000 1.19
--- test_recovery_slice_packet.cc 7 May 2003 02:25:14 -0000 1.20
***************
*** 37,40 ****
--- 37,41 ----
}
+ /*
//copy constructor
{
***************
*** 50,54 ****
cout<<"PASS: Recovery copy constructor"<<endl;
! }
//exponent set and get
--- 51,56 ----
cout<<"PASS: Recovery copy constructor"<<endl;
! }*/
! cout << "NOTE: Recovery copy constructor: See task #77348" << endl;
//exponent set and get
|
|
From: <co...@us...> - 2003-05-07 01:53:33
|
Update of /cvsroot/parchive2/library/src/tests/parchive2
In directory sc8-pr-cvs1:/tmp/cvs-serv6405/src/tests/parchive2
Modified Files:
test_parchive2.cc
Log Message:
- Tried to fix it so that it exits with 1 so that make will detect the
failure. Since Nass is working on this, I'm not going to finish it.
Index: test_parchive2.cc
===================================================================
RCS file: /cvsroot/parchive2/library/src/tests/parchive2/test_parchive2.cc,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** test_parchive2.cc 7 May 2003 01:39:24 -0000 1.15
--- test_parchive2.cc 7 May 2003 01:53:30 -0000 1.16
***************
*** 127,131 ****
--- 127,134 ----
dslice = p.Create_File_Slices(xpointer);
if (!sizeof(dslice))
+ {
cout << "Parchive2:Create_File_Slices: FAILED" << endl;
+ return 1;
+ }
else
cout << "Parchive2:Create_File_Slices: SUCCESS" << endl;
***************
*** 148,152 ****
--- 151,158 ----
pfile = p.Make_Parity_Files("/dummy");
if (!sizeof(pfile))
+ {
cout << "Parchive2:Make_Parity_Files: FAILED" << endl;
+ return 1;
+ }
else
cout << "Parchive2:Make_Parity_Files: SUCCESS" << endl;
***************
*** 162,166 ****
--- 168,175 ----
cout <<"Parchive2:Set_Slice_Size and Get_Slice_Size:SUCCESS"<<endl;
else
+ {
cout <<"Parchive2:Set_Slice_Size and Get_Slice_Size:FAILED"<<endl;
+ return 1;
+ }
***************
*** 213,217 ****
--- 222,229 ----
dpacket = p.Make_Packets_From_Files(Flist);
if (!sizeof(dpacket))
+ {
cout << "Parchive2:Make_Packets_From_Files: FAILED" << endl;
+ return 1;
+ }
else
cout << "Parchive2:Make_Packets_From_Files: SUCCESS" << endl;
***************
*** 253,257 ****
--- 265,274 ----
cout << "Parchive2:Create_Parchive_Files: SUCCESS" << endl;
else
+ {
cout << "Parchive2:Create_Parchive_Files: FAILED" << endl;
+ return 1;
+ }
+
+ return 0;
}
|
|
From: <ja...@us...> - 2003-05-07 01:52:47
|
Update of /cvsroot/parchive2/command_line_client/src/progs
In directory sc8-pr-cvs1:/tmp/cvs-serv6236/src/progs
Modified Files:
par2.cc
Log Message:
fixed warnings
Index: par2.cc
===================================================================
RCS file: /cvsroot/parchive2/command_line_client/src/progs/par2.cc,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** par2.cc 7 May 2003 01:50:23 -0000 1.29
--- par2.cc 7 May 2003 01:52:43 -0000 1.30
***************
*** 119,123 ****
//checks to see if enough files to recover in this directory, using
// function from Par2_Library
! bool can_recover;
//p2.Check_Data_Files(basename, directory, files_map,can_recover);
cout << "Checked " << basename << ".par2" << endl;
--- 119,123 ----
//checks to see if enough files to recover in this directory, using
// function from Par2_Library
! //bool can_recover;
//p2.Check_Data_Files(basename, directory, files_map,can_recover);
cout << "Checked " << basename << ".par2" << endl;
***************
*** 168,172 ****
//checks to see if enough files to recover in this directory, using
// function from Par2_Library
! bool can_recover;
//p2.Check_Data_Files(basename, directory, files_map,can_recover);
cout << "Checked " << basename << ".par" << endl;
--- 168,172 ----
//checks to see if enough files to recover in this directory, using
// function from Par2_Library
! //bool can_recover;
//p2.Check_Data_Files(basename, directory, files_map,can_recover);
cout << "Checked " << basename << ".par" << endl;
|
|
From: <ja...@us...> - 2003-05-07 01:50:27
|
Update of /cvsroot/parchive2/command_line_client/src/progs
In directory sc8-pr-cvs1:/tmp/cvs-serv5606/src/progs
Modified Files:
par2.cc
Log Message:
finished most functionality of the CLI
Index: par2.cc
===================================================================
RCS file: /cvsroot/parchive2/command_line_client/src/progs/par2.cc,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** par2.cc 5 May 2003 23:05:39 -0000 1.28
--- par2.cc 7 May 2003 01:50:23 -0000 1.29
***************
*** 11,15 ****
#include <list>
- #define YOURE_FEELING_LUCKY 0
char myTolower(char c)
--- 11,14 ----
***************
*** 48,52 ****
! string tempbuf = "Usage:\n par2 -c(--check) [options] <par archive>: Check parity archive\n par2 -r(--recover) [options] <par archive>: Restore missing volumes\n par2 -a(--add) [options] <par archive> [filenames] : Add files to parity archive\n\nOptions: \n -m (--move) : Move existing files out of the way\n -k (--keep) : Keep broken files\n -z (--nocreate) : Do not create parity volumes\n -i : Ignore case in filename comparisons\n -p (--redundancy) <float percentage> : Percent redundancy in parity files\n -v (--verbose): Give verbosity\n -V (--moreverbose) Give greater verbosity\n -h (--help) : Display this help\n --files <filenames> : Give between 1 and infinity files names\n \n";
parser.setUsage(tempbuf);
--- 47,51 ----
! string tempbuf = "Usage:\n par2 -c(--check) [options] <par archive>: Check parity archive\n par2 -r(--recover) [options] <par archive>: Restore missing volumes\n par2 -a(--add) [options] <par archive> [filenames] : Add files to parity archive\n\nOptions: \n -m (--move) : Move existing files out of the way\n -k (--keep) : Keep broken files\n -z (--nocreate) : Do not create parity volumes\n -i (--ignore) : Ignore case in filename comparisons\n -p (--redundancy) <float percentage> : Percent redundancy in parity files\n -v (--verbose): Give verbosity\n -V (--moreverbose) Give greater verbosity\n -h (--help) : Display this help\n --files <filenames> : Give between 1 and infinity files names\n \n";
parser.setUsage(tempbuf);
***************
*** 58,62 ****
//if no correct arguments, call help statement
- // parses the entire line --Recover should set -r flag
if(!parser.parseArgs(argc, argv)) {
parser.printUsage();
--- 57,60 ----
***************
*** 65,69 ****
string basename=parser.files_vector[0];
- cout << basename << endl;
string directory="";//should be present working directory
--- 63,66 ----
***************
*** 73,79 ****
//process information in stored by parseArgs
! //Implement like -i option (global)
! //Ex. cerr<<"Runnning Recover option."<<endl;
! //USE STDERR
if( parser.getFlgValue('v')){
--- 70,74 ----
//process information in stored by parseArgs
! //verbose mode
if( parser.getFlgValue('v')){
***************
*** 84,90 ****
}
! //Implement like -i option (global)
! //Want to print out more stuff in library
! //Ex. cerr<<"Running Reed-Solomon."<<endl;
if( parser.getFlgValue('V')){
--- 79,83 ----
}
! //More verbose mode
if( parser.getFlgValue('V')){
***************
*** 101,109 ****
}
! //Ex. User runs recover option, move files already in there out
! // of the way (DO NOT OVERWRITE THE FILES) can get filenames using
! // the get_path stuff in the file library
if( parser.getFlgValue('m')){
!
//place to store whether file is recoverable
--- 94,101 ----
}
! //move option -- not implemented yet
if( parser.getFlgValue('m')){
! cout << "under construction" << endl;
! return (1);
//place to store whether file is recoverable
***************
*** 127,134 ****
//checks to see if enough files to recover in this directory, using
// function from Par2_Library
- #if YOURE_FEELING_LUCKY
bool can_recover;
! p2.Check_Data_Files(basename, directory, files_map,can_recover);
! #endif
cout << "Checked " << basename << ".par2" << endl;
//CREATE A DIRECTORY TO MOVE THE FILES TO
--- 119,124 ----
//checks to see if enough files to recover in this directory, using
// function from Par2_Library
bool can_recover;
! //p2.Check_Data_Files(basename, directory, files_map,can_recover);
cout << "Checked " << basename << ".par2" << endl;
//CREATE A DIRECTORY TO MOVE THE FILES TO
***************
*** 141,148 ****
for ( file_and_status = files_map.begin(); file_and_status != files_map.end(); file_and_status++)
{
!
! if((*file_and_status).second == true)
! ;
! else {
//moves broken files into a directory called "movedfiles"
//might need to concatonate the filename too
--- 131,137 ----
for ( file_and_status = files_map.begin(); file_and_status != files_map.end(); file_and_status++)
{
! if((*file_and_status).second == true) {
!
! } else {
//moves broken files into a directory called "movedfiles"
//might need to concatonate the filename too
***************
*** 155,163 ****
}
! //Ex. Recovery, instead of missing the file may be corrupted (parchive
! // library may tell whether missing or corrupted)
! //File might be broken, implement LIKE THE MOVE FUNCTION
! //Same as move, just saves the broken files
if( parser.getFlgValue('k')){
//place to store whether file is recoverable
--- 144,151 ----
}
! //Keep option -not working yet
if( parser.getFlgValue('k')){
+ cout << "under construction" << endl;
+ return (1);
//place to store whether file is recoverable
***************
*** 180,187 ****
//checks to see if enough files to recover in this directory, using
// function from Par2_Library
- #if YOURE_FEELING_LUCKY
bool can_recover;
! p2.Check_Data_Files(basename, directory, files_map,can_recover);
! #endif
cout << "Checked " << basename << ".par" << endl;
//map of each file and status of recovery
--- 168,173 ----
//checks to see if enough files to recover in this directory, using
// function from Par2_Library
bool can_recover;
! //p2.Check_Data_Files(basename, directory, files_map,can_recover);
cout << "Checked " << basename << ".par" << endl;
//map of each file and status of recovery
***************
*** 225,231 ****
// function from Par2_Library ?files have to be in this directory?
bool can_recover;
! #if YOURE_FEELING_LUCKY
! p2.Check_Data_Files(basename, directory, files_map,can_recover);
! #endif
cout << "Checked " << basename << ".par" << endl;
cout << "Data files are recoverable." << endl;
--- 211,215 ----
// function from Par2_Library ?files have to be in this directory?
bool can_recover;
! //p2.Check_Data_Files(basename, directory, files_map,can_recover);
cout << "Checked " << basename << ".par" << endl;
cout << "Data files are recoverable." << endl;
***************
*** 253,258 ****
//Code for the recover option
if( parser.getFlgValue('r')){
- //present directory
- //Parchive2 r;
string directory="";
list<File> list_of_files;
--- 237,240 ----
***************
*** 269,273 ****
}
- //#if YOURE_FEELING_LUCKY
if(p2.Recover_Data_Files(list_of_files))
{
--- 251,254 ----
***************
*** 279,283 ****
could not find parity files.\n";
}
- //#endif
--- 260,263 ----
***************
*** 319,331 ****
}
! //Set value in library to set option for case (coppit already wrote the
! // files for the global variable Options.cc and Options.h)
! //set string to ignore case to true
! // set that where you want to check the filenames IN THE LIBRARY
! //Ex. Parchive2::options["ignorecaseinfiles"] = false;
! // like a STL map
! //IN LIBRARY: if (options["ignorecaseinfiles"] == true { do something}
if( parser.getFlgValue('i')){
!
list<File> realnames;
string destination_directory = ".";
--- 299,308 ----
}
! //ignore case -- not correct yet
if( parser.getFlgValue('i')){
! cout << "under construction" << endl;
! return (1);
!
!
list<File> realnames;
string destination_directory = ".";
|
|
From: <co...@us...> - 2003-05-07 01:39:57
|
Update of /cvsroot/parchive2/library/src/tests/packet
In directory sc8-pr-cvs1:/tmp/cvs-serv1971/src/tests/packet
Modified Files:
extend_packet.cc test_packet.cc
Log Message:
- Added == and != operator to File_Slice and Slice
- Fixed file module test case
- Got rid of dynamically allocated objects in testing where they aren't needed
- Changed all cerr's to cout's
- Changed "PASSED" to "PASS" in reed solomon test case
Index: extend_packet.cc
===================================================================
RCS file: /cvsroot/parchive2/library/src/tests/packet/extend_packet.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** extend_packet.cc 5 May 2003 14:24:21 -0000 1.3
--- extend_packet.cc 7 May 2003 01:39:22 -0000 1.4
***************
*** 34,39 ****
{
! Extend_packet* tp = new Extend_packet();
! compare(tp->get_recalc_hash(),true);
cout << "PASS: Packet: recalc_hash default constructor" << endl;
--- 34,39 ----
{
! Extend_packet tp;
! compare(tp.get_recalc_hash(),true);
cout << "PASS: Packet: recalc_hash default constructor" << endl;
***************
*** 42,51 ****
{
md5 test_md5;
! Extend_packet* tp2 = new Extend_packet(test_md5);
! compare(tp2->get_recalc_hash(),true);
cout << "PASS: Packet: recalc_hash md5 constructor" << endl;
! compare(tp2->get_recovery_set_id(),test_md5);
cout << "PASS: Packet: get_recover_set_id" << endl;
--- 42,51 ----
{
md5 test_md5;
! Extend_packet tp2(test_md5);
! compare(tp2.get_recalc_hash(),true);
cout << "PASS: Packet: recalc_hash md5 constructor" << endl;
! compare(tp2.get_recovery_set_id(),test_md5);
cout << "PASS: Packet: get_recover_set_id" << endl;
Index: test_packet.cc
===================================================================
RCS file: /cvsroot/parchive2/library/src/tests/packet/test_packet.cc,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** test_packet.cc 7 May 2003 00:54:00 -0000 1.23
--- test_packet.cc 7 May 2003 01:39:23 -0000 1.24
***************
*** 49,57 ****
{
! Tester_packet* pkt = new Tester_packet();
! compare(pkt->get_recalc_hash(),true);
! cerr<<"PASS: Packet: Tester Packet"<<endl;
}
//overloaded
--- 49,57 ----
{
! Tester_packet pkt;
! compare(pkt.get_recalc_hash(),true);
! cout <<"PASS: Packet: Tester Packet"<<endl;
}
//overloaded
***************
*** 61,71 ****
my_md5.Set_MD5_Hex("99108ab5a6007164a910626bbcc5888f");
! Tester_packet* pkt = new Tester_packet(my_md5);
! compare(pkt->get_recalc_hash(),true);
! compare(pkt->Get_Recovery_Set_ID(),my_md5);
! cerr<<"PASS: Packet: overloaded constructor"<<endl;
}
//get and set recovery set
--- 61,71 ----
my_md5.Set_MD5_Hex("99108ab5a6007164a910626bbcc5888f");
! Tester_packet pkt(my_md5);
! compare(pkt.get_recalc_hash(),true);
! compare(pkt.Get_Recovery_Set_ID(),my_md5);
! cout <<"PASS: Packet: overloaded constructor"<<endl;
}
//get and set recovery set
***************
*** 75,86 ****
my_md5.Set_MD5_Hex("99108ab5a6007164a910626bbcc5888f");
! Tester_packet* pkt = new Tester_packet();
! pkt->Set_Recovery_Set_ID(my_md5);
! compare(pkt->get_recalc_hash(),true); //Set_Recovery changes recalc hash double check
! compare(pkt->Get_Recovery_Set_ID(),my_md5);
! cerr<<"PASS: Packet: set and get recovery set id"<<endl;
}
--- 75,86 ----
my_md5.Set_MD5_Hex("99108ab5a6007164a910626bbcc5888f");
! Tester_packet pkt;
! pkt.Set_Recovery_Set_ID(my_md5);
! compare(pkt.get_recalc_hash(),true); //Set_Recovery changes recalc hash double check
! compare(pkt.Get_Recovery_Set_ID(),my_md5);
! cout <<"PASS: Packet: set and get recovery set id"<<endl;
}
***************
*** 98,102 ****
compare(pkt.Get_Magic_Sequence(),expected_back);
! cerr<<"PASS: Packet: Valid and Get Magic Sequence"<<endl;
}
{
--- 98,102 ----
compare(pkt.Get_Magic_Sequence(),expected_back);
! cout <<"PASS: Packet: Valid and Get Magic Sequence"<<endl;
}
{
|
|
From: <co...@us...> - 2003-05-07 01:39:56
|
Update of /cvsroot/parchive2/library/src/slice
In directory sc8-pr-cvs1:/tmp/cvs-serv1971/src/slice
Modified Files:
file_slice.cc file_slice.h slice.cc slice.h
Log Message:
- Added == and != operator to File_Slice and Slice
- Fixed file module test case
- Got rid of dynamically allocated objects in testing where they aren't needed
- Changed all cerr's to cout's
- Changed "PASSED" to "PASS" in reed solomon test case
Index: file_slice.cc
===================================================================
RCS file: /cvsroot/parchive2/library/src/slice/file_slice.cc,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** file_slice.cc 7 May 2003 01:12:28 -0000 1.23
--- file_slice.cc 7 May 2003 01:39:22 -0000 1.24
***************
*** 128,131 ****
--- 128,143 ----
}
+ const bool File_Slice::operator==(const File_Slice& other) const
+ {
+ return (autoflush == other.autoflush) && (gotbytes == other.gotbytes) &&
+ (dirty == other.dirty) && (file == other.file) &&
+ (offset == other.offset) && (*((Slice*)this) == *((Slice*)(&other)));
+ }
+
+ const bool File_Slice::operator!=(const File_Slice& other) const
+ {
+ return !(*this == other);
+ }
+
ostream& operator<< (ostream& in_ostream, const File_Slice& in_fs)
{
Index: file_slice.h
===================================================================
RCS file: /cvsroot/parchive2/library/src/slice/file_slice.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** file_slice.h 7 May 2003 01:12:28 -0000 1.7
--- file_slice.h 7 May 2003 01:39:22 -0000 1.8
***************
*** 27,30 ****
--- 27,33 ----
bool isDirty() const;
+ const bool operator==(const File_Slice& other) const;
+ const bool operator!=(const File_Slice& other) const;
+
friend ostream& operator<< (ostream& in_ostream, const File_Slice& in_fs);
Index: slice.cc
===================================================================
RCS file: /cvsroot/parchive2/library/src/slice/slice.cc,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** slice.cc 7 May 2003 01:12:28 -0000 1.17
--- slice.cc 7 May 2003 01:39:22 -0000 1.18
***************
*** 14,20 ****
{
size = in_slice.size;
- empty = in_slice.empty;
slice_bytes = new char[size]; // should initialize to 0 automagically
Set_Slice_Bytes(in_slice.Get_Slice_Bytes());
}//Slice()
--- 14,20 ----
{
size = in_slice.size;
slice_bytes = new char[size]; // should initialize to 0 automagically
Set_Slice_Bytes(in_slice.Get_Slice_Bytes());
+ empty = in_slice.empty;
}//Slice()
***************
*** 37,40 ****
--- 37,41 ----
{
if (size != other.size) return false;
+ if (empty != other.empty) return false;
unsigned int i = 0;
for (; i < size; i++) {
***************
*** 44,47 ****
--- 45,53 ----
return true;
+ }
+
+ const bool Slice::operator!=(const Slice& other) const
+ {
+ return !(*this == other);
}
Index: slice.h
===================================================================
RCS file: /cvsroot/parchive2/library/src/slice/slice.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** slice.h 7 May 2003 01:12:28 -0000 1.17
--- slice.h 7 May 2003 01:39:22 -0000 1.18
***************
*** 19,22 ****
--- 19,23 ----
const bool operator==(const Slice&) const;
+ const bool operator!=(const Slice&) const;
void read(istream &in);
|
|
From: <co...@us...> - 2003-05-07 01:39:55
|
Update of /cvsroot/parchive2/library/src/tests/file
In directory sc8-pr-cvs1:/tmp/cvs-serv1971/src/tests/file
Modified Files:
test_file_module.cc
Log Message:
- Added == and != operator to File_Slice and Slice
- Fixed file module test case
- Got rid of dynamically allocated objects in testing where they aren't needed
- Changed all cerr's to cout's
- Changed "PASSED" to "PASS" in reed solomon test case
Index: test_file_module.cc
===================================================================
RCS file: /cvsroot/parchive2/library/src/tests/file/test_file_module.cc,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** test_file_module.cc 7 May 2003 01:22:19 -0000 1.15
--- test_file_module.cc 7 May 2003 01:39:22 -0000 1.16
***************
*** 94,97 ****
--- 94,101 ----
compare(test_file.Get_Fullpath(),"./test23.txt");
+ File test_file2("test_output");
+
+ compare(test_file2.Get_Fullpath(),"./test_output");
+
cout << "PASS: File::Get_Fullpath" << endl;
}
|
