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.166 by root, Sat Jan 13 23:06:13 2007 UTC vs.
Revision 1.172 by root, Sun Jan 14 13:32:48 2007 UTC

… …
44our @EVENT; 44our @EVENT;
45our $LIBDIR = datadir . "/ext"; 45our $LIBDIR = datadir . "/ext";
46 46
47our $TICK = MAX_TIME * 1e-6; 47our $TICK = MAX_TIME * 1e-6;
48our $TICK_WATCHER; 48our $TICK_WATCHER;
49our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER;
49our $NEXT_TICK; 51our $NEXT_TICK;
50our $NOW; 52our $NOW;
51 53
52our %CFG; 54our %CFG;
53 55
… …
257} 259}
258 260
259sub freeze_mainloop { 261sub freeze_mainloop {
260 return unless $TICK_WATCHER->is_active; 262 return unless $TICK_WATCHER->is_active;
261 263
262 my $guard = Coro::guard { $TICK_WATCHER->start }; 264 my $guard = Coro::guard {
265 $TICK_WATCHER->start;
266 $WRITE_RUNTIME_WATCHER->start;
267 };
268 $WRITE_RUNTIME_WATCHER->stop;
263 $TICK_WATCHER->stop; 269 $TICK_WATCHER->stop;
264 $guard 270 $guard
265} 271}
266 272
267=item cf::async { BLOCK } 273=item cf::async { BLOCK }
… …
338 344
339 $coro 345 $coro
340} 346}
341 347
342sub write_runtime { 348sub write_runtime {
343 return unless $TICK_WATCHER->is_active;
344
345 my $runtime = cf::localdir . "/runtime"; 349 my $runtime = cf::localdir . "/runtime";
346 350
347 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
348 or return; 352 or return;
349 353
… …
499our @CB_TYPE = (); # registry for type (cf-object class) based events 503our @CB_TYPE = (); # registry for type (cf-object class) based events
500our @CB_MAP = (); 504our @CB_MAP = ();
501 505
502my %attachment; 506my %attachment;
503 507
508sub cf::attachable::thawer_merge {
509 # simply override everything except _meta
510 local $_[0]{_meta};
511 %{$_[0]} = %{$_[1]};
512}
513
504sub _attach_cb($$$$) { 514sub _attach_cb($$$$) {
505 my ($registry, $event, $prio, $cb) = @_; 515 my ($registry, $event, $prio, $cb) = @_;
506 516
507 use sort 'stable'; 517 use sort 'stable';
508 518
… …
679# object support 689# object support
680 690
681sub reattach { 691sub reattach {
682 # basically do the same as instantiate, without calling instantiate 692 # basically do the same as instantiate, without calling instantiate
683 my ($obj) = @_; 693 my ($obj) = @_;
694
695 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
684 696
685 my $registry = $obj->registry; 697 my $registry = $obj->registry;
686 698
687 @$registry = (); 699 @$registry = ();
688 700
… …
900 } or warn "$ext not loaded: $@"; 912 } or warn "$ext not loaded: $@";
901 } 913 }
902} 914}
903 915
904############################################################################# 916#############################################################################
905# load/save/clean perl data associated with a map
906
907*cf::mapsupport::on_clean = sub {
908 my ($map) = @_;
909
910 my $path = $map->tmpname;
911 defined $path or return;
912
913 unlink "$path.pst";
914};
915
916cf::map->attach (prio => -10000, package => cf::mapsupport::);
917
918#############################################################################
919 917
920=head2 CORE EXTENSIONS 918=head2 CORE EXTENSIONS
921 919
922Functions and methods that extend core crossfire objects. 920Functions and methods that extend core crossfire objects.
923 921
… …
1077 for (@$files) { 1075 for (@$files) {
1078 utf8::decode $_; 1076 utf8::decode $_;
1079 next if /\.(?:pl|pst)$/; 1077 next if /\.(?:pl|pst)$/;
1080 next unless /^$PATH_SEP/o; 1078 next unless /^$PATH_SEP/o;
1081 1079
1080 s/\.map$//;
1082 push @paths, "~" . $pl->ob->name . "/" . $_; 1081 push @paths, "~" . $pl->ob->name . "/" . $_;
1083 } 1082 }
1084 1083
1085 \@paths 1084 \@paths
1086} 1085}
… …
1151} 1150}
1152 1151
1153# also paths starting with '/' 1152# also paths starting with '/'
1154$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1153$EXT_MAP{"cf::map"} = qr{^(?=/)};
1155 1154
1155sub thawer_merge {
1156 my ($self, $merge) = @_;
1157
1158 # we have to keep some variables in memory intact
1159 local $self->{path};
1160 local $self->{load_path};
1161 local $self->{deny_save};
1162 local $self->{deny_reset};
1163
1164 $self->SUPER::thawer_merge ($merge);
1165}
1166
1156sub normalise { 1167sub normalise {
1157 my ($path, $base) = @_; 1168 my ($path, $base) = @_;
1158 1169
1159 # map plan: 1170 # map plan:
1160 # 1171 #
… …
1220# the displayed name, this is a one way mapping 1231# the displayed name, this is a one way mapping
1221sub visible_name { 1232sub visible_name {
1222 &as_string 1233 &as_string
1223} 1234}
1224 1235
1225# escape the /'s in the path
1226sub _escaped_path {
1227 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1228
1229 $path
1230}
1231
1232# the original (read-only) location 1236# the original (read-only) location
1233sub load_path { 1237sub load_path {
1234 my ($self) = @_; 1238 my ($self) = @_;
1235 1239
1236 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1240 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
… …
1238 1242
1239# the temporary/swap location 1243# the temporary/swap location
1240sub save_path { 1244sub save_path {
1241 my ($self) = @_; 1245 my ($self) = @_;
1242 1246
1247 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1243 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $self->_escaped_path 1248 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path
1244} 1249}
1245 1250
1246# the unique path, undef == no special unique path 1251# the unique path, undef == no special unique path
1247sub uniq_path { 1252sub uniq_path {
1248 my ($self) = @_; 1253 my ($self) = @_;
1249 1254
1255 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1250 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path 1256 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1251} 1257}
1252 1258
1253# and all this just because we cannot iterate over 1259# and all this just because we cannot iterate over
1254# all maps in C++... 1260# all maps in C++...
1255sub change_all_map_light { 1261sub change_all_map_light {
… …
1261 1267
1262sub unlink_save { 1268sub unlink_save {
1263 my ($self) = @_; 1269 my ($self) = @_;
1264 1270
1265 utf8::encode (my $save = $self->save_path); 1271 utf8::encode (my $save = $self->save_path);
1266 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save; 1272 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1267 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst"; 1273 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1268} 1274}
1269 1275
1270sub load_header_from($) { 1276sub load_header_from($) {
1271 my ($self, $path) = @_; 1277 my ($self, $path) = @_;
1272 1278
… …
1333 1339
1334 $map->load_header 1340 $map->load_header
1335 or return; 1341 or return;
1336 1342
1337 if ($map->should_reset) { 1343 if ($map->should_reset) {
1344 $cf::WAIT_FOR_TICK->wait;
1338 $map->reset; 1345 $map->reset;
1339 undef $guard; 1346 undef $guard;
1340 $map = find $path 1347 $map = find $path
1341 or return; 1348 or return;
1342 } 1349 }
… …
1512 1519
1513sub reset_at { 1520sub reset_at {
1514 my ($self) = @_; 1521 my ($self) = @_;
1515 1522
1516 # TODO: safety, remove and allow resettable per-player maps 1523 # TODO: safety, remove and allow resettable per-player maps
1517 return 1e99 if $self->isa ("ext::map_per_player"); 1524 return 1e99 if $self->isa ("ext::map_per_player");#d#
1518 return 1e99 if $self->{deny_reset}; 1525 return 1e99 if $self->{deny_reset};
1519 1526
1520 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1527 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1521 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1528 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1522 1529
… …
1544} 1551}
1545 1552
1546sub reset { 1553sub reset {
1547 my ($self) = @_; 1554 my ($self) = @_;
1548 1555
1549 my $lock = cf::lock_acquire "map_data:" . $self->path; 1556 my $lock = cf::lock_acquire "map_data:$self->{path}";
1550 1557
1551 return if $self->players; 1558 return if $self->players;
1552 return if $self->isa ("ext::map_per_player");#d# 1559 return if $self->isa ("ext::map_per_player");#d#
1553 1560
1554 warn "resetting map ", $self->path;#d# 1561 warn "resetting map ", $self->path;#d#
1555 1562
1556 delete $cf::MAP{$self->path}; 1563 delete $cf::MAP{$self->path};
1564
1565 $self->in_memory (cf::MAP_SWAPPED);
1566 $self->clear;
1557 1567
1558 $_->clear_links_to ($self) for values %cf::MAP; 1568 $_->clear_links_to ($self) for values %cf::MAP;
1559 1569
1560 $self->unlink_save; 1570 $self->unlink_save;
1561 $self->destroy; 1571 $self->destroy;
… …
1588 for (@$files) { 1598 for (@$files) {
1589 utf8::decode $_; 1599 utf8::decode $_;
1590 next if /\.pst$/; 1600 next if /\.pst$/;
1591 next unless /^$PATH_SEP/o; 1601 next unless /^$PATH_SEP/o;
1592 1602
1603 s/\.map$//;
1593 push @paths, $_; 1604 push @paths, $_;
1594 } 1605 }
1595 1606
1596 \@paths 1607 \@paths
1597} 1608}
… …
2254 warn "enter emergency perl save\n"; 2265 warn "enter emergency perl save\n";
2255 2266
2256 cf::sync_job { 2267 cf::sync_job {
2257 # use a peculiar iteration method to avoid tripping on perl 2268 # use a peculiar iteration method to avoid tripping on perl
2258 # refcount bugs in for. also avoids problems with players 2269 # refcount bugs in for. also avoids problems with players
2259 # and maps saved/Destroyed asynchronously. 2270 # and maps saved/destroyed asynchronously.
2260 warn "begin emergency player save\n"; 2271 warn "begin emergency player save\n";
2261 for my $login (keys %cf::PLAYER) { 2272 for my $login (keys %cf::PLAYER) {
2262 my $pl = $cf::PLAYER{$login} or next; 2273 my $pl = $cf::PLAYER{$login} or next;
2263 $pl->valid or next; 2274 $pl->valid or next;
2264 $pl->save; 2275 $pl->save;
… …
2416 }, 2427 },
2417); 2428);
2418 2429
2419IO::AIO::max_poll_time $TICK * 0.2; 2430IO::AIO::max_poll_time $TICK * 0.2;
2420 2431
2421Event->io ( 2432$AIO_POLL_WATCHER = Event->io (
2422 fd => IO::AIO::poll_fileno, 2433 fd => IO::AIO::poll_fileno,
2423 poll => 'r', 2434 poll => 'r',
2424 prio => 5, 2435 prio => 5,
2425 data => WF_AUTOCANCEL, 2436 data => WF_AUTOCANCEL,
2426 cb => \&IO::AIO::poll_cb, 2437 cb => \&IO::AIO::poll_cb,
2427); 2438);
2428 2439
2429Event->timer ( 2440$WRITE_RUNTIME_WATCHER = Event->timer (
2430 data => WF_AUTOCANCEL, 2441 data => WF_AUTOCANCEL,
2431 after => 0, 2442 after => 0,
2432 interval => 10, 2443 interval => 10,
2433 cb => sub { 2444 cb => sub {
2434 (Coro::unblock_sub { 2445 (Coro::unblock_sub {

Diff Legend

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