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.234 by root, Thu Apr 5 13:44:31 2007 UTC vs.
Revision 1.239 by root, Mon Apr 16 06:23:42 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
… …
1157 my ($self, $type, %msg) = @_; 1155 my ($self, $type, %msg) = @_;
1158 1156
1159 $self->ns->ext_event ($type, %msg); 1157 $self->ns->ext_event ($type, %msg);
1160} 1158}
1161 1159
1162package 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}
1163 1188
1164=back 1189=back
1165
1166 1190
1167=head3 cf::map 1191=head3 cf::map
1168 1192
1169=over 4 1193=over 4
1170 1194
… …
1401 $self->load_header_orig 1425 $self->load_header_orig
1402 or return; 1426 or return;
1403 $self->prepare_orig; 1427 $self->prepare_orig;
1404 } 1428 }
1405 1429
1430 $self->default_region (cf::region::find_by_path $self->{path})
1431 unless $self->default_region;
1432
1406 1 1433 1
1407} 1434}
1408 1435
1409sub find; 1436sub find;
1410sub find { 1437sub find {
… …
1452 $self->in_memory (cf::MAP_LOADING); 1479 $self->in_memory (cf::MAP_LOADING);
1453 1480
1454 $self->alloc; 1481 $self->alloc;
1455 1482
1456 $self->pre_load; 1483 $self->pre_load;
1484 Coro::cede;
1457 1485
1458 $self->_load_objects ($self->{load_path}, 1) 1486 $self->_load_objects ($self->{load_path}, 1)
1459 or return; 1487 or return;
1460 1488
1461 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1489 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
… …
1468 $self->_load_objects ($uniq, 0); 1496 $self->_load_objects ($uniq, 0);
1469 } 1497 }
1470 } 1498 }
1471 1499
1472 Coro::cede; 1500 Coro::cede;
1473
1474 # now do the right thing for maps 1501 # now do the right thing for maps
1475 $self->link_multipart_objects; 1502 $self->link_multipart_objects;
1503 Coro::cede;
1476 1504
1477 unless ($self->{deny_activate}) { 1505 unless ($self->{deny_activate}) {
1478 $self->decay_objects; 1506 $self->decay_objects;
1479 $self->fix_auto_apply; 1507 $self->fix_auto_apply;
1480 $self->update_buttons; 1508 $self->update_buttons;
… …
1482 $self->set_darkness_map; 1510 $self->set_darkness_map;
1483 $self->difficulty ($self->estimate_difficulty) 1511 $self->difficulty ($self->estimate_difficulty)
1484 unless $self->difficulty; 1512 unless $self->difficulty;
1485 Coro::cede; 1513 Coro::cede;
1486 $self->activate; 1514 $self->activate;
1515 Coro::cede;
1487 } 1516 }
1488 1517
1489 $self->post_load; 1518 $self->post_load;
1519 Coro::cede;
1490 1520
1491 $self->in_memory (cf::MAP_IN_MEMORY); 1521 $self->in_memory (cf::MAP_IN_MEMORY);
1492} 1522}
1493 1523
1494sub customise_for { 1524sub customise_for {
… …
2307sub load_facedata { 2337sub load_facedata {
2308 my $path = sprintf "%s/facedata", cf::datadir; 2338 my $path = sprintf "%s/facedata", cf::datadir;
2309 2339
2310 warn "loading facedata from $path\n"; 2340 warn "loading facedata from $path\n";
2311 2341
2312 my $faces; 2342 my $facedata;
2313 0 < aio_load $path, $faces 2343 0 < aio_load $path, $facedata
2314 or die "$path: $!"; 2344 or die "$path: $!";
2315 2345
2316 Coro::cede;
2317 $faces = Storable::thaw $faces; 2346 $facedata = Coro::Storable::thaw $facedata;
2318 Coro::cede;
2319 2347
2320 my $meta = delete $faces->{""};
2321 $meta->{version} == 1 2348 $facedata->{version} == 2
2322 or cf::cleanup "$path: version mismatch, cannot proceed."; 2349 or cf::cleanup "$path: version mismatch, cannot proceed.";
2323 2350
2351 {
2352 my $faces = $facedata->{faceinfo};
2353
2324 while (my ($face, $info) = each %$faces) { 2354 while (my ($face, $info) = each %$faces) {
2325 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2355 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2326 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2356 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2327 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2357 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2328 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2358 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2329 Coro::cede; 2359 Coro::cede;
2330 } 2360 }
2331 2361
2332 while (my ($face, $info) = each %$faces) { 2362 while (my ($face, $info) = each %$faces) {
2333 next unless $info->{smooth}; 2363 next unless $info->{smooth};
2334 my $idx = cf::face::find $face 2364 my $idx = cf::face::find $face
2335 or next; 2365 or next;
2336 if (my $smooth = cf::face::find $info->{smooth}) { 2366 if (my $smooth = cf::face::find $info->{smooth}) {
2337 cf::face::set_smooth $idx, $smooth; 2367 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
2338 } else { 2368 } else {
2339 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2369 warn "smooth face '$info->{smooth}' not found for face '$face'";
2340 } 2370 }
2341 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
2342 } 2384 }
2343 2385
2344 1 2386 1
2345} 2387}
2346 2388
… …
2600 2642
2601unshift @INC, $LIBDIR; 2643unshift @INC, $LIBDIR;
2602 2644
2603my $bug_warning = 0; 2645my $bug_warning = 0;
2604 2646
2647our @WAIT_FOR_TICK;
2648our @WAIT_FOR_TICK_BEGIN;
2649
2650sub wait_for_tick {
2651 my $signal = new Coro::Signal;
2652 push @WAIT_FOR_TICK, $signal;
2653 $signal->wait;
2654}
2655
2656sub wait_for_tick_begin {
2657 my $signal = new Coro::Signal;
2658 push @WAIT_FOR_TICK_BEGIN, $signal;
2659 $signal->wait;
2660}
2661
2605$TICK_WATCHER = Event->timer ( 2662$TICK_WATCHER = Event->timer (
2606 reentrant => 0, 2663 reentrant => 0,
2607 parked => 1, 2664 parked => 1,
2608 prio => 0, 2665 prio => 0,
2609 at => $NEXT_TICK || $TICK, 2666 at => $NEXT_TICK || $TICK,
… …
2627 write_runtime 2684 write_runtime
2628 or warn "ERROR: unable to write runtime file: $!"; 2685 or warn "ERROR: unable to write runtime file: $!";
2629 }; 2686 };
2630 } 2687 }
2631 2688
2632 $WAIT_FOR_TICK->broadcast; 2689 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2633 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2690 $sig->send;
2691 }
2692 while (my $sig = shift @WAIT_FOR_TICK) {
2693 $sig->send;
2694 }
2634 2695
2635# my $AFTER = Event::time; 2696# my $AFTER = Event::time;
2636# warn $AFTER - $NOW;#d# 2697# warn $AFTER - $NOW;#d#
2637 2698
2638 # if we are delayed by four ticks or more, skip them all 2699 # if we are delayed by four ticks or more, skip them all

Diff Legend

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