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.415 by root, Thu Apr 10 15:35:16 2008 UTC vs.
Revision 1.419 by root, Sun Apr 13 01:34:09 2008 UTC

… …
1775our $MAX_RESET = 3600; 1775our $MAX_RESET = 3600;
1776our $DEFAULT_RESET = 3000; 1776our $DEFAULT_RESET = 3000;
1777 1777
1778sub generate_random_map { 1778sub generate_random_map {
1779 my ($self, $rmp) = @_; 1779 my ($self, $rmp) = @_;
1780
1781 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1782
1780 # mit "rum" bekleckern, nicht 1783 # mit "rum" bekleckern, nicht
1781 $self->_create_random_map ( 1784 $self->_create_random_map (
1782 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1785 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1783 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1786 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1784 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1787 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1906 1909
1907# the temporary/swap location 1910# the temporary/swap location
1908sub save_path { 1911sub save_path {
1909 my ($self) = @_; 1912 my ($self) = @_;
1910 1913
1911 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1914 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1912 "$TMPDIR/$path.map" 1915 "$TMPDIR/$path.map"
1913} 1916}
1914 1917
1915# the unique path, undef == no special unique path 1918# the unique path, undef == no special unique path
1916sub uniq_path { 1919sub uniq_path {
1917 my ($self) = @_; 1920 my ($self) = @_;
1918 1921
1919 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1922 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1920 "$UNIQUEDIR/$path" 1923 "$UNIQUEDIR/$path"
1921} 1924}
1922 1925
1923# and all this just because we cannot iterate over 1926# and all this just because we cannot iterate over
1924# all maps in C++... 1927# all maps in C++...
… …
2370 2373
2371sub unique_maps() { 2374sub unique_maps() {
2372 [ 2375 [
2373 map { 2376 map {
2374 utf8::decode $_; 2377 utf8::decode $_;
2375 /\.map$/ 2378 s/\.map$//; # TODO future compatibility hack
2379 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2380 ? ()
2376 ? normalise $_ 2381 : normalise $_
2377 : ()
2378 } @{ aio_readdir $UNIQUEDIR or [] } 2382 } @{ aio_readdir $UNIQUEDIR or [] }
2379 ] 2383 ]
2380} 2384}
2381 2385
2382=back 2386=back
… …
2389 2393
2390=over 4 2394=over 4
2391 2395
2392=item $ob->inv_recursive 2396=item $ob->inv_recursive
2393 2397
2394Returns the inventory of the object _and_ their inventories, recursively. 2398Returns the inventory of the object I<and> their inventories, recursively,
2399but I<not> the object itself.
2395 2400
2396=cut 2401=cut
2397 2402
2398sub inv_recursive_; 2403sub inv_recursive_;
2399sub inv_recursive_ { 2404sub inv_recursive_ {
… …
2404 inv_recursive_ inv $_[0] 2409 inv_recursive_ inv $_[0]
2405} 2410}
2406 2411
2407=item $ref = $ob->ref 2412=item $ref = $ob->ref
2408 2413
2409creates and returns a persistent reference to an objetc that can be stored as a string. 2414Creates and returns a persistent reference to an object that can be stored as a string.
2410 2415
2411=item $ob = cf::object::deref ($refstring) 2416=item $ob = cf::object::deref ($refstring)
2412 2417
2413returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2418returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2414even if the object actually exists. May block. 2419even if the object actually exists. May block.
… …
3404 cf::cleanup "SIG$signal"; 3409 cf::cleanup "SIG$signal";
3405 }; 3410 };
3406 } 3411 }
3407} 3412}
3408 3413
3409sub write_runtime { 3414sub write_runtime_sync {
3410 my $runtime = "$LOCALDIR/runtime"; 3415 my $runtime = "$LOCALDIR/runtime";
3411 3416
3412 # first touch the runtime file to show we are still running: 3417 # first touch the runtime file to show we are still running:
3413 # the fsync below can take a very very long time. 3418 # the fsync below can take a very very long time.
3414 3419
… …
3440 and return; 3445 and return;
3441 3446
3442 warn "runtime file written.\n"; 3447 warn "runtime file written.\n";
3443 3448
3444 1 3449 1
3450}
3451
3452our $uuid_lock;
3453our $uuid_skip;
3454
3455sub write_uuid_sync($) {
3456 $uuid_skip ||= $_[0];
3457
3458 return if $uuid_lock;
3459 local $uuid_lock = 1;
3460
3461 my $uuid = "$LOCALDIR/uuid";
3462
3463 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3464 or return;
3465
3466 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3467 $uuid_skip = 0;
3468
3469 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3470 and return;
3471
3472 # always fsync - this file is important
3473 aio_fsync $fh
3474 and return;
3475
3476 close $fh
3477 or return;
3478
3479 aio_rename "$uuid~", $uuid
3480 and return;
3481
3482 warn "uuid file written ($value).\n";
3483
3484 1
3485
3486}
3487
3488sub write_uuid($$) {
3489 my ($skip, $sync) = @_;
3490
3491 $sync ? write_uuid_sync $skip
3492 : async { write_uuid_sync $skip };
3445} 3493}
3446 3494
3447sub emergency_save() { 3495sub emergency_save() {
3448 my $freeze_guard = cf::freeze_mainloop; 3496 my $freeze_guard = cf::freeze_mainloop;
3449 3497
… …
3471 warn "end emergency map save\n"; 3519 warn "end emergency map save\n";
3472 3520
3473 warn "begin emergency database checkpoint\n"; 3521 warn "begin emergency database checkpoint\n";
3474 BDB::db_env_txn_checkpoint $DB_ENV; 3522 BDB::db_env_txn_checkpoint $DB_ENV;
3475 warn "end emergency database checkpoint\n"; 3523 warn "end emergency database checkpoint\n";
3524
3525 warn "begin write uuid\n";
3526 write_uuid_sync 1;
3527 warn "end write uuid\n";
3476 }; 3528 };
3477 3529
3478 warn "leave emergency perl save\n"; 3530 warn "leave emergency perl save\n";
3479} 3531}
3480 3532
… …
3495 warn "reloading..."; 3547 warn "reloading...";
3496 3548
3497 warn "entering sync_job"; 3549 warn "entering sync_job";
3498 3550
3499 cf::sync_job { 3551 cf::sync_job {
3500 cf::write_runtime; # external watchdog should not bark 3552 cf::write_runtime_sync; # external watchdog should not bark
3501 cf::emergency_save; 3553 cf::emergency_save;
3502 cf::write_runtime; # external watchdog should not bark 3554 cf::write_runtime_sync; # external watchdog should not bark
3503 3555
3504 warn "syncing database to disk"; 3556 warn "syncing database to disk";
3505 BDB::db_env_txn_checkpoint $DB_ENV; 3557 BDB::db_env_txn_checkpoint $DB_ENV;
3506 3558
3507 # if anything goes wrong in here, we should simply crash as we already saved 3559 # if anything goes wrong in here, we should simply crash as we already saved
… …
3662 3714
3663 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3715 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3664 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3716 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3665 Coro::async_pool { 3717 Coro::async_pool {
3666 $Coro::current->{desc} = "runtime saver"; 3718 $Coro::current->{desc} = "runtime saver";
3667 write_runtime 3719 write_runtime_sync
3668 or warn "ERROR: unable to write runtime file: $!"; 3720 or warn "ERROR: unable to write runtime file: $!";
3669 }; 3721 };
3670 } 3722 }
3671 3723
3672 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3724 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {

Diff Legend

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