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.221 by pippijn, Fri Mar 2 13:32:52 2007 UTC vs.
Revision 1.252 by root, Wed Apr 18 15:28:18 2007 UTC

3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket;
8use Storable; 9use Storable;
10use Event;
9use Opcode; 11use Opcode;
10use Safe; 12use Safe;
11use Safe::Hole; 13use Safe::Hole;
12 14
13use Coro 3.5 (); 15use Coro 3.61 ();
16use Coro::State;
17use Coro::Handle;
14use Coro::Event; 18use Coro::Event;
15use Coro::Timer; 19use Coro::Timer;
16use Coro::Signal; 20use Coro::Signal;
17use Coro::Semaphore; 21use Coro::Semaphore;
18use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable;
19 24
20use BDB (); 25use BDB ();
21use Data::Dumper; 26use Data::Dumper;
22use Digest::MD5; 27use Digest::MD5;
23use Fcntl; 28use Fcntl;
29use YAML::Syck ();
24use IO::AIO 2.32 (); 30use IO::AIO 2.32 ();
25use YAML::Syck ();
26use Time::HiRes; 31use Time::HiRes;
27use Compress::LZF; 32use Compress::LZF;
28 33
34# configure various modules to our taste
35#
36$Storable::canonical = 1; # reduce rsync transfers
37Coro::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 38Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
30 39
31use Event; $Event::Eval = 1; # no idea why this is required, but it is 40$Event::Eval = 1; # no idea why this is required, but it is
32
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34 41
35# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 42# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
36$YAML::Syck::ImplicitUnicode = 1; 43$YAML::Syck::ImplicitUnicode = 1;
37 44
38$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 45$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
46
47sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
39 48
40our %COMMAND = (); 49our %COMMAND = ();
41our %COMMAND_TIME = (); 50our %COMMAND_TIME = ();
42 51
43our @EXTS = (); # list of extension package names 52our @EXTS = (); # list of extension package names
44our %EXTCMD = (); 53our %EXTCMD = ();
45our %EXT_CORO = (); # coroutines bound to extensions 54our %EXT_CORO = (); # coroutines bound to extensions
46our %EXT_MAP = (); # pluggable maps 55our %EXT_MAP = (); # pluggable maps
47 56
57our $RELOAD; # number of reloads so far
48our @EVENT; 58our @EVENT;
49our $LIBDIR = datadir . "/ext"; 59our $LIBDIR = datadir . "/ext";
50 60
51our $TICK = MAX_TIME * 1e-6; 61our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
52our $TICK_WATCHER; 62our $TICK_WATCHER;
53our $AIO_POLL_WATCHER; 63our $AIO_POLL_WATCHER;
54our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 64our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
55our $NEXT_TICK; 65our $NEXT_TICK;
56our $NOW; 66our $NOW;
68our %MAP; # all maps 78our %MAP; # all maps
69our $LINK_MAP; # the special {link} map, which is always available 79our $LINK_MAP; # the special {link} map, which is always available
70our $RANDOM_MAPS = cf::localdir . "/random"; 80our $RANDOM_MAPS = cf::localdir . "/random";
71our $BDB_ENV_DIR = cf::localdir . "/db"; 81our $BDB_ENV_DIR = cf::localdir . "/db";
72 82
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 ∕ 83# used to convert map paths into valid unix filenames by replacing / by ∕
77our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 84our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
78 85
79binmode STDOUT; 86binmode STDOUT;
80binmode STDERR; 87binmode STDERR;
128=item %cf::CFG 135=item %cf::CFG
129 136
130Configuration for the server, loaded from C</etc/crossfire/config>, or 137Configuration for the server, loaded from C</etc/crossfire/config>, or
131from wherever your confdir points to. 138from wherever your confdir points to.
132 139
133=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 140=item cf::wait_for_tick, cf::wait_for_tick_begin
134 141
135These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK) 142These 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 143returns 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 144per 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 145
140=back 146=back
141 147
142=cut 148=cut
143 149
144BEGIN { 150BEGIN {
145 *CORE::GLOBAL::warn = sub { 151 *CORE::GLOBAL::warn = sub {
146 my $msg = join "", @_; 152 my $msg = join "", @_;
147 utf8::encode $msg;
148 153
149 $msg .= "\n" 154 $msg .= "\n"
150 unless $msg =~ /\n$/; 155 unless $msg =~ /\n$/;
151 156
157 $msg =~ s/([\x00-\x09\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
158
159 utf8::encode $msg;
152 LOG llevError, $msg; 160 LOG llevError, $msg;
153 }; 161 };
154} 162}
155 163
156@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 164@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
202 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 210 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
203 $d 211 $d
204 } || "[unable to dump $_[0]: '$@']"; 212 } || "[unable to dump $_[0]: '$@']";
205} 213}
206 214
207use JSON::Syck (); # TODO# replace by JSON::PC once working 215use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
208 216
209=item $ref = cf::from_json $json 217=item $ref = cf::from_json $json
210 218
211Converts a JSON string into the corresponding perl data structure. 219Converts a JSON string into the corresponding perl data structure.
212 220
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 221=item $json = cf::to_json $ref
221 222
222Converts a perl data structure into its JSON representation. 223Converts 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 224
231=item cf::lock_wait $string 225=item cf::lock_wait $string
232 226
233Wait until the given lock is available. See cf::lock_acquire. 227Wait until the given lock is available. See cf::lock_acquire.
234 228
379 373
380 aio_rename "$runtime~", $runtime 374 aio_rename "$runtime~", $runtime
381 and return; 375 and return;
382 376
383 1 377 1
378}
379
380=item cf::datalog type => key => value, ...
381
382Log a datalog packet of the given type with the given key-value pairs.
383
384=cut
385
386sub datalog($@) {
387 my ($type, %kv) = @_;
388 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
384} 389}
385 390
386=back 391=back
387 392
388=cut 393=cut
960} 965}
961 966
962sub path($) { 967sub path($) {
963 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 968 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
964 969
965 (playerdir $login) . "/$login.pl" 970 (playerdir $login) . "/playerdata"
966} 971}
967 972
968sub find_active($) { 973sub find_active($) {
969 $cf::PLAYER{$_[0]} 974 $cf::PLAYER{$_[0]}
970 and $cf::PLAYER{$_[0]}->active 975 and $cf::PLAYER{$_[0]}->active
983 my $login = $_[0]; 988 my $login = $_[0];
984 989
985 my $guard = cf::lock_acquire "user_find:$login"; 990 my $guard = cf::lock_acquire "user_find:$login";
986 991
987 $cf::PLAYER{$_[0]} || do { 992 $cf::PLAYER{$_[0]} || do {
993 # rename old playerfiles to new ones
994 #TODO: remove when no longer required
995 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
996 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
997 aio_unlink +(playerdir $login) . "/$login.pl.pst";
998 aio_unlink +(playerdir $login) . "/$login.pl";
999
988 my $pl = load_pl path $login 1000 my $pl = load_pl path $login
989 or return; 1001 or return;
990 $cf::PLAYER{$login} = $pl 1002 $cf::PLAYER{$login} = $pl
991 } 1003 }
992 } 1004 }
1121 } 1133 }
1122 1134
1123 \@paths 1135 \@paths
1124} 1136}
1125 1137
1126=item $player->ext_reply ($msgid, $msgtype, %msg) 1138=item $player->ext_reply ($msgid, %msg)
1127 1139
1128Sends an ext reply to the player. 1140Sends an ext reply to the player.
1129 1141
1130=cut 1142=cut
1131 1143
1132sub ext_reply($$$%) { 1144sub ext_reply($$%) {
1133 my ($self, $id, %msg) = @_; 1145 my ($self, $id, %msg) = @_;
1134 1146
1135 $msg{msgid} = $id; 1147 $msg{msgid} = $id;
1136 1148
1137 $self->send ("ext " . cf::to_json \%msg); 1149 $self->send ("ext " . cf::to_json \%msg);
1138} 1150}
1139 1151
1140package cf; 1152=item $player->ext_event ($type, %msg)
1153
1154Sends an ext event to the client.
1155
1156=cut
1157
1158sub ext_event($$%) {
1159 my ($self, $type, %msg) = @_;
1160
1161 $self->ns->ext_event ($type, %msg);
1162}
1163
1164=head3 cf::region
1165
1166=over 4
1167
1168=cut
1169
1170package cf::region;
1171
1172=item cf::region::find_by_path $path
1173
1174Tries to decuce the probable region for a map knowing only its path.
1175
1176=cut
1177
1178sub find_by_path($) {
1179 my ($path) = @_;
1180
1181 my ($match, $specificity);
1182
1183 for my $region (list) {
1184 if ($region->match && $path =~ $region->match) {
1185 ($match, $specificity) = ($region, $region->specificity)
1186 if $region->specificity > $specificity;
1187 }
1188 }
1189
1190 $match
1191}
1141 1192
1142=back 1193=back
1143
1144 1194
1145=head3 cf::map 1195=head3 cf::map
1146 1196
1147=over 4 1197=over 4
1148 1198
1379 $self->load_header_orig 1429 $self->load_header_orig
1380 or return; 1430 or return;
1381 $self->prepare_orig; 1431 $self->prepare_orig;
1382 } 1432 }
1383 1433
1434 $self->default_region (cf::region::find_by_path $self->{path})
1435 unless $self->default_region;
1436
1384 1 1437 1
1385} 1438}
1386 1439
1387sub find; 1440sub find;
1388sub find { 1441sub find {
1430 $self->in_memory (cf::MAP_LOADING); 1483 $self->in_memory (cf::MAP_LOADING);
1431 1484
1432 $self->alloc; 1485 $self->alloc;
1433 1486
1434 $self->pre_load; 1487 $self->pre_load;
1488 Coro::cede;
1435 1489
1436 $self->_load_objects ($self->{load_path}, 1) 1490 $self->_load_objects ($self->{load_path}, 1)
1437 or return; 1491 or return;
1438 1492
1439 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1493 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1446 $self->_load_objects ($uniq, 0); 1500 $self->_load_objects ($uniq, 0);
1447 } 1501 }
1448 } 1502 }
1449 1503
1450 Coro::cede; 1504 Coro::cede;
1451
1452 # now do the right thing for maps 1505 # now do the right thing for maps
1453 $self->link_multipart_objects; 1506 $self->link_multipart_objects;
1507 Coro::cede;
1454 1508
1455 unless ($self->{deny_activate}) { 1509 unless ($self->{deny_activate}) {
1456 $self->decay_objects; 1510 $self->decay_objects;
1457 $self->fix_auto_apply; 1511 $self->fix_auto_apply;
1458 $self->update_buttons; 1512 $self->update_buttons;
1460 $self->set_darkness_map; 1514 $self->set_darkness_map;
1461 $self->difficulty ($self->estimate_difficulty) 1515 $self->difficulty ($self->estimate_difficulty)
1462 unless $self->difficulty; 1516 unless $self->difficulty;
1463 Coro::cede; 1517 Coro::cede;
1464 $self->activate; 1518 $self->activate;
1519 Coro::cede;
1465 } 1520 }
1466 1521
1467 $self->post_load; 1522 $self->post_load;
1523 Coro::cede;
1468 1524
1469 $self->in_memory (cf::MAP_IN_MEMORY); 1525 $self->in_memory (cf::MAP_IN_MEMORY);
1470} 1526}
1471 1527
1472sub customise_for { 1528sub customise_for {
1950 2006
1951 return unless $self->type == cf::PLAYER; 2007 return unless $self->type == cf::PLAYER;
1952 2008
1953 if ($exit->slaying eq "/!") { 2009 if ($exit->slaying eq "/!") {
1954 #TODO: this should de-fi-ni-te-ly not be a sync-job 2010 #TODO: this should de-fi-ni-te-ly not be a sync-job
2011 # the problem is that $exit might not survive long enough
2012 # so it needs to be done right now, right here
1955 cf::sync_job { prepare_random_map $exit }; 2013 cf::sync_job { prepare_random_map $exit };
1956 } 2014 }
1957 2015
1958 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2016 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1959 my $hp = $exit->stats->hp; 2017 my $hp = $exit->stats->hp;
1967 $self->goto ($slaying, $hp, $sp); 2025 $self->goto ($slaying, $hp, $sp);
1968 2026
1969 1; 2027 1;
1970 }) { 2028 }) {
1971 $self->message ("Something went wrong deep within the crossfire server. " 2029 $self->message ("Something went wrong deep within the crossfire server. "
1972 . "I'll try to bring you back to the map you were before. " 2030 . "I'll try to bring you back to the map you were before. "
1973 . "Please report this to the dungeon master!", 2031 . "Please report this to the dungeon master!",
1974 cf::NDI_UNIQUE | cf::NDI_RED); 2032 cf::NDI_UNIQUE | cf::NDI_RED);
1975 2033
1976 warn "ERROR in enter_exit: $@"; 2034 warn "ERROR in enter_exit: $@";
1977 $self->leave_link; 2035 $self->leave_link;
1978 } 2036 }
1979 })->prio (1); 2037 })->prio (1);
1992 2050
1993sub cf::client::send_drawinfo { 2051sub cf::client::send_drawinfo {
1994 my ($self, $text, $flags) = @_; 2052 my ($self, $text, $flags) = @_;
1995 2053
1996 utf8::encode $text; 2054 utf8::encode $text;
1997 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2055 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1998} 2056}
1999 2057
2058=item $client->ext_event ($type, %msg)
2059
2060Sends an exti event to the client.
2061
2062=cut
2063
2064sub cf::client::ext_event($$%) {
2065 my ($self, $type, %msg) = @_;
2066
2067 $msg{msgtype} = "event_$type";
2068 $self->send_packet ("ext " . cf::to_json \%msg);
2069}
2000 2070
2001=item $success = $client->query ($flags, "text", \&cb) 2071=item $success = $client->query ($flags, "text", \&cb)
2002 2072
2003Queues a query to the client, calling the given callback with 2073Queues a query to the client, calling the given callback with
2004the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2074the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2101 2171
2102# here we export the classes and methods available to script code 2172# here we export the classes and methods available to script code
2103 2173
2104=pod 2174=pod
2105 2175
2106The following fucntions and emthods are available within a safe environment: 2176The following functions and methods are available within a safe environment:
2107 2177
2108 cf::object contr pay_amount pay_player map 2178 cf::object contr pay_amount pay_player map
2109 cf::object::player player 2179 cf::object::player player
2110 cf::player peaceful 2180 cf::player peaceful
2111 cf::map trigger 2181 cf::map trigger
2196############################################################################# 2266#############################################################################
2197 2267
2198=head2 EXTENSION DATABASE SUPPORT 2268=head2 EXTENSION DATABASE SUPPORT
2199 2269
2200Crossfire maintains a very simple database for extension use. It can 2270Crossfire maintains a very simple database for extension use. It can
2201currently store anything that can be serialised using Storable, which 2271currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2202excludes objects. 2272convert to/from binary).
2203 2273
2204The parameter C<$family> should best start with the name of the extension 2274The parameter C<$family> should best start with the name of the extension
2205using it, it should be unique. 2275using it, it should be unique.
2206 2276
2207=over 4 2277=over 4
2230 BDB::CREATE | BDB::AUTO_COMMIT, 0666; 2300 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2231 cf::cleanup "db_open(db): $!" if $!; 2301 cf::cleanup "db_open(db): $!" if $!;
2232 }; 2302 };
2233 cf::cleanup "db_open(db): $@" if $@; 2303 cf::cleanup "db_open(db): $@" if $@;
2234 }; 2304 };
2235
2236 my $path = cf::localdir . "/database.pst";
2237 if (stat $path) {
2238 cf::sync_job {
2239 my $pst = Storable::retrieve $path;
2240
2241 cf::db_put (board => data => $pst->{board});
2242 cf::db_put (guildrules => data => $pst->{guildrules});
2243 cf::db_put (rent => balance => $pst->{rent}{balance});
2244 BDB::db_env_txn_checkpoint $DB_ENV;
2245
2246 unlink $path;
2247 };
2248 }
2249 } 2305 }
2250} 2306}
2251 2307
2252sub db_get($$) { 2308sub db_get($$) {
2253 my $key = "$_[0]/$_[1]"; 2309 my $key = "$_[0]/$_[1]";
2254 2310
2255 cf::sync_job { 2311 cf::sync_job {
2256 BDB::db_get $DB, undef, $key, my $data; 2312 BDB::db_get $DB, undef, $key, my $data;
2257 2313
2258 $! ? () 2314 $! ? ()
2259 : Compress::LZF::sthaw $data 2315 : $data
2260 } 2316 }
2261} 2317}
2262 2318
2263sub db_put($$$) { 2319sub db_put($$$) {
2264 BDB::dbreq_pri 4; 2320 BDB::dbreq_pri 4;
2265 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { }; 2321 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2266} 2322}
2323
2324=item cf::cache $id => [$paths...], $processversion => $process
2325
2326Generic caching function that returns the value of the resource $id,
2327caching and regenerating as required.
2328
2329This function can block.
2330
2331=cut
2332
2333sub cache {
2334 my ($id, $src, $processversion, $process) = @_;
2335
2336 my $meta =
2337 join "\x00",
2338 $processversion,
2339 map {
2340 aio_stat $_
2341 and Carp::croak "$_: $!";
2342
2343 ($_, (stat _)[7,9])
2344 } @$src;
2345
2346 my $dbmeta = db_get cache => "$id/meta";
2347 if ($dbmeta ne $meta) {
2348 # changed, we may need to process
2349
2350 my @data;
2351 my $md5;
2352
2353 for (0 .. $#$src) {
2354 0 <= aio_load $src->[$_], $data[$_]
2355 or Carp::croak "$src->[$_]: $!";
2356 }
2357
2358 # if processing is expensive, check
2359 # checksum first
2360 if (1) {
2361 $md5 =
2362 join "\x00",
2363 $processversion,
2364 map {
2365 Coro::cede;
2366 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2367 } 0.. $#$src;
2368
2369
2370 my $dbmd5 = db_get cache => "$id/md5";
2371 if ($dbmd5 eq $md5) {
2372 db_put cache => "$id/meta", $meta;
2373
2374 return db_get cache => "$id/data";
2375 }
2376 }
2377
2378 my $data = $process->(\@data);
2379
2380 db_put cache => "$id/data", $data;
2381 db_put cache => "$id/md5" , $md5;
2382 db_put cache => "$id/meta", $meta;
2383
2384 return $data;
2385 }
2386
2387 db_get cache => "$id/data"
2388}
2389
2390=item fork_call { }, $args
2391
2392Executes the given code block with the given arguments in a seperate
2393process, returning the results. Everything must be serialisable with
2394Coro::Storable. May, of course, block. Note that the executed sub may
2395never block itself or use any form of Event handling.
2396
2397=cut
2398
2399sub fork_call(&@) {
2400 my ($cb, @args) = @_;
2401
2402# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2403# or die "socketpair: $!";
2404 pipe my $fh1, my $fh2
2405 or die "pipe: $!";
2406
2407 if (my $pid = fork) {
2408 close $fh2;
2409
2410 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2411 $res = Coro::Storable::thaw $res;
2412
2413 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2414
2415 die $$res unless "ARRAY" eq ref $res;
2416
2417 return wantarray ? @$res : $res->[-1];
2418 } else {
2419 local $SIG{__WARN__};
2420 eval {
2421 local $SIG{__DIE__};
2422 close $fh1;
2423
2424 my @res = eval { $cb->(@args) };
2425 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2426 };
2427
2428 warn $@ if $@;
2429 _exit 0;
2430 }
2431}
2432
2433
2267 2434
2268############################################################################# 2435#############################################################################
2269# the server's init and main functions 2436# the server's init and main functions
2270 2437
2271sub init_resources { 2438sub load_facedata($) {
2439 my ($path) = @_;
2440
2441 warn "loading facedata from $path\n";
2442
2443 my $facedata;
2444 0 < aio_load $path, $facedata
2445 or die "$path: $!";
2446
2447 $facedata = Coro::Storable::thaw $facedata;
2448
2449 $facedata->{version} == 2
2450 or cf::cleanup "$path: version mismatch, cannot proceed.";
2451
2452 {
2453 my $faces = $facedata->{faceinfo};
2454
2455 while (my ($face, $info) = each %$faces) {
2456 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2457 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2458 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2459 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2460 Coro::cede;
2461 }
2462
2463 while (my ($face, $info) = each %$faces) {
2464 next unless $info->{smooth};
2465 my $idx = cf::face::find $face
2466 or next;
2467 if (my $smooth = cf::face::find $info->{smooth}) {
2468 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
2469 } else {
2470 warn "smooth face '$info->{smooth}' not found for face '$face'";
2471 }
2472 Coro::cede;
2473 }
2474 }
2475
2476 {
2477 my $anims = $facedata->{animinfo};
2478
2479 while (my ($anim, $info) = each %$anims) {
2480 cf::anim::set $anim, $info->{frames}, $info->{facings};
2481 Coro::cede;
2482 }
2483
2484 cf::anim::invalidate_all; # d'oh
2485 }
2486
2487 1
2488}
2489
2490sub reload_facedata {
2491 load_facedata sprintf "%s/facedata", cf::datadir
2492 or die "unable to load facedata\n";
2493}
2494
2495sub reload_regions {
2272 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2496 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2273 or die "unable to load regions file\n";#d# 2497 or die "unable to load regions file\n";
2498}
2499
2500sub reload_archetypes {
2501 load_resource_file sprintf "%s/archetypes", cf::datadir
2502 or die "unable to load archetypes\n";
2503}
2504
2505sub reload_treasures {
2506 load_resource_file sprintf "%s/treasures", cf::datadir
2507 or die "unable to load treasurelists\n";
2508}
2509
2510sub reload_resources {
2511 warn "reloading resource files...\n";
2512
2513 reload_regions;
2514 reload_facedata;
2515 reload_archetypes;
2516 reload_treasures;
2517
2518 warn "finished reloading resource files\n";
2519}
2520
2521sub init {
2522 reload_resources;
2274} 2523}
2275 2524
2276sub cfg_load { 2525sub cfg_load {
2277 open my $fh, "<:utf8", cf::confdir . "/config" 2526 open my $fh, "<:utf8", cf::confdir . "/config"
2278 or return; 2527 or return;
2290 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 2539 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2291 and die "WARNING: m(un)lockall failed: $!\n"; 2540 and die "WARNING: m(un)lockall failed: $!\n";
2292 }; 2541 };
2293 warn $@ if $@; 2542 warn $@ if $@;
2294 } 2543 }
2295}
2296
2297sub init {
2298 init_resources;
2299} 2544}
2300 2545
2301sub main { 2546sub main {
2302 # we must not ever block the main coroutine 2547 # we must not ever block the main coroutine
2303 local $Coro::idle = sub { 2548 local $Coro::idle = sub {
2371 2616
2372 warn Carp::longmess "post_cleanup backtrace" 2617 warn Carp::longmess "post_cleanup backtrace"
2373 if $make_core; 2618 if $make_core;
2374} 2619}
2375 2620
2376sub reload() { 2621sub do_reload_perl() {
2377 # can/must only be called in main 2622 # can/must only be called in main
2378 if ($Coro::current != $Coro::main) { 2623 if ($Coro::current != $Coro::main) {
2379 warn "can only reload from main coroutine"; 2624 warn "can only reload from main coroutine";
2380 return; 2625 return;
2381 } 2626 }
2406 Coro::cede; 2651 Coro::cede;
2407 last unless IO::AIO::nreqs || BDB::nreqs; 2652 last unless IO::AIO::nreqs || BDB::nreqs;
2408 warn "iterate..."; 2653 warn "iterate...";
2409 } 2654 }
2410 2655
2656 ++$RELOAD;
2657
2411 warn "cancelling all extension coros"; 2658 warn "cancelling all extension coros";
2412 $_->cancel for values %EXT_CORO; 2659 $_->cancel for values %EXT_CORO;
2413 %EXT_CORO = (); 2660 %EXT_CORO = ();
2414 2661
2415 warn "removing commands"; 2662 warn "removing commands";
2454 Symbol::delete_package "safe::$_" 2701 Symbol::delete_package "safe::$_"
2455 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2702 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2456 2703
2457 warn "unloading cf.pm \"a bit\""; 2704 warn "unloading cf.pm \"a bit\"";
2458 delete $INC{"cf.pm"}; 2705 delete $INC{"cf.pm"};
2706 delete $INC{"cf/pod.pm"};
2459 2707
2460 # don't, removes xs symbols, too, 2708 # don't, removes xs symbols, too,
2461 # and global variables created in xs 2709 # and global variables created in xs
2462 #Symbol::delete_package __PACKAGE__; 2710 #Symbol::delete_package __PACKAGE__;
2463 2711
2472 2720
2473 warn "loading extensions"; 2721 warn "loading extensions";
2474 cf::load_extensions; 2722 cf::load_extensions;
2475 2723
2476 warn "reattaching attachments to objects/players"; 2724 warn "reattaching attachments to objects/players";
2477 _global_reattach; 2725 _global_reattach; # objects, sockets
2478 warn "reattaching attachments to maps"; 2726 warn "reattaching attachments to maps";
2479 reattach $_ for values %MAP; 2727 reattach $_ for values %MAP;
2480 2728 warn "reattaching attachments to players";
2481 warn "loading reloadable resources"; 2729 reattach $_ for values %PLAYER;
2482 init_resources;
2483 2730
2484 warn "leaving sync_job"; 2731 warn "leaving sync_job";
2485 2732
2486 1 2733 1
2487 } or do { 2734 } or do {
2493 warn "reloaded"; 2740 warn "reloaded";
2494}; 2741};
2495 2742
2496our $RELOAD_WATCHER; # used only during reload 2743our $RELOAD_WATCHER; # used only during reload
2497 2744
2745sub reload_perl() {
2746 # doing reload synchronously and two reloads happen back-to-back,
2747 # coro crashes during coro_state_free->destroy here.
2748
2749 $RELOAD_WATCHER ||= Event->timer (
2750 reentrant => 0,
2751 after => 0,
2752 data => WF_AUTOCANCEL,
2753 cb => sub {
2754 do_reload_perl;
2755 undef $RELOAD_WATCHER;
2756 },
2757 );
2758}
2759
2498register_command "reload" => sub { 2760register_command "reload" => sub {
2499 my ($who, $arg) = @_; 2761 my ($who, $arg) = @_;
2500 2762
2501 if ($who->flag (FLAG_WIZ)) { 2763 if ($who->flag (FLAG_WIZ)) {
2502 $who->message ("reloading server."); 2764 $who->message ("reloading server.");
2503 2765 async { reload_perl };
2504 # doing reload synchronously and two reloads happen back-to-back,
2505 # coro crashes during coro_state_free->destroy here.
2506
2507 $RELOAD_WATCHER ||= Event->timer (
2508 reentrant => 0,
2509 after => 0,
2510 data => WF_AUTOCANCEL,
2511 cb => sub {
2512 reload;
2513 undef $RELOAD_WATCHER;
2514 },
2515 );
2516 } 2766 }
2517}; 2767};
2518 2768
2519unshift @INC, $LIBDIR; 2769unshift @INC, $LIBDIR;
2520 2770
2521my $bug_warning = 0; 2771my $bug_warning = 0;
2772
2773our @WAIT_FOR_TICK;
2774our @WAIT_FOR_TICK_BEGIN;
2775
2776sub wait_for_tick {
2777 return unless $TICK_WATCHER->is_active;
2778 return if $Coro::current == $Coro::main;
2779
2780 my $signal = new Coro::Signal;
2781 push @WAIT_FOR_TICK, $signal;
2782 $signal->wait;
2783}
2784
2785sub wait_for_tick_begin {
2786 return unless $TICK_WATCHER->is_active;
2787 return if $Coro::current == $Coro::main;
2788
2789 my $signal = new Coro::Signal;
2790 push @WAIT_FOR_TICK_BEGIN, $signal;
2791 $signal->wait;
2792}
2522 2793
2523$TICK_WATCHER = Event->timer ( 2794$TICK_WATCHER = Event->timer (
2524 reentrant => 0, 2795 reentrant => 0,
2525 parked => 1, 2796 parked => 1,
2526 prio => 0, 2797 prio => 0,
2534 } 2805 }
2535 2806
2536 $NOW = Event::time; 2807 $NOW = Event::time;
2537 2808
2538 cf::server_tick; # one server iteration 2809 cf::server_tick; # one server iteration
2810
2539 $RUNTIME += $TICK; 2811 $RUNTIME += $TICK;
2540 $NEXT_TICK += $TICK; 2812 $NEXT_TICK += $TICK;
2541 2813
2542 if ($NOW >= $NEXT_RUNTIME_WRITE) { 2814 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2543 $NEXT_RUNTIME_WRITE = $NOW + 10; 2815 $NEXT_RUNTIME_WRITE = $NOW + 10;
2545 write_runtime 2817 write_runtime
2546 or warn "ERROR: unable to write runtime file: $!"; 2818 or warn "ERROR: unable to write runtime file: $!";
2547 }; 2819 };
2548 } 2820 }
2549 2821
2550 $WAIT_FOR_TICK->broadcast;
2551 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2552
2553# my $AFTER = Event::time; 2822# my $AFTER = Event::time;
2554# warn $AFTER - $NOW;#d# 2823# warn $AFTER - $NOW;#d#
2555 2824
2556 # if we are delayed by four ticks or more, skip them all 2825 # if we are delayed by four ticks or more, skip them all
2557 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2826 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2558 2827
2559 $TICK_WATCHER->at ($NEXT_TICK); 2828 $TICK_WATCHER->at ($NEXT_TICK);
2560 $TICK_WATCHER->start; 2829 $TICK_WATCHER->start;
2830
2831 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2832 $sig->send;
2833 }
2834 while (my $sig = shift @WAIT_FOR_TICK) {
2835 $sig->send;
2836 }
2837
2838 _post_tick;
2561 }, 2839 },
2562); 2840);
2563 2841
2564{ 2842{
2565 BDB::max_poll_time $TICK * 0.1; 2843 BDB::max_poll_time $TICK * 0.1;
2624 prio => 6, 2902 prio => 6,
2625 cb => \&IO::AIO::poll_cb, 2903 cb => \&IO::AIO::poll_cb,
2626 ); 2904 );
2627} 2905}
2628 2906
2907# load additional modules
2908use cf::pod;
2909
2629END { cf::emergency_save } 2910END { cf::emergency_save }
2630 2911
26311 29121
2632 2913

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines