ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.169 by root, Sun Jan 14 01:09:46 2007 UTC vs.
Revision 1.173 by root, Sun Jan 14 18:00:34 2007 UTC

… …
503our @CB_TYPE = (); # registry for type (cf-object class) based events 503our @CB_TYPE = (); # registry for type (cf-object class) based events
504our @CB_MAP = (); 504our @CB_MAP = ();
505 505
506my %attachment; 506my %attachment;
507 507
508sub cf::attachable::thawer_merge {
509 # simply override everything except _meta
510 local $_[0]{_meta};
511 %{$_[0]} = %{$_[1]};
512}
513
508sub _attach_cb($$$$) { 514sub _attach_cb($$$$) {
509 my ($registry, $event, $prio, $cb) = @_; 515 my ($registry, $event, $prio, $cb) = @_;
510 516
511 use sort 'stable'; 517 use sort 'stable';
512 518
… …
1107 1113
1108use Fcntl; 1114use Fcntl;
1109use Coro::AIO; 1115use Coro::AIO;
1110 1116
1111use overload 1117use overload
1112 '""' => \&as_string; 1118 '""' => \&as_string,
1119 fallback => 1;
1113 1120
1114our $MAX_RESET = 3600; 1121our $MAX_RESET = 3600;
1115our $DEFAULT_RESET = 3000; 1122our $DEFAULT_RESET = 3000;
1116 1123
1117sub generate_random_map { 1124sub generate_random_map {
… …
1144} 1151}
1145 1152
1146# also paths starting with '/' 1153# also paths starting with '/'
1147$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1154$EXT_MAP{"cf::map"} = qr{^(?=/)};
1148 1155
1156sub thawer_merge {
1157 my ($self, $merge) = @_;
1158
1159 # we have to keep some variables in memory intact
1160 local $self->{path};
1161 local $self->{load_path};
1162 local $self->{deny_save};
1163 local $self->{deny_reset};
1164
1165 $self->SUPER::thawer_merge ($merge);
1166}
1167
1149sub normalise { 1168sub normalise {
1150 my ($path, $base) = @_; 1169 my ($path, $base) = @_;
1151 1170
1152 # map plan: 1171 # map plan:
1153 # 1172 #
… …
1249 1268
1250sub unlink_save { 1269sub unlink_save {
1251 my ($self) = @_; 1270 my ($self) = @_;
1252 1271
1253 utf8::encode (my $save = $self->save_path); 1272 utf8::encode (my $save = $self->save_path);
1254 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save; 1273 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1255 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst"; 1274 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1256} 1275}
1257 1276
1258sub load_header_from($) { 1277sub load_header_from($) {
1259 my ($self, $path) = @_; 1278 my ($self, $path) = @_;
1260 1279
… …
1321 1340
1322 $map->load_header 1341 $map->load_header
1323 or return; 1342 or return;
1324 1343
1325 if ($map->should_reset) { 1344 if ($map->should_reset) {
1345 $cf::WAIT_FOR_TICK->wait;
1326 $map->reset; 1346 $map->reset;
1327 undef $guard; 1347 undef $guard;
1328 $map = find $path 1348 $map = find $path
1329 or return; 1349 or return;
1330 } 1350 }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines