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.219 by root, Sat Feb 17 03:19:44 2007 UTC vs.
Revision 1.246 by root, Tue Apr 17 10:38:28 2007 UTC

… …
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Storable; 8use Storable;
9use Event;
9use Opcode; 10use Opcode;
10use Safe; 11use Safe;
11use Safe::Hole; 12use Safe::Hole;
12 13
13use Coro 3.5 (); 14use Coro 3.61 ();
15use Coro::State;
14use Coro::Event; 16use Coro::Event;
15use Coro::Timer; 17use Coro::Timer;
16use Coro::Signal; 18use Coro::Signal;
17use Coro::Semaphore; 19use Coro::Semaphore;
18use Coro::AIO; 20use Coro::AIO;
21use Coro::Storable;
19 22
20use BDB (); 23use BDB ();
21use Data::Dumper; 24use Data::Dumper;
22use Digest::MD5; 25use Digest::MD5;
23use Fcntl; 26use Fcntl;
27use YAML::Syck ();
24use IO::AIO 2.32 (); 28use IO::AIO 2.32 ();
25use YAML::Syck ();
26use Time::HiRes; 29use Time::HiRes;
27use Compress::LZF; 30use Compress::LZF;
28 31
32# configure various modules to our taste
33#
34$Storable::canonical = 1; # reduce rsync transfers
35Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
29Compress::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
30 37
31use Event; $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
32
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34 39
35# 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?
36$YAML::Syck::ImplicitUnicode = 1; 41$YAML::Syck::ImplicitUnicode = 1;
37 42
38$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
39 46
40our %COMMAND = (); 47our %COMMAND = ();
41our %COMMAND_TIME = (); 48our %COMMAND_TIME = ();
42 49
43our @EXTS = (); # list of extension package names 50our @EXTS = (); # list of extension package names
44our %EXTCMD = (); 51our %EXTCMD = ();
45our %EXT_CORO = (); # coroutines bound to extensions 52our %EXT_CORO = (); # coroutines bound to extensions
46our %EXT_MAP = (); # pluggable maps 53our %EXT_MAP = (); # pluggable maps
47 54
55our $RELOAD; # number of reloads so far
48our @EVENT; 56our @EVENT;
49our $LIBDIR = datadir . "/ext"; 57our $LIBDIR = datadir . "/ext";
50 58
51our $TICK = MAX_TIME * 1e-6; 59our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
52our $TICK_WATCHER; 60our $TICK_WATCHER;
53our $AIO_POLL_WATCHER; 61our $AIO_POLL_WATCHER;
54our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 62our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
55our $NEXT_TICK; 63our $NEXT_TICK;
56our $NOW; 64our $NOW;
… …
68our %MAP; # all maps 76our %MAP; # all maps
69our $LINK_MAP; # the special {link} map, which is always available 77our $LINK_MAP; # the special {link} map, which is always available
70our $RANDOM_MAPS = cf::localdir . "/random"; 78our $RANDOM_MAPS = cf::localdir . "/random";
71our $BDB_ENV_DIR = cf::localdir . "/db"; 79our $BDB_ENV_DIR = cf::localdir . "/db";
72 80
73our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
74our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
75
76# 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 ∕
77our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 82our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
78 83
79binmode STDOUT; 84binmode STDOUT;
80binmode STDERR; 85binmode STDERR;
… …
128=item %cf::CFG 133=item %cf::CFG
129 134
130Configuration for the server, loaded from C</etc/crossfire/config>, or 135Configuration for the server, loaded from C</etc/crossfire/config>, or
131from wherever your confdir points to. 136from wherever your confdir points to.
132 137
133=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 138=item cf::wait_for_tick, cf::wait_for_tick_begin
134 139
135These 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
136or 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
137processing 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.
138window of cpu time available, or simply to synchronise to the server tick.
139 143
140=back 144=back
141 145
142=cut 146=cut
143 147
… …
202 $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;
203 $d 207 $d
204 } || "[unable to dump $_[0]: '$@']"; 208 } || "[unable to dump $_[0]: '$@']";
205} 209}
206 210
207use JSON::Syck (); # TODO# replace by JSON::PC once working 211use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
208 212
209=item $ref = cf::from_json $json 213=item $ref = cf::from_json $json
210 214
211Converts a JSON string into the corresponding perl data structure. 215Converts a JSON string into the corresponding perl data structure.
212 216
213=cut
214
215sub from_json($) {
216 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
217 JSON::Syck::Load $_[0]
218}
219
220=item $json = cf::to_json $ref 217=item $json = cf::to_json $ref
221 218
222Converts a perl data structure into its JSON representation. 219Converts a perl data structure into its JSON representation.
223
224=cut
225
226sub to_json($) {
227 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
228 JSON::Syck::Dump $_[0]
229}
230 220
231=item cf::lock_wait $string 221=item cf::lock_wait $string
232 222
233Wait until the given lock is available. See cf::lock_acquire. 223Wait until the given lock is available. See cf::lock_acquire.
234 224
… …
379 369
380 aio_rename "$runtime~", $runtime 370 aio_rename "$runtime~", $runtime
381 and return; 371 and return;
382 372
383 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 });
384} 385}
385 386
386=back 387=back
387 388
388=cut 389=cut
… …
960} 961}
961 962
962sub path($) { 963sub path($) {
963 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 964 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
964 965
965 (playerdir $login) . "/$login.pl" 966 (playerdir $login) . "/playerdata"
966} 967}
967 968
968sub find_active($) { 969sub find_active($) {
969 $cf::PLAYER{$_[0]} 970 $cf::PLAYER{$_[0]}
970 and $cf::PLAYER{$_[0]}->active 971 and $cf::PLAYER{$_[0]}->active
… …
983 my $login = $_[0]; 984 my $login = $_[0];
984 985
985 my $guard = cf::lock_acquire "user_find:$login"; 986 my $guard = cf::lock_acquire "user_find:$login";
986 987
987 $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
988 my $pl = load_pl path $login 996 my $pl = load_pl path $login
989 or return; 997 or return;
990 $cf::PLAYER{$login} = $pl 998 $cf::PLAYER{$login} = $pl
991 } 999 }
992 } 1000 }
… …
1029 1037
1030=cut 1038=cut
1031 1039
1032sub quit_character { 1040sub quit_character {
1033 my ($pl) = @_; 1041 my ($pl) = @_;
1042
1043 my $name = $pl->ob->name;
1034 1044
1035 $pl->{deny_save} = 1; 1045 $pl->{deny_save} = 1;
1036 $pl->password ("*"); # this should lock out the player until we nuked the dir 1046 $pl->password ("*"); # this should lock out the player until we nuked the dir
1037 1047
1038 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1048 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
… …
1043 my $path = playerdir $pl; 1053 my $path = playerdir $pl;
1044 my $temp = "$path~$cf::RUNTIME~deleting~"; 1054 my $temp = "$path~$cf::RUNTIME~deleting~";
1045 aio_rename $path, $temp; 1055 aio_rename $path, $temp;
1046 delete $cf::PLAYER{$pl->ob->name}; 1056 delete $cf::PLAYER{$pl->ob->name};
1047 $pl->destroy; 1057 $pl->destroy;
1058
1059 my $prefix = qr<^~\Q$name\E/>;
1060
1061 # nuke player maps
1062 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1063
1048 IO::AIO::aio_rmtree $temp; 1064 IO::AIO::aio_rmtree $temp;
1065}
1066
1067=item $pl->kick
1068
1069Kicks a player out of the game. This destroys the connection.
1070
1071=cut
1072
1073sub kick {
1074 my ($pl, $kicker) = @_;
1075
1076 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1077 $pl->killer ("kicked");
1078 $pl->ns->destroy;
1049} 1079}
1050 1080
1051=item cf::player::list_logins 1081=item cf::player::list_logins
1052 1082
1053Returns am arrayref of all valid playernames in the system, can take a 1083Returns am arrayref of all valid playernames in the system, can take a
… …
1099 } 1129 }
1100 1130
1101 \@paths 1131 \@paths
1102} 1132}
1103 1133
1104=item $player->ext_reply ($msgid, $msgtype, %msg) 1134=item $player->ext_reply ($msgid, %msg)
1105 1135
1106Sends an ext reply to the player. 1136Sends an ext reply to the player.
1107 1137
1108=cut 1138=cut
1109 1139
1110sub ext_reply($$$%) { 1140sub ext_reply($$%) {
1111 my ($self, $id, %msg) = @_; 1141 my ($self, $id, %msg) = @_;
1112 1142
1113 $msg{msgid} = $id; 1143 $msg{msgid} = $id;
1114 1144
1115 $self->send ("ext " . cf::to_json \%msg); 1145 $self->send ("ext " . cf::to_json \%msg);
1116} 1146}
1117 1147
1118package 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}
1119 1188
1120=back 1189=back
1121
1122 1190
1123=head3 cf::map 1191=head3 cf::map
1124 1192
1125=over 4 1193=over 4
1126 1194
… …
1357 $self->load_header_orig 1425 $self->load_header_orig
1358 or return; 1426 or return;
1359 $self->prepare_orig; 1427 $self->prepare_orig;
1360 } 1428 }
1361 1429
1430 $self->default_region (cf::region::find_by_path $self->{path})
1431 unless $self->default_region;
1432
1362 1 1433 1
1363} 1434}
1364 1435
1365sub find; 1436sub find;
1366sub find { 1437sub find {
… …
1408 $self->in_memory (cf::MAP_LOADING); 1479 $self->in_memory (cf::MAP_LOADING);
1409 1480
1410 $self->alloc; 1481 $self->alloc;
1411 1482
1412 $self->pre_load; 1483 $self->pre_load;
1484 Coro::cede;
1413 1485
1414 $self->_load_objects ($self->{load_path}, 1) 1486 $self->_load_objects ($self->{load_path}, 1)
1415 or return; 1487 or return;
1416 1488
1417 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1489 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
… …
1424 $self->_load_objects ($uniq, 0); 1496 $self->_load_objects ($uniq, 0);
1425 } 1497 }
1426 } 1498 }
1427 1499
1428 Coro::cede; 1500 Coro::cede;
1429
1430 # now do the right thing for maps 1501 # now do the right thing for maps
1431 $self->link_multipart_objects; 1502 $self->link_multipart_objects;
1503 Coro::cede;
1432 1504
1433 unless ($self->{deny_activate}) { 1505 unless ($self->{deny_activate}) {
1434 $self->decay_objects; 1506 $self->decay_objects;
1435 $self->fix_auto_apply; 1507 $self->fix_auto_apply;
1436 $self->update_buttons; 1508 $self->update_buttons;
… …
1438 $self->set_darkness_map; 1510 $self->set_darkness_map;
1439 $self->difficulty ($self->estimate_difficulty) 1511 $self->difficulty ($self->estimate_difficulty)
1440 unless $self->difficulty; 1512 unless $self->difficulty;
1441 Coro::cede; 1513 Coro::cede;
1442 $self->activate; 1514 $self->activate;
1515 Coro::cede;
1443 } 1516 }
1444 1517
1445 $self->post_load; 1518 $self->post_load;
1519 Coro::cede;
1446 1520
1447 $self->in_memory (cf::MAP_IN_MEMORY); 1521 $self->in_memory (cf::MAP_IN_MEMORY);
1448} 1522}
1449 1523
1450sub customise_for { 1524sub customise_for {
… …
1928 2002
1929 return unless $self->type == cf::PLAYER; 2003 return unless $self->type == cf::PLAYER;
1930 2004
1931 if ($exit->slaying eq "/!") { 2005 if ($exit->slaying eq "/!") {
1932 #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
1933 cf::sync_job { prepare_random_map $exit }; 2009 cf::sync_job { prepare_random_map $exit };
1934 } 2010 }
1935 2011
1936 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;
1937 my $hp = $exit->stats->hp; 2013 my $hp = $exit->stats->hp;
… …
1945 $self->goto ($slaying, $hp, $sp); 2021 $self->goto ($slaying, $hp, $sp);
1946 2022
1947 1; 2023 1;
1948 }) { 2024 }) {
1949 $self->message ("Something went wrong deep within the crossfire server. " 2025 $self->message ("Something went wrong deep within the crossfire server. "
1950 . "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. "
1951 . "Please report this to the dungeon master!", 2027 . "Please report this to the dungeon master!",
1952 cf::NDI_UNIQUE | cf::NDI_RED); 2028 cf::NDI_UNIQUE | cf::NDI_RED);
1953 2029
1954 warn "ERROR in enter_exit: $@"; 2030 warn "ERROR in enter_exit: $@";
1955 $self->leave_link; 2031 $self->leave_link;
1956 } 2032 }
1957 })->prio (1); 2033 })->prio (1);
… …
1970 2046
1971sub cf::client::send_drawinfo { 2047sub cf::client::send_drawinfo {
1972 my ($self, $text, $flags) = @_; 2048 my ($self, $text, $flags) = @_;
1973 2049
1974 utf8::encode $text; 2050 utf8::encode $text;
1975 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2051 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1976} 2052}
1977 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}
1978 2066
1979=item $success = $client->query ($flags, "text", \&cb) 2067=item $success = $client->query ($flags, "text", \&cb)
1980 2068
1981Queues a query to the client, calling the given callback with 2069Queues a query to the client, calling the given callback with
1982the 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>,
… …
2079 2167
2080# here we export the classes and methods available to script code 2168# here we export the classes and methods available to script code
2081 2169
2082=pod 2170=pod
2083 2171
2084The following fucntions and emthods are available within a safe environment: 2172The following functions and methods are available within a safe environment:
2085 2173
2086 cf::object contr pay_amount pay_player map 2174 cf::object contr pay_amount pay_player map
2087 cf::object::player player 2175 cf::object::player player
2088 cf::player peaceful 2176 cf::player peaceful
2089 cf::map trigger 2177 cf::map trigger
… …
2244} 2332}
2245 2333
2246############################################################################# 2334#############################################################################
2247# the server's init and main functions 2335# the server's init and main functions
2248 2336
2249sub init_resources { 2337sub load_facedata($) {
2338 my ($path) = @_;
2339
2340 warn "loading facedata from $path\n";
2341
2342 my $facedata;
2343 0 < aio_load $path, $facedata
2344 or die "$path: $!";
2345
2346 $facedata = Coro::Storable::thaw $facedata;
2347
2348 $facedata->{version} == 2
2349 or cf::cleanup "$path: version mismatch, cannot proceed.";
2350
2351 {
2352 my $faces = $facedata->{faceinfo};
2353
2354 while (my ($face, $info) = each %$faces) {
2355 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2356 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2357 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2358 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2359 Coro::cede;
2360 }
2361
2362 while (my ($face, $info) = each %$faces) {
2363 next unless $info->{smooth};
2364 my $idx = cf::face::find $face
2365 or next;
2366 if (my $smooth = cf::face::find $info->{smooth}) {
2367 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
2368 } else {
2369 warn "smooth face '$info->{smooth}' not found for face '$face'";
2370 }
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
2384 }
2385
2386 1
2387}
2388
2389sub reload_facedata {
2390 load_facedata sprintf "%s/facedata", cf::datadir
2391 or die "unable to load facedata\n";
2392}
2393
2394sub reload_regions {
2250 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2395 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2251 or die "unable to load regions file\n";#d# 2396 or die "unable to load regions file\n";
2397}
2398
2399sub reload_archetypes {
2400 load_archetype_file sprintf "%s/archetypes", cf::datadir
2401 or die "unable to load archetypes\n";
2402}
2403
2404sub reload_treasures {
2405 load_treasure_file sprintf "%s/treasures", cf::datadir
2406 or die "unable to load treasurelists\n";
2407}
2408
2409sub reload_resources {
2410 warn "reloading resource files...\n";
2411
2412 reload_regions;
2413 reload_facedata;
2414 reload_archetypes;
2415 reload_treasures;
2416
2417 warn "finished reloading resource files\n";
2418}
2419
2420sub init {
2421 reload_resources;
2252} 2422}
2253 2423
2254sub cfg_load { 2424sub cfg_load {
2255 open my $fh, "<:utf8", cf::confdir . "/config" 2425 open my $fh, "<:utf8", cf::confdir . "/config"
2256 or return; 2426 or return;
… …
2268 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 2438 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2269 and die "WARNING: m(un)lockall failed: $!\n"; 2439 and die "WARNING: m(un)lockall failed: $!\n";
2270 }; 2440 };
2271 warn $@ if $@; 2441 warn $@ if $@;
2272 } 2442 }
2273}
2274
2275sub init {
2276 init_resources;
2277} 2443}
2278 2444
2279sub main { 2445sub main {
2280 # we must not ever block the main coroutine 2446 # we must not ever block the main coroutine
2281 local $Coro::idle = sub { 2447 local $Coro::idle = sub {
… …
2349 2515
2350 warn Carp::longmess "post_cleanup backtrace" 2516 warn Carp::longmess "post_cleanup backtrace"
2351 if $make_core; 2517 if $make_core;
2352} 2518}
2353 2519
2354sub reload() { 2520sub do_reload_perl() {
2355 # can/must only be called in main 2521 # can/must only be called in main
2356 if ($Coro::current != $Coro::main) { 2522 if ($Coro::current != $Coro::main) {
2357 warn "can only reload from main coroutine"; 2523 warn "can only reload from main coroutine";
2358 return; 2524 return;
2359 } 2525 }
… …
2384 Coro::cede; 2550 Coro::cede;
2385 last unless IO::AIO::nreqs || BDB::nreqs; 2551 last unless IO::AIO::nreqs || BDB::nreqs;
2386 warn "iterate..."; 2552 warn "iterate...";
2387 } 2553 }
2388 2554
2555 ++$RELOAD;
2556
2389 warn "cancelling all extension coros"; 2557 warn "cancelling all extension coros";
2390 $_->cancel for values %EXT_CORO; 2558 $_->cancel for values %EXT_CORO;
2391 %EXT_CORO = (); 2559 %EXT_CORO = ();
2392 2560
2393 warn "removing commands"; 2561 warn "removing commands";
… …
2450 2618
2451 warn "loading extensions"; 2619 warn "loading extensions";
2452 cf::load_extensions; 2620 cf::load_extensions;
2453 2621
2454 warn "reattaching attachments to objects/players"; 2622 warn "reattaching attachments to objects/players";
2455 _global_reattach; 2623 _global_reattach; # objects, sockets
2456 warn "reattaching attachments to maps"; 2624 warn "reattaching attachments to maps";
2457 reattach $_ for values %MAP; 2625 reattach $_ for values %MAP;
2458 2626 warn "reattaching attachments to players";
2459 warn "loading reloadable resources"; 2627 reattach $_ for values %PLAYER;
2460 init_resources;
2461 2628
2462 warn "leaving sync_job"; 2629 warn "leaving sync_job";
2463 2630
2464 1 2631 1
2465 } or do { 2632 } or do {
… …
2471 warn "reloaded"; 2638 warn "reloaded";
2472}; 2639};
2473 2640
2474our $RELOAD_WATCHER; # used only during reload 2641our $RELOAD_WATCHER; # used only during reload
2475 2642
2643sub reload_perl() {
2644 # doing reload synchronously and two reloads happen back-to-back,
2645 # coro crashes during coro_state_free->destroy here.
2646
2647 $RELOAD_WATCHER ||= Event->timer (
2648 reentrant => 0,
2649 after => 0,
2650 data => WF_AUTOCANCEL,
2651 cb => sub {
2652 do_reload_perl;
2653 undef $RELOAD_WATCHER;
2654 },
2655 );
2656}
2657
2476register_command "reload" => sub { 2658register_command "reload" => sub {
2477 my ($who, $arg) = @_; 2659 my ($who, $arg) = @_;
2478 2660
2479 if ($who->flag (FLAG_WIZ)) { 2661 if ($who->flag (FLAG_WIZ)) {
2480 $who->message ("reloading server."); 2662 $who->message ("reloading server.");
2481 2663 async { reload_perl };
2482 # doing reload synchronously and two reloads happen back-to-back,
2483 # coro crashes during coro_state_free->destroy here.
2484
2485 $RELOAD_WATCHER ||= Event->timer (
2486 reentrant => 0,
2487 after => 0,
2488 data => WF_AUTOCANCEL,
2489 cb => sub {
2490 reload;
2491 undef $RELOAD_WATCHER;
2492 },
2493 );
2494 } 2664 }
2495}; 2665};
2496 2666
2497unshift @INC, $LIBDIR; 2667unshift @INC, $LIBDIR;
2498 2668
2499my $bug_warning = 0; 2669my $bug_warning = 0;
2670
2671our @WAIT_FOR_TICK;
2672our @WAIT_FOR_TICK_BEGIN;
2673
2674sub wait_for_tick {
2675 return unless $TICK_WATCHER->is_active;
2676 return if $Coro::current == $Coro::main;
2677
2678 my $signal = new Coro::Signal;
2679 push @WAIT_FOR_TICK, $signal;
2680 $signal->wait;
2681}
2682
2683sub wait_for_tick_begin {
2684 return unless $TICK_WATCHER->is_active;
2685 return if $Coro::current == $Coro::main;
2686
2687 my $signal = new Coro::Signal;
2688 push @WAIT_FOR_TICK_BEGIN, $signal;
2689 $signal->wait;
2690}
2500 2691
2501$TICK_WATCHER = Event->timer ( 2692$TICK_WATCHER = Event->timer (
2502 reentrant => 0, 2693 reentrant => 0,
2503 parked => 1, 2694 parked => 1,
2504 prio => 0, 2695 prio => 0,
… …
2512 } 2703 }
2513 2704
2514 $NOW = Event::time; 2705 $NOW = Event::time;
2515 2706
2516 cf::server_tick; # one server iteration 2707 cf::server_tick; # one server iteration
2708
2517 $RUNTIME += $TICK; 2709 $RUNTIME += $TICK;
2518 $NEXT_TICK += $TICK; 2710 $NEXT_TICK += $TICK;
2519 2711
2520 if ($NOW >= $NEXT_RUNTIME_WRITE) { 2712 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2521 $NEXT_RUNTIME_WRITE = $NOW + 10; 2713 $NEXT_RUNTIME_WRITE = $NOW + 10;
… …
2523 write_runtime 2715 write_runtime
2524 or warn "ERROR: unable to write runtime file: $!"; 2716 or warn "ERROR: unable to write runtime file: $!";
2525 }; 2717 };
2526 } 2718 }
2527 2719
2528 $WAIT_FOR_TICK->broadcast;
2529 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2530
2531# my $AFTER = Event::time; 2720# my $AFTER = Event::time;
2532# warn $AFTER - $NOW;#d# 2721# warn $AFTER - $NOW;#d#
2533 2722
2534 # if we are delayed by four ticks or more, skip them all 2723 # if we are delayed by four ticks or more, skip them all
2535 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2724 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2536 2725
2537 $TICK_WATCHER->at ($NEXT_TICK); 2726 $TICK_WATCHER->at ($NEXT_TICK);
2538 $TICK_WATCHER->start; 2727 $TICK_WATCHER->start;
2728
2729 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2730 $sig->send;
2731 }
2732 while (my $sig = shift @WAIT_FOR_TICK) {
2733 $sig->send;
2734 }
2735
2736 _post_tick;
2539 }, 2737 },
2540); 2738);
2541 2739
2542{ 2740{
2543 BDB::max_poll_time $TICK * 0.1; 2741 BDB::max_poll_time $TICK * 0.1;

Diff Legend

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