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.224 by root, Mon Mar 12 21:42:12 2007 UTC vs.
Revision 1.249 by root, Wed Apr 18 12:43:54 2007 UTC

… …
9use Event; 9use Event;
10use Opcode; 10use Opcode;
11use Safe; 11use Safe;
12use Safe::Hole; 12use Safe::Hole;
13 13
14use Coro 3.52 (); 14use Coro 3.61 ();
15use Coro::State; 15use Coro::State;
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;
27use YAML::Syck ();
26use IO::AIO 2.32 (); 28use IO::AIO 2.32 ();
27use YAML::Syck ();
28use Time::HiRes; 29use Time::HiRes;
29use Compress::LZF; 30use Compress::LZF;
30 31
32# configure various modules to our taste
33#
34$Storable::canonical = 1; # reduce rsync transfers
31Coro::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
32Compress::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
37
33$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
34
35sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
36 39
37# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 40# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
38$YAML::Syck::ImplicitUnicode = 1; 41$YAML::Syck::ImplicitUnicode = 1;
39 42
40$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 43$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
44
45sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
41 46
42our %COMMAND = (); 47our %COMMAND = ();
43our %COMMAND_TIME = (); 48our %COMMAND_TIME = ();
44 49
45our @EXTS = (); # list of extension package names 50our @EXTS = (); # list of extension package names
… …
49 54
50our $RELOAD; # number of reloads so far 55our $RELOAD; # number of reloads so far
51our @EVENT; 56our @EVENT;
52our $LIBDIR = datadir . "/ext"; 57our $LIBDIR = datadir . "/ext";
53 58
54our $TICK = MAX_TIME * 1e-6; 59our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
55our $TICK_WATCHER; 60our $TICK_WATCHER;
56our $AIO_POLL_WATCHER; 61our $AIO_POLL_WATCHER;
57our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 62our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
58our $NEXT_TICK; 63our $NEXT_TICK;
59our $NOW; 64our $NOW;
… …
71our %MAP; # all maps 76our %MAP; # all maps
72our $LINK_MAP; # the special {link} map, which is always available 77our $LINK_MAP; # the special {link} map, which is always available
73our $RANDOM_MAPS = cf::localdir . "/random"; 78our $RANDOM_MAPS = cf::localdir . "/random";
74our $BDB_ENV_DIR = cf::localdir . "/db"; 79our $BDB_ENV_DIR = cf::localdir . "/db";
75 80
76our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
77our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
78
79# 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 ∕
80our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 82our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
81 83
82binmode STDOUT; 84binmode STDOUT;
83binmode STDERR; 85binmode STDERR;
… …
131=item %cf::CFG 133=item %cf::CFG
132 134
133Configuration for the server, loaded from C</etc/crossfire/config>, or 135Configuration for the server, loaded from C</etc/crossfire/config>, or
134from wherever your confdir points to. 136from wherever your confdir points to.
135 137
136=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 138=item cf::wait_for_tick, cf::wait_for_tick_begin
137 139
138These 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
139or 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
140processing 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.
141window of cpu time available, or simply to synchronise to the server tick.
142 143
143=back 144=back
144 145
145=cut 146=cut
146 147
… …
205 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 206 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
206 $d 207 $d
207 } || "[unable to dump $_[0]: '$@']"; 208 } || "[unable to dump $_[0]: '$@']";
208} 209}
209 210
210use JSON::Syck (); # TODO# replace by JSON::PC once working 211use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
211 212
212=item $ref = cf::from_json $json 213=item $ref = cf::from_json $json
213 214
214Converts a JSON string into the corresponding perl data structure. 215Converts a JSON string into the corresponding perl data structure.
215 216
216=cut
217
218sub from_json($) {
219 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
220 JSON::Syck::Load $_[0]
221}
222
223=item $json = cf::to_json $ref 217=item $json = cf::to_json $ref
224 218
225Converts a perl data structure into its JSON representation. 219Converts a perl data structure into its JSON representation.
226
227=cut
228
229sub to_json($) {
230 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
231 JSON::Syck::Dump $_[0]
232}
233 220
234=item cf::lock_wait $string 221=item cf::lock_wait $string
235 222
236Wait until the given lock is available. See cf::lock_acquire. 223Wait until the given lock is available. See cf::lock_acquire.
237 224
… …
382 369
383 aio_rename "$runtime~", $runtime 370 aio_rename "$runtime~", $runtime
384 and return; 371 and return;
385 372
386 1 373 1
374}
375
376=item cf::datalog type => key => value, ...
377
378Log a datalog packet of the given type with the given key-value pairs.
379
380=cut
381
382sub datalog($@) {
383 my ($type, %kv) = @_;
384 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
387} 385}
388 386
389=back 387=back
390 388
391=cut 389=cut
… …
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 }
… …
1124 } 1129 }
1125 1130
1126 \@paths 1131 \@paths
1127} 1132}
1128 1133
1129=item $player->ext_reply ($msgid, $msgtype, %msg) 1134=item $player->ext_reply ($msgid, %msg)
1130 1135
1131Sends an ext reply to the player. 1136Sends an ext reply to the player.
1132 1137
1133=cut 1138=cut
1134 1139
1135sub ext_reply($$$%) { 1140sub ext_reply($$%) {
1136 my ($self, $id, %msg) = @_; 1141 my ($self, $id, %msg) = @_;
1137 1142
1138 $msg{msgid} = $id; 1143 $msg{msgid} = $id;
1139 1144
1140 $self->send ("ext " . cf::to_json \%msg); 1145 $self->send ("ext " . cf::to_json \%msg);
1141} 1146}
1142 1147
1143package cf; 1148=item $player->ext_event ($type, %msg)
1149
1150Sends an ext event to the client.
1151
1152=cut
1153
1154sub ext_event($$%) {
1155 my ($self, $type, %msg) = @_;
1156
1157 $self->ns->ext_event ($type, %msg);
1158}
1159
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}
1144 1188
1145=back 1189=back
1146
1147 1190
1148=head3 cf::map 1191=head3 cf::map
1149 1192
1150=over 4 1193=over 4
1151 1194
… …
1382 $self->load_header_orig 1425 $self->load_header_orig
1383 or return; 1426 or return;
1384 $self->prepare_orig; 1427 $self->prepare_orig;
1385 } 1428 }
1386 1429
1430 $self->default_region (cf::region::find_by_path $self->{path})
1431 unless $self->default_region;
1432
1387 1 1433 1
1388} 1434}
1389 1435
1390sub find; 1436sub find;
1391sub find { 1437sub find {
… …
1433 $self->in_memory (cf::MAP_LOADING); 1479 $self->in_memory (cf::MAP_LOADING);
1434 1480
1435 $self->alloc; 1481 $self->alloc;
1436 1482
1437 $self->pre_load; 1483 $self->pre_load;
1484 Coro::cede;
1438 1485
1439 $self->_load_objects ($self->{load_path}, 1) 1486 $self->_load_objects ($self->{load_path}, 1)
1440 or return; 1487 or return;
1441 1488
1442 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1489 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
… …
1449 $self->_load_objects ($uniq, 0); 1496 $self->_load_objects ($uniq, 0);
1450 } 1497 }
1451 } 1498 }
1452 1499
1453 Coro::cede; 1500 Coro::cede;
1454
1455 # now do the right thing for maps 1501 # now do the right thing for maps
1456 $self->link_multipart_objects; 1502 $self->link_multipart_objects;
1503 Coro::cede;
1457 1504
1458 unless ($self->{deny_activate}) { 1505 unless ($self->{deny_activate}) {
1459 $self->decay_objects; 1506 $self->decay_objects;
1460 $self->fix_auto_apply; 1507 $self->fix_auto_apply;
1461 $self->update_buttons; 1508 $self->update_buttons;
… …
1463 $self->set_darkness_map; 1510 $self->set_darkness_map;
1464 $self->difficulty ($self->estimate_difficulty) 1511 $self->difficulty ($self->estimate_difficulty)
1465 unless $self->difficulty; 1512 unless $self->difficulty;
1466 Coro::cede; 1513 Coro::cede;
1467 $self->activate; 1514 $self->activate;
1515 Coro::cede;
1468 } 1516 }
1469 1517
1470 $self->post_load; 1518 $self->post_load;
1519 Coro::cede;
1471 1520
1472 $self->in_memory (cf::MAP_IN_MEMORY); 1521 $self->in_memory (cf::MAP_IN_MEMORY);
1473} 1522}
1474 1523
1475sub customise_for { 1524sub customise_for {
… …
1953 2002
1954 return unless $self->type == cf::PLAYER; 2003 return unless $self->type == cf::PLAYER;
1955 2004
1956 if ($exit->slaying eq "/!") { 2005 if ($exit->slaying eq "/!") {
1957 #TODO: this should de-fi-ni-te-ly not be a sync-job 2006 #TODO: this should de-fi-ni-te-ly not be a sync-job
2007 # the problem is that $exit might not survive long enough
2008 # so it needs to be done right now, right here
1958 cf::sync_job { prepare_random_map $exit }; 2009 cf::sync_job { prepare_random_map $exit };
1959 } 2010 }
1960 2011
1961 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2012 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1962 my $hp = $exit->stats->hp; 2013 my $hp = $exit->stats->hp;
… …
1970 $self->goto ($slaying, $hp, $sp); 2021 $self->goto ($slaying, $hp, $sp);
1971 2022
1972 1; 2023 1;
1973 }) { 2024 }) {
1974 $self->message ("Something went wrong deep within the crossfire server. " 2025 $self->message ("Something went wrong deep within the crossfire server. "
1975 . "I'll try to bring you back to the map you were before. " 2026 . "I'll try to bring you back to the map you were before. "
1976 . "Please report this to the dungeon master!", 2027 . "Please report this to the dungeon master!",
1977 cf::NDI_UNIQUE | cf::NDI_RED); 2028 cf::NDI_UNIQUE | cf::NDI_RED);
1978 2029
1979 warn "ERROR in enter_exit: $@"; 2030 warn "ERROR in enter_exit: $@";
1980 $self->leave_link; 2031 $self->leave_link;
1981 } 2032 }
1982 })->prio (1); 2033 })->prio (1);
… …
1995 2046
1996sub cf::client::send_drawinfo { 2047sub cf::client::send_drawinfo {
1997 my ($self, $text, $flags) = @_; 2048 my ($self, $text, $flags) = @_;
1998 2049
1999 utf8::encode $text; 2050 utf8::encode $text;
2000 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2051 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2001} 2052}
2002 2053
2054=item $client->ext_event ($type, %msg)
2055
2056Sends an exti event to the client.
2057
2058=cut
2059
2060sub cf::client::ext_event($$%) {
2061 my ($self, $type, %msg) = @_;
2062
2063 $msg{msgtype} = "event_$type";
2064 $self->send_packet ("ext " . cf::to_json \%msg);
2065}
2003 2066
2004=item $success = $client->query ($flags, "text", \&cb) 2067=item $success = $client->query ($flags, "text", \&cb)
2005 2068
2006Queues a query to the client, calling the given callback with 2069Queues a query to the client, calling the given callback with
2007the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2070the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
… …
2104 2167
2105# here we export the classes and methods available to script code 2168# here we export the classes and methods available to script code
2106 2169
2107=pod 2170=pod
2108 2171
2109The following fucntions and emthods are available within a safe environment: 2172The following functions and methods are available within a safe environment:
2110 2173
2111 cf::object contr pay_amount pay_player map 2174 cf::object contr pay_amount pay_player map
2112 cf::object::player player 2175 cf::object::player player
2113 cf::player peaceful 2176 cf::player peaceful
2114 cf::map trigger 2177 cf::map trigger
… …
2266sub db_put($$$) { 2329sub db_put($$$) {
2267 BDB::dbreq_pri 4; 2330 BDB::dbreq_pri 4;
2268 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { }; 2331 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2269} 2332}
2270 2333
2334=item cf::cache $id => ...
2335
2336Generic caching function that returns the value of the resource $id,
2337caching and regenerating as required.
2338
2339This function can block.
2340
2341 source => filename returning the data (must be a scalar)
2342 expensive => true == try to cache harder
2343 filter => sub that processes the data into a scalar
2344
2345=cut
2346
2347sub cache {
2348 my ($id, %arg) = @_;
2349
2350 aio_stat $arg{source}
2351 and Carp::croak "$arg{source}: $!";
2352
2353 my $meta = join ":", (stat _)[7,9];
2354 my $md5;
2355
2356 if ($arg{expensive}) {
2357 0 <= aio_load $arg{source}, my $buf
2358 or Carp::croak "$arg{source}: $!";
2359
2360 $md5 = Digest::MD5::md5_hex $buf;
2361 }
2362
2363 my $dbmeta = db_get "$id/meta";
2364 if ($dbmeta ne $meta) {
2365 # changed, we need to process
2366 } else {
2367 # just fetch
2368 }
2369
2370
2371}
2372
2271############################################################################# 2373#############################################################################
2272# the server's init and main functions 2374# the server's init and main functions
2273 2375
2274sub load_faces { 2376sub load_facedata($) {
2275 my $path = sprintf "%s/faces", cf::datadir; 2377 my ($path) = @_;
2276 2378
2277 warn "loading faces from $path\n"; 2379 warn "loading facedata from $path\n";
2278 2380
2279 my $faces; 2381 my $facedata;
2280 0 < aio_load $path, $faces 2382 0 < aio_load $path, $facedata
2281 or die "$path: $!"; 2383 or die "$path: $!";
2282 2384
2283 Coro::cede;
2284 $faces = Storable::thaw $faces; 2385 $facedata = Coro::Storable::thaw $facedata;
2285 Coro::cede;
2286 2386
2387 $facedata->{version} == 2
2388 or cf::cleanup "$path: version mismatch, cannot proceed.";
2389
2390 {
2391 my $faces = $facedata->{faceinfo};
2392
2287 while (my ($face, $info) = each %$faces) { 2393 while (my ($face, $info) = each %$faces) {
2288 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2394 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2289 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2395 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2290 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2396 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2397 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2291 Coro::cede; 2398 Coro::cede;
2399 }
2400
2401 while (my ($face, $info) = each %$faces) {
2402 next unless $info->{smooth};
2403 my $idx = cf::face::find $face
2404 or next;
2405 if (my $smooth = cf::face::find $info->{smooth}) {
2406 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
2407 } else {
2408 warn "smooth face '$info->{smooth}' not found for face '$face'";
2409 }
2410 Coro::cede;
2411 }
2412 }
2413
2414 {
2415 my $anims = $facedata->{animinfo};
2416
2417 while (my ($anim, $info) = each %$anims) {
2418 cf::anim::set $anim, $info->{frames}, $info->{facings};
2419 Coro::cede;
2420 }
2421
2422 cf::anim::invalidate_all; # d'oh
2292 } 2423 }
2293 2424
2294 1 2425 1
2295} 2426}
2296 2427
2428sub reload_facedata {
2429 load_facedata sprintf "%s/facedata", cf::datadir
2430 or die "unable to load facedata\n";
2431}
2432
2433sub reload_regions {
2434 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2435 or die "unable to load regions file\n";
2436}
2437
2438sub reload_archetypes {
2439 load_resource_file sprintf "%s/archetypes", cf::datadir
2440 or die "unable to load archetypes\n";
2441}
2442
2443sub reload_treasures {
2444 load_resource_file sprintf "%s/treasures", cf::datadir
2445 or die "unable to load treasurelists\n";
2446}
2447
2297sub reload_resources { 2448sub reload_resources {
2298 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2449 warn "reloading resource files...\n";
2299 or die "unable to load regions file\n";#d# 2450
2451 reload_regions;
2300 load_faces 2452 reload_facedata;
2301 or die "unable to load faces\n";#d# 2453 reload_archetypes;
2454 reload_treasures;
2455
2456 warn "finished reloading resource files\n";
2302} 2457}
2303 2458
2304sub init { 2459sub init {
2305 reload_resources; 2460 reload_resources;
2306} 2461}
… …
2399 2554
2400 warn Carp::longmess "post_cleanup backtrace" 2555 warn Carp::longmess "post_cleanup backtrace"
2401 if $make_core; 2556 if $make_core;
2402} 2557}
2403 2558
2404sub reload() { 2559sub do_reload_perl() {
2405 # can/must only be called in main 2560 # can/must only be called in main
2406 if ($Coro::current != $Coro::main) { 2561 if ($Coro::current != $Coro::main) {
2407 warn "can only reload from main coroutine"; 2562 warn "can only reload from main coroutine";
2408 return; 2563 return;
2409 } 2564 }
… …
2508 warn "reattaching attachments to maps"; 2663 warn "reattaching attachments to maps";
2509 reattach $_ for values %MAP; 2664 reattach $_ for values %MAP;
2510 warn "reattaching attachments to players"; 2665 warn "reattaching attachments to players";
2511 reattach $_ for values %PLAYER; 2666 reattach $_ for values %PLAYER;
2512 2667
2513 warn "loading reloadable resources";
2514 reload_resources;
2515
2516 warn "leaving sync_job"; 2668 warn "leaving sync_job";
2517 2669
2518 1 2670 1
2519 } or do { 2671 } or do {
2520 warn $@; 2672 warn $@;
… …
2525 warn "reloaded"; 2677 warn "reloaded";
2526}; 2678};
2527 2679
2528our $RELOAD_WATCHER; # used only during reload 2680our $RELOAD_WATCHER; # used only during reload
2529 2681
2682sub reload_perl() {
2683 # doing reload synchronously and two reloads happen back-to-back,
2684 # coro crashes during coro_state_free->destroy here.
2685
2686 $RELOAD_WATCHER ||= Event->timer (
2687 reentrant => 0,
2688 after => 0,
2689 data => WF_AUTOCANCEL,
2690 cb => sub {
2691 do_reload_perl;
2692 undef $RELOAD_WATCHER;
2693 },
2694 );
2695}
2696
2530register_command "reload" => sub { 2697register_command "reload" => sub {
2531 my ($who, $arg) = @_; 2698 my ($who, $arg) = @_;
2532 2699
2533 if ($who->flag (FLAG_WIZ)) { 2700 if ($who->flag (FLAG_WIZ)) {
2534 $who->message ("reloading server."); 2701 $who->message ("reloading server.");
2535 2702 async { reload_perl };
2536 # doing reload synchronously and two reloads happen back-to-back,
2537 # coro crashes during coro_state_free->destroy here.
2538
2539 $RELOAD_WATCHER ||= Event->timer (
2540 reentrant => 0,
2541 after => 0,
2542 data => WF_AUTOCANCEL,
2543 cb => sub {
2544 reload;
2545 undef $RELOAD_WATCHER;
2546 },
2547 );
2548 } 2703 }
2549}; 2704};
2550 2705
2551unshift @INC, $LIBDIR; 2706unshift @INC, $LIBDIR;
2552 2707
2553my $bug_warning = 0; 2708my $bug_warning = 0;
2709
2710our @WAIT_FOR_TICK;
2711our @WAIT_FOR_TICK_BEGIN;
2712
2713sub wait_for_tick {
2714 return unless $TICK_WATCHER->is_active;
2715 return if $Coro::current == $Coro::main;
2716
2717 my $signal = new Coro::Signal;
2718 push @WAIT_FOR_TICK, $signal;
2719 $signal->wait;
2720}
2721
2722sub wait_for_tick_begin {
2723 return unless $TICK_WATCHER->is_active;
2724 return if $Coro::current == $Coro::main;
2725
2726 my $signal = new Coro::Signal;
2727 push @WAIT_FOR_TICK_BEGIN, $signal;
2728 $signal->wait;
2729}
2554 2730
2555$TICK_WATCHER = Event->timer ( 2731$TICK_WATCHER = Event->timer (
2556 reentrant => 0, 2732 reentrant => 0,
2557 parked => 1, 2733 parked => 1,
2558 prio => 0, 2734 prio => 0,
… …
2566 } 2742 }
2567 2743
2568 $NOW = Event::time; 2744 $NOW = Event::time;
2569 2745
2570 cf::server_tick; # one server iteration 2746 cf::server_tick; # one server iteration
2747
2571 $RUNTIME += $TICK; 2748 $RUNTIME += $TICK;
2572 $NEXT_TICK += $TICK; 2749 $NEXT_TICK += $TICK;
2573 2750
2574 if ($NOW >= $NEXT_RUNTIME_WRITE) { 2751 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2575 $NEXT_RUNTIME_WRITE = $NOW + 10; 2752 $NEXT_RUNTIME_WRITE = $NOW + 10;
… …
2577 write_runtime 2754 write_runtime
2578 or warn "ERROR: unable to write runtime file: $!"; 2755 or warn "ERROR: unable to write runtime file: $!";
2579 }; 2756 };
2580 } 2757 }
2581 2758
2582 $WAIT_FOR_TICK->broadcast;
2583 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2584
2585# my $AFTER = Event::time; 2759# my $AFTER = Event::time;
2586# warn $AFTER - $NOW;#d# 2760# warn $AFTER - $NOW;#d#
2587 2761
2588 # if we are delayed by four ticks or more, skip them all 2762 # if we are delayed by four ticks or more, skip them all
2589 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2763 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2590 2764
2591 $TICK_WATCHER->at ($NEXT_TICK); 2765 $TICK_WATCHER->at ($NEXT_TICK);
2592 $TICK_WATCHER->start; 2766 $TICK_WATCHER->start;
2767
2768 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2769 $sig->send;
2770 }
2771 while (my $sig = shift @WAIT_FOR_TICK) {
2772 $sig->send;
2773 }
2774
2775 _post_tick;
2593 }, 2776 },
2594); 2777);
2595 2778
2596{ 2779{
2597 BDB::max_poll_time $TICK * 0.1; 2780 BDB::max_poll_time $TICK * 0.1;
… …
2656 prio => 6, 2839 prio => 6,
2657 cb => \&IO::AIO::poll_cb, 2840 cb => \&IO::AIO::poll_cb,
2658 ); 2841 );
2659} 2842}
2660 2843
2844# load additional modules
2845use cf::pod;
2846
2661END { cf::emergency_save } 2847END { cf::emergency_save }
2662 2848
26631 28491
2664 2850

Diff Legend

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