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.414 by root, Thu Apr 10 09:10:45 2008 UTC vs.
Revision 1.422 by root, Tue Apr 15 20:46:55 2008 UTC

… …
427 } 427 }
428 } 428 }
429}; 429};
430 430
431sub get_slot($;$$) { 431sub get_slot($;$$) {
432 return if tick_inhibit;
433
432 my ($time, $pri, $name) = @_; 434 my ($time, $pri, $name) = @_;
433 435
434 $time = $TICK * .6 if $time > $TICK * .6; 436 $time = $TICK * .6 if $time > $TICK * .6;
435 my $sig = new Coro::Signal; 437 my $sig = new Coro::Signal;
436 438
… …
547 reset_signals; 549 reset_signals;
548 &$cb 550 &$cb
549 }, @args; 551 }, @args;
550 552
551 wantarray ? @res : $res[-1] 553 wantarray ? @res : $res[-1]
554}
555
556=item $coin = coin_from_name $name
557
558=cut
559
560our %coin_alias = (
561 "silver" => "silvercoin",
562 "silvercoin" => "silvercoin",
563 "silvercoins" => "silvercoin",
564 "gold" => "goldcoin",
565 "goldcoin" => "goldcoin",
566 "goldcoins" => "goldcoin",
567 "platinum" => "platinacoin",
568 "platinumcoin" => "platinacoin",
569 "platinumcoins" => "platinacoin",
570 "platina" => "platinacoin",
571 "platinacoin" => "platinacoin",
572 "platinacoins" => "platinacoin",
573 "royalty" => "royalty",
574 "royalties" => "royalty",
575);
576
577sub coin_from_name($) {
578 $coin_alias{$_[0]}
579 ? cf::arch::find $coin_alias{$_[0]}
580 : undef
552} 581}
553 582
554=item $value = cf::db_get $family => $key 583=item $value = cf::db_get $family => $key
555 584
556Returns a single value from the environment database. 585Returns a single value from the environment database.
… …
1446 1475
1447 return if $pl->{deny_save}; 1476 return if $pl->{deny_save};
1448 1477
1449 aio_mkdir playerdir $pl, 0770; 1478 aio_mkdir playerdir $pl, 0770;
1450 $pl->{last_save} = $cf::RUNTIME; 1479 $pl->{last_save} = $cf::RUNTIME;
1480
1481 cf::get_slot 0.01;
1451 1482
1452 $pl->save_pl ($path); 1483 $pl->save_pl ($path);
1453 cf::cede_to_tick; 1484 cf::cede_to_tick;
1454} 1485}
1455 1486
… …
1748our $MAX_RESET = 3600; 1779our $MAX_RESET = 3600;
1749our $DEFAULT_RESET = 3000; 1780our $DEFAULT_RESET = 3000;
1750 1781
1751sub generate_random_map { 1782sub generate_random_map {
1752 my ($self, $rmp) = @_; 1783 my ($self, $rmp) = @_;
1784
1785 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1786
1753 # mit "rum" bekleckern, nicht 1787 # mit "rum" bekleckern, nicht
1754 $self->_create_random_map ( 1788 $self->_create_random_map (
1755 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1789 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1756 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1790 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1757 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1791 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1879 1913
1880# the temporary/swap location 1914# the temporary/swap location
1881sub save_path { 1915sub save_path {
1882 my ($self) = @_; 1916 my ($self) = @_;
1883 1917
1884 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1918 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1885 "$TMPDIR/$path.map" 1919 "$TMPDIR/$path.map"
1886} 1920}
1887 1921
1888# the unique path, undef == no special unique path 1922# the unique path, undef == no special unique path
1889sub uniq_path { 1923sub uniq_path {
1890 my ($self) = @_; 1924 my ($self) = @_;
1891 1925
1892 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1893 "$UNIQUEDIR/$path" 1927 "$UNIQUEDIR/$path"
1894} 1928}
1895 1929
1896# and all this just because we cannot iterate over 1930# and all this just because we cannot iterate over
1897# all maps in C++... 1931# all maps in C++...
… …
2083 } 2117 }
2084 2118
2085 $self->{last_save} = $cf::RUNTIME; 2119 $self->{last_save} = $cf::RUNTIME;
2086 $self->last_access ($cf::RUNTIME); 2120 $self->last_access ($cf::RUNTIME);
2087 2121
2088 $self->in_memory (cf::MAP_IN_MEMORY); 2122 $self->in_memory (cf::MAP_ACTIVE);
2089 } 2123 }
2090 2124
2091 $self->post_load; 2125 $self->post_load;
2092} 2126}
2093 2127
… …
2151 my ($path, $origin, $load) = @_; 2185 my ($path, $origin, $load) = @_;
2152 2186
2153 $path = normalise $path, $origin && $origin->{path}; 2187 $path = normalise $path, $origin && $origin->{path};
2154 2188
2155 if (my $map = $cf::MAP{$path}) { 2189 if (my $map = $cf::MAP{$path}) {
2156 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2190 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2157 } 2191 }
2158 2192
2159 $MAP_PREFETCH{$path} |= $load; 2193 $MAP_PREFETCH{$path} |= $load;
2160 2194
2161 $MAP_PREFETCHER ||= cf::async { 2195 $MAP_PREFETCHER ||= cf::async {
… …
2198 cf::async { 2232 cf::async {
2199 $Coro::current->{desc} = "map player save"; 2233 $Coro::current->{desc} = "map player save";
2200 $_->contr->save for $self->players; 2234 $_->contr->save for $self->players;
2201 }; 2235 };
2202 2236
2237 cf::get_slot 0.02;
2238
2203 if ($uniq) { 2239 if ($uniq) {
2204 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2240 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2205 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2241 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2206 } else { 2242 } else {
2207 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2243 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
… …
2215 $self->save; 2251 $self->save;
2216 2252
2217 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2253 my $lock = cf::lock_acquire "map_data:$self->{path}";
2218 2254
2219 return if $self->players; 2255 return if $self->players;
2220 return if $self->in_memory != cf::MAP_IN_MEMORY; 2256 return if $self->in_memory != cf::MAP_ACTIVE;
2221 return if $self->{deny_save}; 2257 return if $self->{deny_save};
2222 2258
2223 $self->in_memory (cf::MAP_SWAPPED); 2259 $self->in_memory (cf::MAP_SWAPPED);
2224 2260
2225 $self->deactivate; 2261 $self->deactivate;
… …
2343 2379
2344sub unique_maps() { 2380sub unique_maps() {
2345 [ 2381 [
2346 map { 2382 map {
2347 utf8::decode $_; 2383 utf8::decode $_;
2348 /\.map$/ 2384 s/\.map$//; # TODO future compatibility hack
2385 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2386 ? ()
2349 ? normalise $_ 2387 : normalise $_
2350 : ()
2351 } @{ aio_readdir $UNIQUEDIR or [] } 2388 } @{ aio_readdir $UNIQUEDIR or [] }
2352 ] 2389 ]
2353} 2390}
2354 2391
2355package cf;
2356
2357=back 2392=back
2358 2393
2359=head3 cf::object 2394=head3 cf::object
2360 2395
2361=cut 2396=cut
… …
2364 2399
2365=over 4 2400=over 4
2366 2401
2367=item $ob->inv_recursive 2402=item $ob->inv_recursive
2368 2403
2369Returns the inventory of the object _and_ their inventories, recursively. 2404Returns the inventory of the object I<and> their inventories, recursively,
2405but I<not> the object itself.
2370 2406
2371=cut 2407=cut
2372 2408
2373sub inv_recursive_; 2409sub inv_recursive_;
2374sub inv_recursive_ { 2410sub inv_recursive_ {
… …
2379 inv_recursive_ inv $_[0] 2415 inv_recursive_ inv $_[0]
2380} 2416}
2381 2417
2382=item $ref = $ob->ref 2418=item $ref = $ob->ref
2383 2419
2384creates and returns a persistent reference to an objetc that can be stored as a string. 2420Creates and returns a persistent reference to an object that can be stored as a string.
2385 2421
2386=item $ob = cf::object::deref ($refstring) 2422=item $ob = cf::object::deref ($refstring)
2387 2423
2388returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2424returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2389even if the object actually exists. May block. 2425even if the object actually exists. May block.
… …
2663 $rmp->{origin_y} = $exit->y; 2699 $rmp->{origin_y} = $exit->y;
2664 } 2700 }
2665 2701
2666 $rmp->{random_seed} ||= $exit->random_seed; 2702 $rmp->{random_seed} ||= $exit->random_seed;
2667 2703
2668 my $data = cf::encode_json $rmp; 2704 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2669 my $md5 = Digest::MD5::md5_hex $data; 2705 my $md5 = Digest::MD5::md5_hex $data;
2670 my $meta = "$RANDOMDIR/$md5.meta"; 2706 my $meta = "$RANDOMDIR/$md5.meta";
2671 2707
2672 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2708 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2673 aio_write $fh, 0, (length $data), $data, 0; 2709 aio_write $fh, 0, (length $data), $data, 0;
… …
3379 cf::cleanup "SIG$signal"; 3415 cf::cleanup "SIG$signal";
3380 }; 3416 };
3381 } 3417 }
3382} 3418}
3383 3419
3384sub write_runtime { 3420sub write_runtime_sync {
3385 my $runtime = "$LOCALDIR/runtime"; 3421 my $runtime = "$LOCALDIR/runtime";
3386 3422
3387 # first touch the runtime file to show we are still running: 3423 # first touch the runtime file to show we are still running:
3388 # the fsync below can take a very very long time. 3424 # the fsync below can take a very very long time.
3389 3425
… …
3415 and return; 3451 and return;
3416 3452
3417 warn "runtime file written.\n"; 3453 warn "runtime file written.\n";
3418 3454
3419 1 3455 1
3456}
3457
3458our $uuid_lock;
3459our $uuid_skip;
3460
3461sub write_uuid_sync($) {
3462 $uuid_skip ||= $_[0];
3463
3464 return if $uuid_lock;
3465 local $uuid_lock = 1;
3466
3467 my $uuid = "$LOCALDIR/uuid";
3468
3469 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3470 or return;
3471
3472 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3473 $uuid_skip = 0;
3474
3475 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3476 and return;
3477
3478 # always fsync - this file is important
3479 aio_fsync $fh
3480 and return;
3481
3482 close $fh
3483 or return;
3484
3485 aio_rename "$uuid~", $uuid
3486 and return;
3487
3488 warn "uuid file written ($value).\n";
3489
3490 1
3491
3492}
3493
3494sub write_uuid($$) {
3495 my ($skip, $sync) = @_;
3496
3497 $sync ? write_uuid_sync $skip
3498 : async { write_uuid_sync $skip };
3420} 3499}
3421 3500
3422sub emergency_save() { 3501sub emergency_save() {
3423 my $freeze_guard = cf::freeze_mainloop; 3502 my $freeze_guard = cf::freeze_mainloop;
3424 3503
… …
3446 warn "end emergency map save\n"; 3525 warn "end emergency map save\n";
3447 3526
3448 warn "begin emergency database checkpoint\n"; 3527 warn "begin emergency database checkpoint\n";
3449 BDB::db_env_txn_checkpoint $DB_ENV; 3528 BDB::db_env_txn_checkpoint $DB_ENV;
3450 warn "end emergency database checkpoint\n"; 3529 warn "end emergency database checkpoint\n";
3530
3531 warn "begin write uuid\n";
3532 write_uuid_sync 1;
3533 warn "end write uuid\n";
3451 }; 3534 };
3452 3535
3453 warn "leave emergency perl save\n"; 3536 warn "leave emergency perl save\n";
3454} 3537}
3455 3538
… …
3470 warn "reloading..."; 3553 warn "reloading...";
3471 3554
3472 warn "entering sync_job"; 3555 warn "entering sync_job";
3473 3556
3474 cf::sync_job { 3557 cf::sync_job {
3475 cf::write_runtime; # external watchdog should not bark 3558 cf::write_runtime_sync; # external watchdog should not bark
3476 cf::emergency_save; 3559 cf::emergency_save;
3477 cf::write_runtime; # external watchdog should not bark 3560 cf::write_runtime_sync; # external watchdog should not bark
3478 3561
3479 warn "syncing database to disk"; 3562 warn "syncing database to disk";
3480 BDB::db_env_txn_checkpoint $DB_ENV; 3563 BDB::db_env_txn_checkpoint $DB_ENV;
3481 3564
3482 # if anything goes wrong in here, we should simply crash as we already saved 3565 # if anything goes wrong in here, we should simply crash as we already saved
… …
3637 3720
3638 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3721 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3639 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3722 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3640 Coro::async_pool { 3723 Coro::async_pool {
3641 $Coro::current->{desc} = "runtime saver"; 3724 $Coro::current->{desc} = "runtime saver";
3642 write_runtime 3725 write_runtime_sync
3643 or warn "ERROR: unable to write runtime file: $!"; 3726 or warn "ERROR: unable to write runtime file: $!";
3644 }; 3727 };
3645 } 3728 }
3646 3729
3647 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3730 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {

Diff Legend

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