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.233 by root, Wed Apr 4 02:20:27 2007 UTC vs.
Revision 1.243 by root, Mon Apr 16 13:02:29 2007 UTC

… …
16use Coro::Event; 16use Coro::Event;
17use Coro::Timer; 17use Coro::Timer;
18use Coro::Signal; 18use Coro::Signal;
19use Coro::Semaphore; 19use Coro::Semaphore;
20use Coro::AIO; 20use Coro::AIO;
21use Coro::Storable;
21 22
22use BDB (); 23use BDB ();
23use Data::Dumper; 24use Data::Dumper;
24use Digest::MD5; 25use Digest::MD5;
25use Fcntl; 26use Fcntl;
… …
28use Time::HiRes; 29use Time::HiRes;
29use Compress::LZF; 30use Compress::LZF;
30 31
31# configure various modules to our taste 32# configure various modules to our taste
32# 33#
34$Storable::canonical = 1; # reduce rsync transfers
33Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 35Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
34Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 36Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
35 37
36$Event::Eval = 1; # no idea why this is required, but it is 38$Event::Eval = 1; # no idea why this is required, but it is
37 39
… …
74our %MAP; # all maps 76our %MAP; # all maps
75our $LINK_MAP; # the special {link} map, which is always available 77our $LINK_MAP; # the special {link} map, which is always available
76our $RANDOM_MAPS = cf::localdir . "/random"; 78our $RANDOM_MAPS = cf::localdir . "/random";
77our $BDB_ENV_DIR = cf::localdir . "/db"; 79our $BDB_ENV_DIR = cf::localdir . "/db";
78 80
79our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
80our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
81
82# used to convert map paths into valid unix filenames by replacing / by ∕ 81# used to convert map paths into valid unix filenames by replacing / by ∕
83our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 82our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
84 83
85binmode STDOUT; 84binmode STDOUT;
86binmode STDERR; 85binmode STDERR;
… …
134=item %cf::CFG 133=item %cf::CFG
135 134
136Configuration for the server, loaded from C</etc/crossfire/config>, or 135Configuration for the server, loaded from C</etc/crossfire/config>, or
137from wherever your confdir points to. 136from wherever your confdir points to.
138 137
139=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 138=item cf::wait_for_tick, cf::wait_for_tick_begin
140 139
141These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK) 140These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
142or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick 141returns directly I<after> the tick processing (and consequently, can only wake one process
143processing has been done. Call C<< ->wait >> on them to maximise the 142per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
144window of cpu time available, or simply to synchronise to the server tick.
145 143
146=back 144=back
147 145
148=cut 146=cut
149 147
… …
963} 961}
964 962
965sub path($) { 963sub path($) {
966 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 964 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
967 965
968 (playerdir $login) . "/$login.pl" 966 (playerdir $login) . "/playerdata"
969} 967}
970 968
971sub find_active($) { 969sub find_active($) {
972 $cf::PLAYER{$_[0]} 970 $cf::PLAYER{$_[0]}
973 and $cf::PLAYER{$_[0]}->active 971 and $cf::PLAYER{$_[0]}->active
… …
986 my $login = $_[0]; 984 my $login = $_[0];
987 985
988 my $guard = cf::lock_acquire "user_find:$login"; 986 my $guard = cf::lock_acquire "user_find:$login";
989 987
990 $cf::PLAYER{$_[0]} || do { 988 $cf::PLAYER{$_[0]} || do {
989 # rename old playerfiles to new ones
990 #TODO: remove when no longer required
991 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
992 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
993 aio_unlink +(playerdir $login) . "/$login.pl.pst";
994 aio_unlink +(playerdir $login) . "/$login.pl";
995
991 my $pl = load_pl path $login 996 my $pl = load_pl path $login
992 or return; 997 or return;
993 $cf::PLAYER{$login} = $pl 998 $cf::PLAYER{$login} = $pl
994 } 999 }
995 } 1000 }
… …
1150 my ($self, $type, %msg) = @_; 1155 my ($self, $type, %msg) = @_;
1151 1156
1152 $self->ns->ext_event ($type, %msg); 1157 $self->ns->ext_event ($type, %msg);
1153} 1158}
1154 1159
1155package cf; 1160=head3 cf::region
1161
1162=over 4
1163
1164=cut
1165
1166package cf::region;
1167
1168=item cf::region::find_by_path $path
1169
1170Tries to decuce the probable region for a map knowing only its path.
1171
1172=cut
1173
1174sub find_by_path($) {
1175 my ($path) = @_;
1176
1177 my ($match, $specificity);
1178
1179 for my $region (list) {
1180 if ($region->match && $path =~ $region->match) {
1181 ($match, $specificity) = ($region, $region->specificity)
1182 if $region->specificity > $specificity;
1183 }
1184 }
1185
1186 $match
1187}
1156 1188
1157=back 1189=back
1158
1159 1190
1160=head3 cf::map 1191=head3 cf::map
1161 1192
1162=over 4 1193=over 4
1163 1194
… …
1394 $self->load_header_orig 1425 $self->load_header_orig
1395 or return; 1426 or return;
1396 $self->prepare_orig; 1427 $self->prepare_orig;
1397 } 1428 }
1398 1429
1430 $self->default_region (cf::region::find_by_path $self->{path})
1431 unless $self->default_region;
1432
1399 1 1433 1
1400} 1434}
1401 1435
1402sub find; 1436sub find;
1403sub find { 1437sub find {
… …
1445 $self->in_memory (cf::MAP_LOADING); 1479 $self->in_memory (cf::MAP_LOADING);
1446 1480
1447 $self->alloc; 1481 $self->alloc;
1448 1482
1449 $self->pre_load; 1483 $self->pre_load;
1484 Coro::cede;
1450 1485
1451 $self->_load_objects ($self->{load_path}, 1) 1486 $self->_load_objects ($self->{load_path}, 1)
1452 or return; 1487 or return;
1453 1488
1454 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1489 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
… …
1461 $self->_load_objects ($uniq, 0); 1496 $self->_load_objects ($uniq, 0);
1462 } 1497 }
1463 } 1498 }
1464 1499
1465 Coro::cede; 1500 Coro::cede;
1466
1467 # now do the right thing for maps 1501 # now do the right thing for maps
1468 $self->link_multipart_objects; 1502 $self->link_multipart_objects;
1503 Coro::cede;
1469 1504
1470 unless ($self->{deny_activate}) { 1505 unless ($self->{deny_activate}) {
1471 $self->decay_objects; 1506 $self->decay_objects;
1472 $self->fix_auto_apply; 1507 $self->fix_auto_apply;
1473 $self->update_buttons; 1508 $self->update_buttons;
… …
1475 $self->set_darkness_map; 1510 $self->set_darkness_map;
1476 $self->difficulty ($self->estimate_difficulty) 1511 $self->difficulty ($self->estimate_difficulty)
1477 unless $self->difficulty; 1512 unless $self->difficulty;
1478 Coro::cede; 1513 Coro::cede;
1479 $self->activate; 1514 $self->activate;
1515 Coro::cede;
1480 } 1516 }
1481 1517
1482 $self->post_load; 1518 $self->post_load;
1519 Coro::cede;
1483 1520
1484 $self->in_memory (cf::MAP_IN_MEMORY); 1521 $self->in_memory (cf::MAP_IN_MEMORY);
1485} 1522}
1486 1523
1487sub customise_for { 1524sub customise_for {
… …
2300sub load_facedata { 2337sub load_facedata {
2301 my $path = sprintf "%s/facedata", cf::datadir; 2338 my $path = sprintf "%s/facedata", cf::datadir;
2302 2339
2303 warn "loading facedata from $path\n"; 2340 warn "loading facedata from $path\n";
2304 2341
2305 my $faces; 2342 my $facedata;
2306 0 < aio_load $path, $faces 2343 0 < aio_load $path, $facedata
2307 or die "$path: $!"; 2344 or die "$path: $!";
2308 2345
2309 Coro::cede;
2310 $faces = Storable::thaw $faces; 2346 $facedata = Coro::Storable::thaw $facedata;
2311 Coro::cede;
2312 2347
2313 my $meta = delete $faces->{""};
2314 $meta->{version} == 1 2348 $facedata->{version} == 2
2315 or cf::cleanup "$path: version mismatch, cannot proceed."; 2349 or cf::cleanup "$path: version mismatch, cannot proceed.";
2316 2350
2351 {
2352 my $faces = $facedata->{faceinfo};
2353
2317 while (my ($face, $info) = each %$faces) { 2354 while (my ($face, $info) = each %$faces) {
2318 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2355 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2319 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2356 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2320 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2357 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2321 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2358 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2322 Coro::cede; 2359 Coro::cede;
2323 } 2360 }
2324 2361
2325 while (my ($face, $info) = each %$faces) { 2362 while (my ($face, $info) = each %$faces) {
2326 next unless $info->{smooth}; 2363 next unless $info->{smooth};
2327 my $idx = cf::face::find $face 2364 my $idx = cf::face::find $face
2328 or next; 2365 or next;
2329 if (my $smooth = cf::face::find $info->{smooth}) { 2366 if (my $smooth = cf::face::find $info->{smooth}) {
2330 cf::face::set_smooth $idx, $smooth; 2367 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
2331 } else { 2368 } else {
2332 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2369 warn "smooth face '$info->{smooth}' not found for face '$face'";
2333 } 2370 }
2334 Coro::cede; 2371 Coro::cede;
2372 }
2373 }
2374
2375 {
2376 my $anims = $facedata->{animinfo};
2377
2378 while (my ($anim, $info) = each %$anims) {
2379 cf::anim::set $anim, $info->{frames}, $info->{facings};
2380 Coro::cede;
2381 }
2382
2383 cf::anim::invalidate_all; # d'oh
2335 } 2384 }
2336 2385
2337 1 2386 1
2387}
2388
2389our $archetypes_loaded;
2390
2391sub load_archetypes {
2392 return 1 if $archetypes_loaded++; # current can only load them once
2393 load_archetype_file sprintf "%s/archetypes", cf::datadir; # remove when stable
2394 load_archetype_file sprintf "%s/archetypes", cf::datadir
2395}
2396
2397sub load_treasures {
2398 load_treasure_file sprintf "%s/treasures", cf::datadir
2338} 2399}
2339 2400
2340sub reload_resources { 2401sub reload_resources {
2341 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2402 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2342 or die "unable to load regions file\n";#d# 2403 or die "unable to load regions file\n";
2343 load_facedata 2404 load_facedata
2344 or die "unable to load facedata\n";#d# 2405 or die "unable to load facedata\n";
2406 load_archetypes
2407 or die "unable to load archetypes\n";
2408 load_treasures
2409 or die "unable to load treasurelists\n";
2345} 2410}
2346 2411
2347sub init { 2412sub init {
2348 reload_resources; 2413 reload_resources;
2349} 2414}
… …
2593 2658
2594unshift @INC, $LIBDIR; 2659unshift @INC, $LIBDIR;
2595 2660
2596my $bug_warning = 0; 2661my $bug_warning = 0;
2597 2662
2663our @WAIT_FOR_TICK;
2664our @WAIT_FOR_TICK_BEGIN;
2665
2666sub wait_for_tick {
2667 return unless $TICK_WATCHER->is_active;
2668 return if $Coro::current == $Coro::main;
2669
2670 my $signal = new Coro::Signal;
2671 push @WAIT_FOR_TICK, $signal;
2672 $signal->wait;
2673}
2674
2675sub wait_for_tick_begin {
2676 return unless $TICK_WATCHER->is_active;
2677 return if $Coro::current == $Coro::main;
2678
2679 my $signal = new Coro::Signal;
2680 push @WAIT_FOR_TICK_BEGIN, $signal;
2681 $signal->wait;
2682}
2683
2598$TICK_WATCHER = Event->timer ( 2684$TICK_WATCHER = Event->timer (
2599 reentrant => 0, 2685 reentrant => 0,
2600 parked => 1, 2686 parked => 1,
2601 prio => 0, 2687 prio => 0,
2602 at => $NEXT_TICK || $TICK, 2688 at => $NEXT_TICK || $TICK,
… …
2620 write_runtime 2706 write_runtime
2621 or warn "ERROR: unable to write runtime file: $!"; 2707 or warn "ERROR: unable to write runtime file: $!";
2622 }; 2708 };
2623 } 2709 }
2624 2710
2625 $WAIT_FOR_TICK->broadcast; 2711 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2626 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2712 $sig->send;
2713 }
2714 while (my $sig = shift @WAIT_FOR_TICK) {
2715 $sig->send;
2716 }
2627 2717
2628# my $AFTER = Event::time; 2718# my $AFTER = Event::time;
2629# warn $AFTER - $NOW;#d# 2719# warn $AFTER - $NOW;#d#
2630 2720
2631 # if we are delayed by four ticks or more, skip them all 2721 # if we are delayed by four ticks or more, skip them all

Diff Legend

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