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.270 by root, Sat May 26 15:44:06 2007 UTC vs.
Revision 1.275 by root, Thu Jun 7 19:12:22 2007 UTC

… …
187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
191@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 191@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
192@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
192@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 193@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
193 194
194# we bless all objects into (empty) derived classes to force a method lookup 195# we bless all objects into (empty) derived classes to force a method lookup
195# within the Safe compartment. 196# within the Safe compartment.
196for my $pkg (qw( 197for my $pkg (qw(
197 cf::global cf::attachable 198 cf::global cf::attachable
… …
395 my $runtime = "$LOCALDIR/runtime"; 396 my $runtime = "$LOCALDIR/runtime";
396 397
397 # first touch the runtime file to show we are still running: 398 # first touch the runtime file to show we are still running:
398 # the fsync below can take a very very long time. 399 # the fsync below can take a very very long time.
399 400
400 if (my $fh = aio_open $runtime, O_WRONLY, 0) { 401 IO::AIO::aio_utime $runtime, undef, undef;
401 utime undef, undef, $fh;
402 }
403 402
404 my $guard = cf::lock_acquire "write_runtime"; 403 my $guard = cf::lock_acquire "write_runtime";
405 404
406 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 405 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
407 or return; 406 or return;
… …
416 # always fsync - this file is important 415 # always fsync - this file is important
417 aio_fsync $fh 416 aio_fsync $fh
418 and return; 417 and return;
419 418
420 # touch it again to show we are up-to-date 419 # touch it again to show we are up-to-date
421 utime undef, undef, $fh; 420 aio_utime $fh, undef, undef;
422 421
423 close $fh 422 close $fh
424 or return; 423 or return;
425 424
426 aio_rename "$runtime~", $runtime 425 aio_rename "$runtime~", $runtime
427 and return; 426 and return;
428 427
429 warn "runtime file written.\n";#d# 428 warn "runtime file written.\n";
430 429
431 1 430 1
432} 431}
433 432
434=item cf::datalog type => key => value, ... 433=item cf::datalog type => key => value, ...
… …
874 or return; 873 or return;
875 $av = eval { (Storable::thaw $av)->{objs} }; 874 $av = eval { (Storable::thaw $av)->{objs} };
876 } 875 }
877 876
878 warn sprintf "loading %s (%d)\n", 877 warn sprintf "loading %s (%d)\n",
879 $filename, length $data, scalar @{$av || []};#d# 878 $filename, length $data, scalar @{$av || []};
880 return ($data, $av); 879 return ($data, $av);
881} 880}
882 881
883############################################################################# 882#############################################################################
884# command handling &c 883# command handling &c
… …
1306 my ($self, $merge) = @_; 1305 my ($self, $merge) = @_;
1307 1306
1308 # we have to keep some variables in memory intact 1307 # we have to keep some variables in memory intact
1309 local $self->{path}; 1308 local $self->{path};
1310 local $self->{load_path}; 1309 local $self->{load_path};
1311 local $self->{deny_save};
1312 local $self->{deny_reset};
1313 1310
1314 $self->SUPER::thawer_merge ($merge); 1311 $self->SUPER::thawer_merge ($merge);
1315} 1312}
1316 1313
1317sub normalise { 1314sub normalise {
… …
1417 1414
1418 $_->change_map_light ($change) 1415 $_->change_map_light ($change)
1419 for grep $_->outdoor, values %cf::MAP; 1416 for grep $_->outdoor, values %cf::MAP;
1420} 1417}
1421 1418
1419sub decay_objects {
1420 my ($self) = @_;
1421
1422 return if $self->{deny_reset};
1423
1424 $self->do_decay_objects;
1425}
1426
1422sub unlink_save { 1427sub unlink_save {
1423 my ($self) = @_; 1428 my ($self) = @_;
1424 1429
1425 utf8::encode (my $save = $self->save_path); 1430 utf8::encode (my $save = $self->save_path);
1426 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1431 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
… …
1482 $self->load_header_orig 1487 $self->load_header_orig
1483 or return; 1488 or return;
1484 $self->prepare_orig; 1489 $self->prepare_orig;
1485 } 1490 }
1486 1491
1492 $self->{deny_reset} = 1
1493 if $self->no_reset;
1494
1487 $self->default_region (cf::region::find_by_path $self->{path}) 1495 $self->default_region (cf::region::find_by_path $self->{path})
1488 unless $self->default_region; 1496 unless $self->default_region;
1489 1497
1490 1 1498 1
1491} 1499}
… …
1506 $map->{last_save} = $cf::RUNTIME; 1514 $map->{last_save} = $cf::RUNTIME;
1507 1515
1508 $map->load_header 1516 $map->load_header
1509 or return; 1517 or return;
1510 1518
1511 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1519 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1512 # doing this can freeze the server in a sync job, obviously 1520 # doing this can freeze the server in a sync job, obviously
1513 #$cf::WAIT_FOR_TICK->wait; 1521 #$cf::WAIT_FOR_TICK->wait;
1514 $map->reset; 1522 $map->reset;
1515 undef $guard; 1523 undef $guard;
1516 return find $path; 1524 return find $path;
… …
1583 my ($self, $ob) = @_; 1591 my ($self, $ob) = @_;
1584 1592
1585 return find "~" . $ob->name . "/" . $self->{path} 1593 return find "~" . $ob->name . "/" . $self->{path}
1586 if $self->per_player; 1594 if $self->per_player;
1587 1595
1596# return find "?party/" . $ob->name . "/" . $self->{path}
1597# if $self->per_party;
1598
1588 $self 1599 $self
1589} 1600}
1590 1601
1591# find and load all maps in the 3x3 area around a map 1602# find and load all maps in the 3x3 area around a map
1592sub load_diag { 1603sub load_diag {
… …
1702 1713
1703sub reset_at { 1714sub reset_at {
1704 my ($self) = @_; 1715 my ($self) = @_;
1705 1716
1706 # TODO: safety, remove and allow resettable per-player maps 1717 # TODO: safety, remove and allow resettable per-player maps
1707 return 1e99 if $self->isa ("ext::map_per_player");#d#
1708 return 1e99 if $self->{deny_reset}; 1718 return 1e99 if $self->{deny_reset};
1709 1719
1710 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1720 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1711 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1721 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1712 1722
… …
1723 my ($self) = @_; 1733 my ($self) = @_;
1724 1734
1725 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1735 my $lock = cf::lock_acquire "map_data:$self->{path}";
1726 1736
1727 return if $self->players; 1737 return if $self->players;
1728 return if $self->isa ("ext::map_per_player");#d#
1729 1738
1730 warn "resetting map ", $self->path;#d# 1739 warn "resetting map ", $self->path;
1731 1740
1732 $self->in_memory (cf::MAP_SWAPPED); 1741 $self->in_memory (cf::MAP_SWAPPED);
1733 1742
1734 # need to save uniques path 1743 # need to save uniques path
1735 unless ($self->{deny_save}) { 1744 unless ($self->{deny_save}) {
… …
2481 warn $@ if $@; 2490 warn $@ if $@;
2482 _exit 0; 2491 _exit 0;
2483 } 2492 }
2484} 2493}
2485 2494
2486
2487
2488############################################################################# 2495#############################################################################
2489# the server's init and main functions 2496# the server's init and main functions
2490 2497
2491sub load_facedata($) { 2498sub load_facedata($) {
2492 my ($path) = @_; 2499 my ($path) = @_;
… …
2563sub reload_resources { 2570sub reload_resources {
2564 warn "reloading resource files...\n"; 2571 warn "reloading resource files...\n";
2565 2572
2566 reload_regions; 2573 reload_regions;
2567 reload_facedata; 2574 reload_facedata;
2575 #reload_archetypes;#d#
2568 reload_archetypes; 2576 reload_archetypes;
2569 reload_treasures; 2577 reload_treasures;
2570 2578
2571 warn "finished reloading resource files\n"; 2579 warn "finished reloading resource files\n";
2572} 2580}

Diff Legend

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