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.169 by root, Sun Jan 14 01:09:46 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
… …
679# object support 683# object support
680 684
681sub reattach { 685sub reattach {
682 # basically do the same as instantiate, without calling instantiate 686 # basically do the same as instantiate, without calling instantiate
683 my ($obj) = @_; 687 my ($obj) = @_;
688
689 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
684 690
685 my $registry = $obj->registry; 691 my $registry = $obj->registry;
686 692
687 @$registry = (); 693 @$registry = ();
688 694
… …
900 } or warn "$ext not loaded: $@"; 906 } or warn "$ext not loaded: $@";
901 } 907 }
902} 908}
903 909
904############################################################################# 910#############################################################################
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 911
920=head2 CORE EXTENSIONS 912=head2 CORE EXTENSIONS
921 913
922Functions and methods that extend core crossfire objects. 914Functions and methods that extend core crossfire objects.
923 915
… …
1077 for (@$files) { 1069 for (@$files) {
1078 utf8::decode $_; 1070 utf8::decode $_;
1079 next if /\.(?:pl|pst)$/; 1071 next if /\.(?:pl|pst)$/;
1080 next unless /^$PATH_SEP/o; 1072 next unless /^$PATH_SEP/o;
1081 1073
1074 s/\.map$//;
1082 push @paths, "~" . $pl->ob->name . "/" . $_; 1075 push @paths, "~" . $pl->ob->name . "/" . $_;
1083 } 1076 }
1084 1077
1085 \@paths 1078 \@paths
1086} 1079}
… …
1220# the displayed name, this is a one way mapping 1213# the displayed name, this is a one way mapping
1221sub visible_name { 1214sub visible_name {
1222 &as_string 1215 &as_string
1223} 1216}
1224 1217
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 1218# the original (read-only) location
1233sub load_path { 1219sub load_path {
1234 my ($self) = @_; 1220 my ($self) = @_;
1235 1221
1236 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1222 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
… …
1238 1224
1239# the temporary/swap location 1225# the temporary/swap location
1240sub save_path { 1226sub save_path {
1241 my ($self) = @_; 1227 my ($self) = @_;
1242 1228
1229 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1243 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $self->_escaped_path 1230 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path
1244} 1231}
1245 1232
1246# the unique path, undef == no special unique path 1233# the unique path, undef == no special unique path
1247sub uniq_path { 1234sub uniq_path {
1248 my ($self) = @_; 1235 my ($self) = @_;
1249 1236
1237 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1250 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path 1238 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1251} 1239}
1252 1240
1253# and all this just because we cannot iterate over 1241# and all this just because we cannot iterate over
1254# all maps in C++... 1242# all maps in C++...
1255sub change_all_map_light { 1243sub change_all_map_light {
… …
1512 1500
1513sub reset_at { 1501sub reset_at {
1514 my ($self) = @_; 1502 my ($self) = @_;
1515 1503
1516 # TODO: safety, remove and allow resettable per-player maps 1504 # TODO: safety, remove and allow resettable per-player maps
1517 return 1e99 if $self->isa ("ext::map_per_player"); 1505 return 1e99 if $self->isa ("ext::map_per_player");#d#
1518 return 1e99 if $self->{deny_reset}; 1506 return 1e99 if $self->{deny_reset};
1519 1507
1520 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1508 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1521 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1509 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1522 1510
… …
1544} 1532}
1545 1533
1546sub reset { 1534sub reset {
1547 my ($self) = @_; 1535 my ($self) = @_;
1548 1536
1549 my $lock = cf::lock_acquire "map_data:" . $self->path; 1537 my $lock = cf::lock_acquire "map_data:$self->{path}";
1550 1538
1551 return if $self->players; 1539 return if $self->players;
1552 return if $self->isa ("ext::map_per_player");#d# 1540 return if $self->isa ("ext::map_per_player");#d#
1553 1541
1554 warn "resetting map ", $self->path;#d# 1542 warn "resetting map ", $self->path;#d#
1555 1543
1556 delete $cf::MAP{$self->path}; 1544 delete $cf::MAP{$self->path};
1545
1546 $self->in_memory (cf::MAP_SWAPPED);
1547 $self->clear;
1557 1548
1558 $_->clear_links_to ($self) for values %cf::MAP; 1549 $_->clear_links_to ($self) for values %cf::MAP;
1559 1550
1560 $self->unlink_save; 1551 $self->unlink_save;
1561 $self->destroy; 1552 $self->destroy;
… …
1588 for (@$files) { 1579 for (@$files) {
1589 utf8::decode $_; 1580 utf8::decode $_;
1590 next if /\.pst$/; 1581 next if /\.pst$/;
1591 next unless /^$PATH_SEP/o; 1582 next unless /^$PATH_SEP/o;
1592 1583
1584 s/\.map$//;
1593 push @paths, $_; 1585 push @paths, $_;
1594 } 1586 }
1595 1587
1596 \@paths 1588 \@paths
1597} 1589}
… …
2254 warn "enter emergency perl save\n"; 2246 warn "enter emergency perl save\n";
2255 2247
2256 cf::sync_job { 2248 cf::sync_job {
2257 # use a peculiar iteration method to avoid tripping on perl 2249 # use a peculiar iteration method to avoid tripping on perl
2258 # refcount bugs in for. also avoids problems with players 2250 # refcount bugs in for. also avoids problems with players
2259 # and maps saved/Destroyed asynchronously. 2251 # and maps saved/destroyed asynchronously.
2260 warn "begin emergency player save\n"; 2252 warn "begin emergency player save\n";
2261 for my $login (keys %cf::PLAYER) { 2253 for my $login (keys %cf::PLAYER) {
2262 my $pl = $cf::PLAYER{$login} or next; 2254 my $pl = $cf::PLAYER{$login} or next;
2263 $pl->valid or next; 2255 $pl->valid or next;
2264 $pl->save; 2256 $pl->save;
… …
2416 }, 2408 },
2417); 2409);
2418 2410
2419IO::AIO::max_poll_time $TICK * 0.2; 2411IO::AIO::max_poll_time $TICK * 0.2;
2420 2412
2421Event->io ( 2413$AIO_POLL_WATCHER = Event->io (
2422 fd => IO::AIO::poll_fileno, 2414 fd => IO::AIO::poll_fileno,
2423 poll => 'r', 2415 poll => 'r',
2424 prio => 5, 2416 prio => 5,
2425 data => WF_AUTOCANCEL, 2417 data => WF_AUTOCANCEL,
2426 cb => \&IO::AIO::poll_cb, 2418 cb => \&IO::AIO::poll_cb,
2427); 2419);
2428 2420
2429Event->timer ( 2421$WRITE_RUNTIME_WATCHER = Event->timer (
2430 data => WF_AUTOCANCEL, 2422 data => WF_AUTOCANCEL,
2431 after => 0, 2423 after => 0,
2432 interval => 10, 2424 interval => 10,
2433 cb => sub { 2425 cb => sub {
2434 (Coro::unblock_sub { 2426 (Coro::unblock_sub {

Diff Legend

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