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.451 by root, Mon Sep 22 05:42:41 2008 UTC vs.
Revision 1.511 by root, Wed Apr 7 18:35:56 2010 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use 5.10.0;
25use utf8; 26use utf8;
26use strict "vars", "subs"; 27use strict qw(vars subs);
27 28
28use Symbol; 29use Symbol;
29use List::Util; 30use List::Util;
30use Socket; 31use Socket;
31use EV; 32use EV;
32use Opcode; 33use Opcode;
33use Safe; 34use Safe;
34use Safe::Hole; 35use Safe::Hole;
35use Storable (); 36use Storable ();
37use Carp ();
36 38
39use Guard ();
37use Coro (); 40use Coro ();
38use Coro::State; 41use Coro::State;
39use Coro::Handle; 42use Coro::Handle;
40use Coro::EV; 43use Coro::EV;
41use Coro::AnyEvent; 44use Coro::AnyEvent;
42use Coro::Timer; 45use Coro::Timer;
43use Coro::Signal; 46use Coro::Signal;
44use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
45use Coro::AnyEvent; 49use Coro::AnyEvent;
46use Coro::AIO; 50use Coro::AIO;
47use Coro::BDB 1.6; 51use Coro::BDB 1.6;
48use Coro::Storable; 52use Coro::Storable;
49use Coro::Util (); 53use Coro::Util ();
50 54
51use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
52use BDB (); 56use BDB ();
53use Data::Dumper; 57use Data::Dumper;
54use Digest::MD5;
55use Fcntl; 58use Fcntl;
56use YAML (); 59use YAML::XS ();
57use IO::AIO (); 60use IO::AIO ();
58use Time::HiRes; 61use Time::HiRes;
59use Compress::LZF; 62use Compress::LZF;
60use Digest::MD5 (); 63use Digest::MD5 ();
61 64
69$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
70 73
71# make sure c-lzf reinitialises itself 74# make sure c-lzf reinitialises itself
72Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
73Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 76Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
77
78# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
74 80
75sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
76 82
77our %COMMAND = (); 83our %COMMAND = ();
78our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
83our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
84our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
85 91
86our $RELOAD; # number of reloads so far, non-zero while in reload 92our $RELOAD; # number of reloads so far, non-zero while in reload
87our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
88 96
89our $CONFDIR = confdir; 97our $CONFDIR = confdir;
90our $DATADIR = datadir; 98our $DATADIR = datadir;
91our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
92our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
103our %RESOURCE; 111our %RESOURCE;
104 112
105our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
107our $NEXT_TICK; 115our $NEXT_TICK;
108our $USE_FSYNC = 1; # use fsync to write maps - default off 116our $USE_FSYNC = 1; # use fsync to write maps - default on
109 117
110our $BDB_DEADLOCK_WATCHER; 118our $BDB_DEADLOCK_WATCHER;
111our $BDB_CHECKPOINT_WATCHER; 119our $BDB_CHECKPOINT_WATCHER;
112our $BDB_TRICKLE_WATCHER; 120our $BDB_TRICKLE_WATCHER;
113our $DB_ENV; 121our $DB_ENV;
114 122
123our @EXTRA_MODULES = qw(pod match mapscript);
124
115our %CFG; 125our %CFG;
116 126
117our $UPTIME; $UPTIME ||= time; 127our $UPTIME; $UPTIME ||= time;
118our $RUNTIME; 128our $RUNTIME;
119our $NOW; 129our $NOW;
127 137
128our $LOAD; # a number between 0 (idle) and 1 (too many objects) 138our $LOAD; # a number between 0 (idle) and 1 (too many objects)
129our $LOADAVG; # same thing, but with alpha-smoothing 139our $LOADAVG; # same thing, but with alpha-smoothing
130our $JITTER; # average jitter 140our $JITTER; # average jitter
131our $TICK_START; # for load detecting purposes 141our $TICK_START; # for load detecting purposes
142
143our @POST_INIT;
144
145our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
146our $REALLY_UNLOOP; # never set to true, please :)
132 147
133binmode STDOUT; 148binmode STDOUT;
134binmode STDERR; 149binmode STDERR;
135 150
136# read virtual server time, if available 151# read virtual server time, if available
138 open my $fh, "<", $RUNTIMEFILE 153 open my $fh, "<", $RUNTIMEFILE
139 or die "unable to read $RUNTIMEFILE file: $!"; 154 or die "unable to read $RUNTIMEFILE file: $!";
140 $RUNTIME = <$fh> + 0.; 155 $RUNTIME = <$fh> + 0.;
141} 156}
142 157
158eval "sub TICK() { $TICK } 1" or die;
159
143mkdir $_ 160mkdir $_
144 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 161 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
145 162
146our $EMERGENCY_POSITION; 163our $EMERGENCY_POSITION;
147 164
148sub cf::map::normalise; 165sub cf::map::normalise;
166
167#############################################################################
168
169%REFLECT = ();
170for (@REFLECT) {
171 my $reflect = JSON::XS::decode_json $_;
172 $REFLECT{$reflect->{class}} = $reflect;
173}
174
175# this is decidedly evil
176$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
149 177
150############################################################################# 178#############################################################################
151 179
152=head2 GLOBAL VARIABLES 180=head2 GLOBAL VARIABLES
153 181
200returns directly I<after> the tick processing (and consequently, can only wake one process 228returns directly I<after> the tick processing (and consequently, can only wake one process
201per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 229per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
202 230
203=item @cf::INVOKE_RESULTS 231=item @cf::INVOKE_RESULTS
204 232
205This array contains the results of the last C<invoke ()> call. When 233This array contains the results of the last C<invoke ()> call. When
206C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 234C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
207that call. 235that call.
208 236
237=item %cf::REFLECT
238
239Contains, for each (C++) class name, a hash reference with information
240about object members (methods, scalars, arrays and flags) and other
241metadata, which is useful for introspection.
242
209=back 243=back
210 244
211=cut 245=cut
212 246
213BEGIN { 247$Coro::State::WARNHOOK = sub {
214 *CORE::GLOBAL::warn = sub {
215 my $msg = join "", @_; 248 my $msg = join "", @_;
216 249
217 $msg .= "\n" 250 $msg .= "\n"
218 unless $msg =~ /\n$/; 251 unless $msg =~ /\n$/;
219 252
220 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 253 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
221 254
222 LOG llevError, $msg; 255 LOG llevError, $msg;
223 }; 256};
224}
225 257
226$Coro::State::DIEHOOK = sub { 258$Coro::State::DIEHOOK = sub {
227 return unless $^S eq 0; # "eq", not "==" 259 return unless $^S eq 0; # "eq", not "=="
260
261 warn Carp::longmess $_[0];
228 262
229 if ($Coro::current == $Coro::main) {#d# 263 if ($Coro::current == $Coro::main) {#d#
230 warn "DIEHOOK called in main context, Coro bug?\n";#d# 264 warn "DIEHOOK called in main context, Coro bug?\n";#d#
231 return;#d# 265 return;#d#
232 }#d# 266 }#d#
233 267
234 # kill coroutine otherwise 268 # kill coroutine otherwise
235 warn Carp::longmess $_[0];
236 Coro::terminate 269 Coro::terminate
237}; 270};
238
239$SIG{__DIE__} = sub { }; #d#?
240 271
241@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 272@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
242@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 273@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
243@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 274@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
244@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 275@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
258)) { 289)) {
259 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
260} 291}
261 292
262$EV::DIED = sub { 293$EV::DIED = sub {
263 warn "error in event callback: @_"; 294 Carp::cluck "error in event callback: @_";
264}; 295};
265 296
266############################################################################# 297#############################################################################
267 298
268=head2 UTILITY FUNCTIONS 299=head2 UTILITY FUNCTIONS
305our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 336our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
306 337
307sub encode_json($) { $json_coder->encode ($_[0]) } 338sub encode_json($) { $json_coder->encode ($_[0]) }
308sub decode_json($) { $json_coder->decode ($_[0]) } 339sub decode_json($) { $json_coder->decode ($_[0]) }
309 340
341=item cf::post_init { BLOCK }
342
343Execute the given codeblock, I<after> all extensions have been (re-)loaded,
344but I<before> the server starts ticking again.
345
346The cdoeblock will have a single boolean argument to indicate whether this
347is a reload or not.
348
349=cut
350
351sub post_init(&) {
352 push @POST_INIT, shift;
353}
354
310=item cf::lock_wait $string 355=item cf::lock_wait $string
311 356
312Wait until the given lock is available. See cf::lock_acquire. 357Wait until the given lock is available. See cf::lock_acquire.
313 358
314=item my $lock = cf::lock_acquire $string 359=item my $lock = cf::lock_acquire $string
315 360
316Wait until the given lock is available and then acquires it and returns 361Wait until the given lock is available and then acquires it and returns
317a Coro::guard object. If the guard object gets destroyed (goes out of scope, 362a L<Guard> object. If the guard object gets destroyed (goes out of scope,
318for example when the coroutine gets canceled), the lock is automatically 363for example when the coroutine gets canceled), the lock is automatically
319returned. 364returned.
320 365
321Locks are *not* recursive, locking from the same coro twice results in a 366Locks are *not* recursive, locking from the same coro twice results in a
322deadlocked coro. 367deadlocked coro.
328 373
329Return true if the lock is currently active, i.e. somebody has locked it. 374Return true if the lock is currently active, i.e. somebody has locked it.
330 375
331=cut 376=cut
332 377
333our %LOCK; 378our $LOCKS = new Coro::SemaphoreSet;
334our %LOCKER;#d#
335 379
336sub lock_wait($) { 380sub lock_wait($) {
337 my ($key) = @_; 381 $LOCKS->wait ($_[0]);
338
339 if ($LOCKER{$key} == $Coro::current) {#d#
340 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
341 return;#d#
342 }#d#
343
344 # wait for lock, if any
345 while ($LOCK{$key}) {
346 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
347 push @{ $LOCK{$key} }, $Coro::current;
348 Coro::schedule;
349 }
350} 382}
351 383
352sub lock_acquire($) { 384sub lock_acquire($) {
353 my ($key) = @_; 385 $LOCKS->guard ($_[0])
354
355 # wait, to be sure we are not locked
356 lock_wait $key;
357
358 $LOCK{$key} = [];
359 $LOCKER{$key} = $Coro::current;#d#
360
361 Coro::guard {
362 delete $LOCKER{$key};#d#
363 # wake up all waiters, to be on the safe side
364 $_->ready for @{ delete $LOCK{$key} };
365 }
366} 386}
367 387
368sub lock_active($) { 388sub lock_active($) {
369 my ($key) = @_; 389 $LOCKS->count ($_[0]) < 1
370
371 ! ! $LOCK{$key}
372} 390}
373 391
374sub freeze_mainloop { 392sub freeze_mainloop {
375 tick_inhibit_inc; 393 tick_inhibit_inc;
376 394
377 Coro::guard \&tick_inhibit_dec; 395 &Guard::guard (\&tick_inhibit_dec);
378} 396}
379 397
380=item cf::periodic $interval, $cb 398=item cf::periodic $interval, $cb
381 399
382Like EV::periodic, but randomly selects a starting point so that the actions 400Like EV::periodic, but randomly selects a starting point so that the actions
405 423
406=cut 424=cut
407 425
408our @SLOT_QUEUE; 426our @SLOT_QUEUE;
409our $SLOT_QUEUE; 427our $SLOT_QUEUE;
428our $SLOT_DECAY = 0.9;
410 429
411$SLOT_QUEUE->cancel if $SLOT_QUEUE; 430$SLOT_QUEUE->cancel if $SLOT_QUEUE;
412$SLOT_QUEUE = Coro::async { 431$SLOT_QUEUE = Coro::async {
413 $Coro::current->desc ("timeslot manager"); 432 $Coro::current->desc ("timeslot manager");
414 433
415 my $signal = new Coro::Signal; 434 my $signal = new Coro::Signal;
435 my $busy;
416 436
417 while () { 437 while () {
418 next_job: 438 next_job:
439
419 my $avail = cf::till_tick; 440 my $avail = cf::till_tick;
420 if ($avail > 0.01) { 441
421 for (0 .. $#SLOT_QUEUE) { 442 for (0 .. $#SLOT_QUEUE) {
422 if ($SLOT_QUEUE[$_][0] < $avail) { 443 if ($SLOT_QUEUE[$_][0] <= $avail) {
444 $busy = 0;
423 my $job = splice @SLOT_QUEUE, $_, 1, (); 445 my $job = splice @SLOT_QUEUE, $_, 1, ();
424 $job->[2]->send; 446 $job->[2]->send;
425 Coro::cede; 447 Coro::cede;
426 goto next_job; 448 goto next_job;
427 } 449 } else {
450 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
428 } 451 }
429 } 452 }
430 453
431 if (@SLOT_QUEUE) { 454 if (@SLOT_QUEUE) {
432 # we do not use wait_for_tick() as it returns immediately when tick is inactive 455 # we do not use wait_for_tick() as it returns immediately when tick is inactive
433 push @cf::WAIT_FOR_TICK, $signal; 456 push @cf::WAIT_FOR_TICK, $signal;
434 $signal->wait; 457 $signal->wait;
435 } else { 458 } else {
459 $busy = 0;
436 Coro::schedule; 460 Coro::schedule;
437 } 461 }
438 } 462 }
439}; 463};
440 464
441sub get_slot($;$$) { 465sub get_slot($;$$) {
442 return if tick_inhibit || $Coro::current == $Coro::main; 466 return if tick_inhibit || $Coro::current == $Coro::main;
443 467
444 my ($time, $pri, $name) = @_; 468 my ($time, $pri, $name) = @_;
445 469
446 $time = $TICK * .6 if $time > $TICK * .6; 470 $time = clamp $time, 0.01, $TICK * .6;
471
447 my $sig = new Coro::Signal; 472 my $sig = new Coro::Signal;
448 473
449 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 474 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
450 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 475 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
451 $SLOT_QUEUE->ready; 476 $SLOT_QUEUE->ready;
1154 $decname, length $$rdata, scalar @$objs; 1179 $decname, length $$rdata, scalar @$objs;
1155 1180
1156 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1181 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1157 aio_chmod $fh, SAVE_MODE; 1182 aio_chmod $fh, SAVE_MODE;
1158 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1183 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1159 aio_fsync $fh if $cf::USE_FSYNC; 1184 if ($cf::USE_FSYNC) {
1185 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1186 aio_fsync $fh;
1187 }
1160 aio_close $fh; 1188 aio_close $fh;
1161 1189
1162 if (@$objs) { 1190 if (@$objs) {
1163 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1191 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1164 aio_chmod $fh, SAVE_MODE; 1192 aio_chmod $fh, SAVE_MODE;
1165 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1193 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1166 aio_write $fh, 0, (length $data), $data, 0; 1194 aio_write $fh, 0, (length $data), $data, 0;
1167 aio_fsync $fh if $cf::USE_FSYNC; 1195 if ($cf::USE_FSYNC) {
1196 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1197 aio_fsync $fh;
1198 }
1168 aio_close $fh; 1199 aio_close $fh;
1169 aio_rename "$filename.pst~", "$filename.pst"; 1200 aio_rename "$filename.pst~", "$filename.pst";
1170 } 1201 }
1171 } else { 1202 } else {
1172 aio_unlink "$filename.pst"; 1203 aio_unlink "$filename.pst";
1173 } 1204 }
1174 1205
1175 aio_rename "$filename~", $filename; 1206 aio_rename "$filename~", $filename;
1207
1208 $filename =~ s%/[^/]+$%%;
1209 aio_pathsync $filename if $cf::USE_FSYNC;
1176 } else { 1210 } else {
1177 warn "FATAL: $filename~: $!\n"; 1211 warn "unable to save objects: $filename~: $!\n";
1178 } 1212 }
1179 } else { 1213 } else {
1180 aio_unlink $filename; 1214 aio_unlink $filename;
1181 aio_unlink "$filename.pst"; 1215 aio_unlink "$filename.pst";
1182 } 1216 }
1273 my ($name, $cb) = @_; 1307 my ($name, $cb) = @_;
1274 1308
1275 $EXTICMD{$name} = $cb; 1309 $EXTICMD{$name} = $cb;
1276} 1310}
1277 1311
1312use File::Glob ();
1313
1278cf::player->attach ( 1314cf::player->attach (
1279 on_command => sub { 1315 on_unknown_command => sub {
1280 my ($pl, $name, $params) = @_; 1316 my ($pl, $name, $params) = @_;
1281 1317
1282 my $cb = $COMMAND{$name} 1318 my $cb = $COMMAND{$name}
1283 or return; 1319 or return;
1284 1320
1314 1350
1315 cf::override; 1351 cf::override;
1316 }, 1352 },
1317); 1353);
1318 1354
1355# "readahead" all extensions
1356sub cache_extensions {
1357 my $grp = IO::AIO::aio_group;
1358
1359 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1360 for (grep /\.ext$/, @{$_[0]}) {
1361 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1362 }
1363 };
1364
1365 $grp
1366}
1367
1319sub load_extensions { 1368sub load_extensions {
1320 cf::sync_job { 1369 cf::sync_job {
1321 my %todo; 1370 my %todo;
1322 1371
1323 for my $path (<$LIBDIR/*.ext>) { 1372 for my $path (<$LIBDIR/*.ext>) {
1350 . "\n};\n1"; 1399 . "\n};\n1";
1351 1400
1352 $todo{$base} = \%ext; 1401 $todo{$base} = \%ext;
1353 } 1402 }
1354 1403
1404 my $pass = 0;
1355 my %done; 1405 my %done;
1356 while (%todo) { 1406 while (%todo) {
1357 my $progress; 1407 my $progress;
1358 1408
1409 ++$pass;
1410
1411 ext:
1359 while (my ($k, $v) = each %todo) { 1412 while (my ($k, $v) = each %todo) {
1360 for (split /,\s*/, $v->{meta}{depends}) { 1413 for (split /,\s*/, $v->{meta}{depends}) {
1361 goto skip 1414 next ext
1362 unless exists $done{$_}; 1415 unless exists $done{$_};
1363 } 1416 }
1364 1417
1365 warn "... loading '$k' into '$v->{pkg}'\n"; 1418 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1366 1419
1367 unless (eval $v->{source}) { 1420 my $active = eval $v->{source};
1421
1422 if (length $@) {
1368 my $msg = $@ ? "$v->{path}: $@\n" 1423 warn "$v->{path}: $@\n";
1369 : "$v->{base}: extension inactive.\n";
1370 1424
1371 if (exists $v->{meta}{mandatory}) {
1372 warn $msg;
1373 cf::cleanup "mandatory extension failed to load, exiting."; 1425 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1374 } 1426 if exists $v->{meta}{mandatory};
1375 1427 } else {
1376 warn $msg; 1428 $done{$k} = delete $todo{$k};
1429 push @EXTS, $v->{pkg};
1430 $progress = 1;
1431
1432 warn "$v->{base}: extension inactive.\n"
1433 unless $active;
1377 } 1434 }
1378
1379 $done{$k} = delete $todo{$k};
1380 push @EXTS, $v->{pkg};
1381 $progress = 1;
1382 } 1435 }
1383 1436
1384 skip: 1437 unless ($progress) {
1385 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1438 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1386 unless $progress; 1439
1440 while (my ($k, $v) = each %todo) {
1441 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1442 if exists $v->{meta}{mandatory};
1443 }
1444 }
1387 } 1445 }
1388 }; 1446 };
1389} 1447}
1390 1448
1391############################################################################# 1449#############################################################################
1445 1503
1446sub exists($) { 1504sub exists($) {
1447 my ($login) = @_; 1505 my ($login) = @_;
1448 1506
1449 $cf::PLAYER{$login} 1507 $cf::PLAYER{$login}
1450 or cf::sync_job { !aio_stat path $login } 1508 or !aio_stat path $login
1451} 1509}
1452 1510
1453sub find($) { 1511sub find($) {
1454 return $cf::PLAYER{$_[0]} || do { 1512 return $cf::PLAYER{$_[0]} || do {
1455 my $login = $_[0]; 1513 my $login = $_[0];
1475 $cf::PLAYER{$login} = $pl 1533 $cf::PLAYER{$login} = $pl
1476 } 1534 }
1477 } 1535 }
1478} 1536}
1479 1537
1538cf::player->attach (
1539 on_load => sub {
1540 my ($pl, $path) = @_;
1541
1542 # restore slots saved in save, below
1543 my $slots = delete $pl->{_slots};
1544
1545 $pl->ob->current_weapon ($slots->[0]);
1546 $pl->combat_ob ($slots->[1]);
1547 $pl->ranged_ob ($slots->[2]);
1548 },
1549);
1550
1480sub save($) { 1551sub save($) {
1481 my ($pl) = @_; 1552 my ($pl) = @_;
1482 1553
1483 return if $pl->{deny_save}; 1554 return if $pl->{deny_save};
1484 1555
1489 1560
1490 aio_mkdir playerdir $pl, 0770; 1561 aio_mkdir playerdir $pl, 0770;
1491 $pl->{last_save} = $cf::RUNTIME; 1562 $pl->{last_save} = $cf::RUNTIME;
1492 1563
1493 cf::get_slot 0.01; 1564 cf::get_slot 0.01;
1565
1566 # save slots, to be restored later
1567 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1494 1568
1495 $pl->save_pl ($path); 1569 $pl->save_pl ($path);
1496 cf::cede_to_tick; 1570 cf::cede_to_tick;
1497} 1571}
1498 1572
1711 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1785 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1712 1786
1713 # mit "rum" bekleckern, nicht 1787 # mit "rum" bekleckern, nicht
1714 $self->_create_random_map ( 1788 $self->_create_random_map (
1715 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1789 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1716 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1790 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1717 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1791 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1718 $rmp->{exit_on_final_map}, 1792 $rmp->{exit_on_final_map},
1719 $rmp->{xsize}, $rmp->{ysize}, 1793 $rmp->{xsize}, $rmp->{ysize},
1720 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1794 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1721 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1795 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1851 1925
1852 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1853 "$UNIQUEDIR/$path" 1927 "$UNIQUEDIR/$path"
1854} 1928}
1855 1929
1856# and all this just because we cannot iterate over
1857# all maps in C++...
1858sub change_all_map_light {
1859 my ($change) = @_;
1860
1861 $_->change_map_light ($change)
1862 for grep $_->outdoor, values %cf::MAP;
1863}
1864
1865sub decay_objects { 1930sub decay_objects {
1866 my ($self) = @_; 1931 my ($self) = @_;
1867 1932
1868 return if $self->{deny_reset}; 1933 return if $self->{deny_reset};
1869 1934
1951sub find { 2016sub find {
1952 my ($path, $origin) = @_; 2017 my ($path, $origin) = @_;
1953 2018
1954 $path = normalise $path, $origin && $origin->path; 2019 $path = normalise $path, $origin && $origin->path;
1955 2020
1956 cf::lock_wait "map_data:$path";#d#remove 2021 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1957 cf::lock_wait "map_find:$path"; 2022 my $guard2 = cf::lock_acquire "map_find:$path";
1958 2023
1959 $cf::MAP{$path} || do { 2024 $cf::MAP{$path} || do {
1960 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1961 my $guard2 = cf::lock_acquire "map_find:$path";
1962
1963 my $map = new_from_path cf::map $path 2025 my $map = new_from_path cf::map $path
1964 or return; 2026 or return;
1965 2027
1966 $map->{last_save} = $cf::RUNTIME; 2028 $map->{last_save} = $cf::RUNTIME;
1967 2029
1979 2041
1980 $cf::MAP{$path} = $map 2042 $cf::MAP{$path} = $map
1981 } 2043 }
1982} 2044}
1983 2045
1984sub pre_load { } 2046sub pre_load { }
1985sub post_load { } 2047#sub post_load { } # XS
1986 2048
1987sub load { 2049sub load {
1988 my ($self) = @_; 2050 my ($self) = @_;
1989 2051
1990 local $self->{deny_reset} = 1; # loading can take a long time 2052 local $self->{deny_reset} = 1; # loading can take a long time
2035 unless ($self->{deny_activate}) { 2097 unless ($self->{deny_activate}) {
2036 $self->decay_objects; 2098 $self->decay_objects;
2037 $self->fix_auto_apply; 2099 $self->fix_auto_apply;
2038 $self->update_buttons; 2100 $self->update_buttons;
2039 cf::cede_to_tick; 2101 cf::cede_to_tick;
2040 $self->set_darkness_map;
2041 cf::cede_to_tick;
2042 $self->activate; 2102 $self->activate;
2043 } 2103 }
2044 2104
2045 $self->{last_save} = $cf::RUNTIME; 2105 $self->{last_save} = $cf::RUNTIME;
2046 $self->last_access ($cf::RUNTIME); 2106 $self->last_access ($cf::RUNTIME);
2049 } 2109 }
2050 2110
2051 $self->post_load; 2111 $self->post_load;
2052} 2112}
2053 2113
2114# customize the map for a given player, i.e.
2115# return the _real_ map. used by e.g. per-player
2116# maps to change the path to ~playername/mappath
2054sub customise_for { 2117sub customise_for {
2055 my ($self, $ob) = @_; 2118 my ($self, $ob) = @_;
2056 2119
2057 return find "~" . $ob->name . "/" . $self->{path} 2120 return find "~" . $ob->name . "/" . $self->{path}
2058 if $self->per_player; 2121 if $self->per_player;
2212 2275
2213 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2276 my $lock = cf::lock_acquire "map_data:$self->{path}";
2214 2277
2215 return if $self->players; 2278 return if $self->players;
2216 2279
2217 warn "resetting map ", $self->path; 2280 warn "resetting map ", $self->path, "\n";
2218 2281
2219 $self->in_memory (cf::MAP_SWAPPED); 2282 $self->in_memory (cf::MAP_SWAPPED);
2220 2283
2221 # need to save uniques path 2284 # need to save uniques path
2222 unless ($self->{deny_save}) { 2285 unless ($self->{deny_save}) {
2313 : normalise $_ 2376 : normalise $_
2314 } @{ aio_readdir $UNIQUEDIR or [] } 2377 } @{ aio_readdir $UNIQUEDIR or [] }
2315 ] 2378 ]
2316} 2379}
2317 2380
2381=item cf::map::static_maps
2382
2383Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2384file in the shared directory excluding F</styles> and F</editor>). May
2385block.
2386
2387=cut
2388
2389sub static_maps() {
2390 my @dirs = "";
2391 my @maps;
2392
2393 while (@dirs) {
2394 my $dir = shift @dirs;
2395
2396 next if $dir eq "/styles" || $dir eq "/editor";
2397
2398 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2399 or return;
2400
2401 for (@$files) {
2402 s/\.map$// or next;
2403 utf8::decode $_;
2404 push @maps, "$dir/$_";
2405 }
2406
2407 push @dirs, map "$dir/$_", @$dirs;
2408 }
2409
2410 \@maps
2411}
2412
2318=back 2413=back
2319 2414
2320=head3 cf::object 2415=head3 cf::object
2321 2416
2322=cut 2417=cut
2387 2482
2388our $SAY_CHANNEL = { 2483our $SAY_CHANNEL = {
2389 id => "say", 2484 id => "say",
2390 title => "Map", 2485 title => "Map",
2391 reply => "say ", 2486 reply => "say ",
2392 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2487 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2393}; 2488};
2394 2489
2395our $CHAT_CHANNEL = { 2490our $CHAT_CHANNEL = {
2396 id => "chat", 2491 id => "chat",
2397 title => "Chat", 2492 title => "Chat",
2517 ($x, $y) = (-1, -1) 2612 ($x, $y) = (-1, -1)
2518 unless (defined $x) && (defined $y); 2613 unless (defined $x) && (defined $y);
2519 2614
2520 # use -1 or undef as default coordinates, not 0, 0 2615 # use -1 or undef as default coordinates, not 0, 0
2521 ($x, $y) = ($map->enter_x, $map->enter_y) 2616 ($x, $y) = ($map->enter_x, $map->enter_y)
2522 if $x <=0 && $y <= 0; 2617 if $x <= 0 && $y <= 0;
2523 2618
2524 $map->load; 2619 $map->load;
2525 $map->load_neighbours; 2620 $map->load_neighbours;
2526 2621
2527 return unless $self->contr->active; 2622 return unless $self->contr->active;
2528 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2529 $self->activate_recursive;
2530 2623
2531 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2624 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2532 $self->enter_map ($map, $x, $y); 2625 $self->enter_map ($map, $x, $y);
2626
2627 # only activate afterwards, to support waiting in hooks
2628 $self->activate_recursive;
2533} 2629}
2534 2630
2535=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2631=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2536 2632
2537Moves the player to the given map-path and coordinates by first freezing 2633Moves the player to the given map-path and coordinates by first freezing
2725 2821
2726 utf8::encode $text; 2822 utf8::encode $text;
2727 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2823 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2728} 2824}
2729 2825
2826=item $client->send_big_packet ($pkt)
2827
2828Like C<send_packet>, but tries to compress large packets, and fragments
2829them as required.
2830
2831=cut
2832
2833our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2834
2835sub cf::client::send_big_packet {
2836 my ($self, $pkt) = @_;
2837
2838 # try lzf for large packets
2839 $pkt = "lzf " . Compress::LZF::compress $pkt
2840 if 1024 <= length $pkt and $self->{can_lzf};
2841
2842 # split very large packets
2843 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2844 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2845 $pkt = "frag";
2846 }
2847
2848 $self->send_packet ($pkt);
2849}
2850
2730=item $client->send_msg ($channel, $msg, $color, [extra...]) 2851=item $client->send_msg ($channel, $msg, $color, [extra...])
2731 2852
2732Send a drawinfo or msg packet to the client, formatting the msg for the 2853Send a drawinfo or msg packet to the client, formatting the msg for the
2733client if neccessary. C<$type> should be a string identifying the type of 2854client if neccessary. C<$type> should be a string identifying the type of
2734the message, with C<log> being the default. If C<$color> is negative, suppress 2855the message, with C<log> being the default. If C<$color> is negative, suppress
2736 2857
2737=cut 2858=cut
2738 2859
2739# non-persistent channels (usually the info channel) 2860# non-persistent channels (usually the info channel)
2740our %CHANNEL = ( 2861our %CHANNEL = (
2862 "c/motd" => {
2863 id => "infobox",
2864 title => "MOTD",
2865 reply => undef,
2866 tooltip => "The message of the day",
2867 },
2741 "c/identify" => { 2868 "c/identify" => {
2742 id => "infobox", 2869 id => "infobox",
2743 title => "Identify", 2870 title => "Identify",
2744 reply => undef, 2871 reply => undef,
2745 tooltip => "Items recently identified", 2872 tooltip => "Items recently identified",
2747 "c/examine" => { 2874 "c/examine" => {
2748 id => "infobox", 2875 id => "infobox",
2749 title => "Examine", 2876 title => "Examine",
2750 reply => undef, 2877 reply => undef,
2751 tooltip => "Signs and other items you examined", 2878 tooltip => "Signs and other items you examined",
2879 },
2880 "c/shopinfo" => {
2881 id => "infobox",
2882 title => "Shop Info",
2883 reply => undef,
2884 tooltip => "What your bargaining skill tells you about the shop",
2752 }, 2885 },
2753 "c/book" => { 2886 "c/book" => {
2754 id => "infobox", 2887 id => "infobox",
2755 title => "Book", 2888 title => "Book",
2756 reply => undef, 2889 reply => undef,
2772 id => "infobox", 2905 id => "infobox",
2773 title => "Body Parts", 2906 title => "Body Parts",
2774 reply => undef, 2907 reply => undef,
2775 tooltip => "Shows which body parts you posess and are available", 2908 tooltip => "Shows which body parts you posess and are available",
2776 }, 2909 },
2910 "c/statistics" => {
2911 id => "infobox",
2912 title => "Statistics",
2913 reply => undef,
2914 tooltip => "Shows your primary statistics",
2915 },
2777 "c/skills" => { 2916 "c/skills" => {
2778 id => "infobox", 2917 id => "infobox",
2779 title => "Skills", 2918 title => "Skills",
2780 reply => undef, 2919 reply => undef,
2781 tooltip => "Shows your experience per skill and item power", 2920 tooltip => "Shows your experience per skill and item power",
2921 },
2922 "c/shopitems" => {
2923 id => "infobox",
2924 title => "Shop Items",
2925 reply => undef,
2926 tooltip => "Shows the items currently for sale in this shop",
2927 },
2928 "c/resistances" => {
2929 id => "infobox",
2930 title => "Resistances",
2931 reply => undef,
2932 tooltip => "Shows your resistances",
2933 },
2934 "c/pets" => {
2935 id => "infobox",
2936 title => "Pets",
2937 reply => undef,
2938 tooltip => "Shows information abotu your pets/a specific pet",
2939 },
2940 "c/perceiveself" => {
2941 id => "infobox",
2942 title => "Perceive Self",
2943 reply => undef,
2944 tooltip => "You gained detailed knowledge about yourself",
2782 }, 2945 },
2783 "c/uptime" => { 2946 "c/uptime" => {
2784 id => "infobox", 2947 id => "infobox",
2785 title => "Uptime", 2948 title => "Uptime",
2786 reply => undef, 2949 reply => undef,
2796 id => "party", 2959 id => "party",
2797 title => "Party", 2960 title => "Party",
2798 reply => "gsay ", 2961 reply => "gsay ",
2799 tooltip => "Messages and chat related to your party", 2962 tooltip => "Messages and chat related to your party",
2800 }, 2963 },
2964 "c/death" => {
2965 id => "death",
2966 title => "Death",
2967 reply => undef,
2968 tooltip => "Reason for and more info about your most recent death",
2969 },
2970 "c/say" => $SAY_CHANNEL,
2971 "c/chat" => $CHAT_CHANNEL,
2801); 2972);
2802 2973
2803sub cf::client::send_msg { 2974sub cf::client::send_msg {
2804 my ($self, $channel, $msg, $color, @extra) = @_; 2975 my ($self, $channel, $msg, $color, @extra) = @_;
2805 2976
2810 2981
2811 # check predefined channels, for the benefit of C 2982 # check predefined channels, for the benefit of C
2812 if ($CHANNEL{$channel}) { 2983 if ($CHANNEL{$channel}) {
2813 $channel = $CHANNEL{$channel}; 2984 $channel = $CHANNEL{$channel};
2814 2985
2815 $self->ext_msg (channel_info => $channel) 2986 $self->ext_msg (channel_info => $channel);
2816 if $self->can_msg;
2817
2818 $channel = $channel->{id}; 2987 $channel = $channel->{id};
2819 2988
2820 } elsif (ref $channel) { 2989 } elsif (ref $channel) {
2821 # send meta info to client, if not yet sent 2990 # send meta info to client, if not yet sent
2822 unless (exists $self->{channel}{$channel->{id}}) { 2991 unless (exists $self->{channel}{$channel->{id}}) {
2823 $self->{channel}{$channel->{id}} = $channel; 2992 $self->{channel}{$channel->{id}} = $channel;
2824 $self->ext_msg (channel_info => $channel) 2993 $self->ext_msg (channel_info => $channel);
2825 if $self->can_msg;
2826 } 2994 }
2827 2995
2828 $channel = $channel->{id}; 2996 $channel = $channel->{id};
2829 } 2997 }
2830 2998
2831 return unless @extra || length $msg; 2999 return unless @extra || length $msg;
2832 3000
2833 if ($self->can_msg) {
2834 # default colour, mask it out 3001 # default colour, mask it out
2835 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3002 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2836 if $color & cf::NDI_DEF; 3003 if $color & cf::NDI_DEF;
2837 3004
2838 my $pkt = "msg " 3005 my $pkt = "msg "
2839 . $self->{json_coder}->encode ( 3006 . $self->{json_coder}->encode (
2840 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3007 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2841 ); 3008 );
2842 3009
2843 # try lzf for large packets
2844 $pkt = "lzf " . Compress::LZF::compress $pkt
2845 if 1024 <= length $pkt and $self->{can_lzf};
2846
2847 # split very large packets
2848 if (8192 < length $pkt and $self->{can_lzf}) {
2849 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2850 $pkt = "frag";
2851 }
2852
2853 $self->send_packet ($pkt); 3010 $self->send_big_packet ($pkt);
2854 } else {
2855 if ($color >= 0) {
2856 # replace some tags by gcfclient-compatible ones
2857 for ($msg) {
2858 1 while
2859 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2860 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2861 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2862 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2863 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2864 }
2865
2866 $color &= cf::NDI_COLOR_MASK;
2867
2868 utf8::encode $msg;
2869
2870 if (0 && $msg =~ /\[/) {
2871 # COMMAND/INFO
2872 $self->send_packet ("drawextinfo $color 10 8 $msg")
2873 } else {
2874 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2875 $self->send_packet ("drawinfo $color $msg")
2876 }
2877 }
2878 }
2879} 3011}
2880 3012
2881=item $client->ext_msg ($type, @msg) 3013=item $client->ext_msg ($type, @msg)
2882 3014
2883Sends an ext event to the client. 3015Sends an ext event to the client.
2886 3018
2887sub cf::client::ext_msg($$@) { 3019sub cf::client::ext_msg($$@) {
2888 my ($self, $type, @msg) = @_; 3020 my ($self, $type, @msg) = @_;
2889 3021
2890 if ($self->extcmd == 2) { 3022 if ($self->extcmd == 2) {
2891 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3023 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2892 } elsif ($self->extcmd == 1) { # TODO: remove 3024 } elsif ($self->extcmd == 1) { # TODO: remove
2893 push @msg, msgtype => "event_$type"; 3025 push @msg, msgtype => "event_$type";
2894 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3026 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2895 } 3027 }
2896} 3028}
2897 3029
2898=item $client->ext_reply ($msgid, @msg) 3030=item $client->ext_reply ($msgid, @msg)
2899 3031
2903 3035
2904sub cf::client::ext_reply($$@) { 3036sub cf::client::ext_reply($$@) {
2905 my ($self, $id, @msg) = @_; 3037 my ($self, $id, @msg) = @_;
2906 3038
2907 if ($self->extcmd == 2) { 3039 if ($self->extcmd == 2) {
2908 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3040 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2909 } elsif ($self->extcmd == 1) { 3041 } elsif ($self->extcmd == 1) {
2910 #TODO: version 1, remove 3042 #TODO: version 1, remove
2911 unshift @msg, msgtype => "reply", msgid => $id; 3043 unshift @msg, msgtype => "reply", msgid => $id;
2912 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3044 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2913 } 3045 }
2914} 3046}
2915 3047
2916=item $success = $client->query ($flags, "text", \&cb) 3048=item $success = $client->query ($flags, "text", \&cb)
2917 3049
3018 3150
3019 $coro 3151 $coro
3020} 3152}
3021 3153
3022cf::client->attach ( 3154cf::client->attach (
3023 on_destroy => sub { 3155 on_client_destroy => sub {
3024 my ($ns) = @_; 3156 my ($ns) = @_;
3025 3157
3026 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3158 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3027 }, 3159 },
3028); 3160);
3044our $safe_hole = new Safe::Hole; 3176our $safe_hole = new Safe::Hole;
3045 3177
3046$SIG{FPE} = 'IGNORE'; 3178$SIG{FPE} = 'IGNORE';
3047 3179
3048$safe->permit_only (Opcode::opset qw( 3180$safe->permit_only (Opcode::opset qw(
3049 :base_core :base_mem :base_orig :base_math 3181 :base_core :base_mem :base_orig :base_math :base_loop
3050 grepstart grepwhile mapstart mapwhile 3182 grepstart grepwhile mapstart mapwhile
3051 sort time 3183 sort time
3052)); 3184));
3053 3185
3054# here we export the classes and methods available to script code 3186# here we export the classes and methods available to script code
3058The following functions and methods are available within a safe environment: 3190The following functions and methods are available within a safe environment:
3059 3191
3060 cf::object 3192 cf::object
3061 contr pay_amount pay_player map x y force_find force_add destroy 3193 contr pay_amount pay_player map x y force_find force_add destroy
3062 insert remove name archname title slaying race decrease split 3194 insert remove name archname title slaying race decrease split
3195 value
3063 3196
3064 cf::object::player 3197 cf::object::player
3065 player 3198 player
3066 3199
3067 cf::player 3200 cf::player
3073=cut 3206=cut
3074 3207
3075for ( 3208for (
3076 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3209 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3077 insert remove inv nrof name archname title slaying race 3210 insert remove inv nrof name archname title slaying race
3078 decrease split destroy change_exp)], 3211 decrease split destroy change_exp value msg lore send_msg)],
3079 ["cf::object::player" => qw(player)], 3212 ["cf::object::player" => qw(player)],
3080 ["cf::player" => qw(peaceful)], 3213 ["cf::player" => qw(peaceful send_msg)],
3081 ["cf::map" => qw(trigger)], 3214 ["cf::map" => qw(trigger)],
3082) { 3215) {
3083 no strict 'refs'; 3216 no strict 'refs';
3084 my ($pkg, @funs) = @$_; 3217 my ($pkg, @funs) = @$_;
3085 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3218 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3103 3236
3104 my $qcode = $code; 3237 my $qcode = $code;
3105 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3238 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3106 $qcode =~ s/\n/\\n/g; 3239 $qcode =~ s/\n/\\n/g;
3107 3240
3241 %vars = (_dummy => 0) unless %vars;
3242
3243 my @res;
3108 local $_; 3244 local $_;
3109 local @safe::cf::_safe_eval_args = values %vars;
3110 3245
3111 my $eval = 3246 my $eval =
3112 "do {\n" 3247 "do {\n"
3113 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3248 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3114 . "#line 0 \"{$qcode}\"\n" 3249 . "#line 0 \"{$qcode}\"\n"
3115 . $code 3250 . $code
3116 . "\n}" 3251 . "\n}"
3117 ; 3252 ;
3118 3253
3254 if ($CFG{safe_eval}) {
3119 sub_generation_inc; 3255 sub_generation_inc;
3256 local @safe::cf::_safe_eval_args = values %vars;
3120 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3257 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3121 sub_generation_inc; 3258 sub_generation_inc;
3259 } else {
3260 local @cf::_safe_eval_args = values %vars;
3261 @res = wantarray ? eval eval : scalar eval $eval;
3262 }
3122 3263
3123 if ($@) { 3264 if ($@) {
3124 warn "$@"; 3265 warn "$@";
3125 warn "while executing safe code '$code'\n"; 3266 warn "while executing safe code '$code'\n";
3126 warn "with arguments " . (join " ", %vars) . "\n"; 3267 warn "with arguments " . (join " ", %vars) . "\n";
3145=cut 3286=cut
3146 3287
3147sub register_script_function { 3288sub register_script_function {
3148 my ($fun, $cb) = @_; 3289 my ($fun, $cb) = @_;
3149 3290
3150 no strict 'refs'; 3291 $fun = "safe::$fun" if $CFG{safe_eval};
3151 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3292 *$fun = $safe_hole->wrap ($cb);
3152} 3293}
3153 3294
3154=back 3295=back
3155 3296
3156=cut 3297=cut
3177 3318
3178 $facedata->{version} == 2 3319 $facedata->{version} == 2
3179 or cf::cleanup "$path: version mismatch, cannot proceed."; 3320 or cf::cleanup "$path: version mismatch, cannot proceed.";
3180 3321
3181 # patch in the exptable 3322 # patch in the exptable
3323 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3182 $facedata->{resource}{"res/exp_table"} = { 3324 $facedata->{resource}{"res/exp_table"} = {
3183 type => FT_RSRC, 3325 type => FT_RSRC,
3184 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3326 data => $exp_table,
3327 hash => (Digest::MD5::md5 $exp_table),
3185 }; 3328 };
3186 cf::cede_to_tick; 3329 cf::cede_to_tick;
3187 3330
3188 { 3331 {
3189 my $faces = $facedata->{faceinfo}; 3332 my $faces = $facedata->{faceinfo};
3191 while (my ($face, $info) = each %$faces) { 3334 while (my ($face, $info) = each %$faces) {
3192 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3335 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3193 3336
3194 cf::face::set_visibility $idx, $info->{visibility}; 3337 cf::face::set_visibility $idx, $info->{visibility};
3195 cf::face::set_magicmap $idx, $info->{magicmap}; 3338 cf::face::set_magicmap $idx, $info->{magicmap};
3196 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3339 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3197 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3340 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3198 3341
3199 cf::cede_to_tick; 3342 cf::cede_to_tick;
3200 } 3343 }
3201 3344
3202 while (my ($face, $info) = each %$faces) { 3345 while (my ($face, $info) = each %$faces) {
3226 3369
3227 cf::anim::invalidate_all; # d'oh 3370 cf::anim::invalidate_all; # d'oh
3228 } 3371 }
3229 3372
3230 { 3373 {
3231 # TODO: for gcfclient pleasure, we should give resources
3232 # that gcfclient doesn't grok a >10000 face index.
3233 my $res = $facedata->{resource}; 3374 my $res = $facedata->{resource};
3234 3375
3235 while (my ($name, $info) = each %$res) { 3376 while (my ($name, $info) = each %$res) {
3236 if (defined $info->{type}) { 3377 if (defined $info->{type}) {
3237 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3378 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3238 my $data;
3239 3379
3240 if ($info->{type} & 1) { 3380 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3241 # prepend meta info
3242
3243 my $meta = $enc->encode ({
3244 name => $name,
3245 %{ $info->{meta} || {} },
3246 });
3247
3248 $data = pack "(w/a*)*", $meta, $info->{data};
3249 } else {
3250 $data = $info->{data};
3251 }
3252
3253 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3254 cf::face::set_type $idx, $info->{type}; 3381 cf::face::set_type $idx, $info->{type};
3255 } else { 3382 } else {
3256 $RESOURCE{$name} = $info; 3383 $RESOURCE{$name} = $info;
3257 } 3384 }
3258 3385
3341 reload_treasures; 3468 reload_treasures;
3342 3469
3343 warn "finished reloading resource files\n"; 3470 warn "finished reloading resource files\n";
3344} 3471}
3345 3472
3346sub init {
3347 my $guard = freeze_mainloop;
3348
3349 evthread_start IO::AIO::poll_fileno;
3350
3351 reload_resources;
3352}
3353
3354sub reload_config { 3473sub reload_config {
3474 warn "reloading config file...\n";
3475
3355 open my $fh, "<:utf8", "$CONFDIR/config" 3476 open my $fh, "<:utf8", "$CONFDIR/config"
3356 or return; 3477 or return;
3357 3478
3358 local $/; 3479 local $/;
3359 *CFG = YAML::Load <$fh>; 3480 *CFG = YAML::XS::Load scalar <$fh>;
3360 3481
3361 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3482 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3362 3483
3363 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3484 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3364 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3485 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3368 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3489 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3369 and die "WARNING: m(un)lockall failed: $!\n"; 3490 and die "WARNING: m(un)lockall failed: $!\n";
3370 }; 3491 };
3371 warn $@ if $@; 3492 warn $@ if $@;
3372 } 3493 }
3494
3495 warn "finished reloading resource files\n";
3373} 3496}
3374 3497
3375sub pidfile() { 3498sub pidfile() {
3376 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3499 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3377 or die "$PIDFILE: $!"; 3500 or die "$PIDFILE: $!";
3389 3512
3390 seek $fh, 0, 0; 3513 seek $fh, 0, 0;
3391 print $fh $$; 3514 print $fh $$;
3392} 3515}
3393 3516
3517sub main_loop {
3518 warn "EV::loop starting\n";
3519 if (1) {
3520 EV::loop;
3521 }
3522 warn "EV::loop returned\n";
3523 goto &main_loop unless $REALLY_UNLOOP;
3524}
3525
3394sub main { 3526sub main {
3395 atomic; 3527 cf::init_globals; # initialise logging
3528
3529 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3530 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3531 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3532 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3533
3534 cf::init_experience;
3535 cf::init_anim;
3536 cf::init_attackmess;
3537 cf::init_dynamic;
3538
3539 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3396 3540
3397 # we must not ever block the main coroutine 3541 # we must not ever block the main coroutine
3398 local $Coro::idle = sub { 3542 local $Coro::idle = sub {
3399 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3543 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3400 (async { 3544 (async {
3401 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3545 $Coro::current->{desc} = "IDLE BUG HANDLER";
3402 EV::loop EV::LOOP_ONESHOT; 3546 EV::loop EV::LOOP_ONESHOT;
3403 })->prio (Coro::PRIO_MAX); 3547 })->prio (Coro::PRIO_MAX);
3404 }; 3548 };
3405 3549
3406 { 3550 evthread_start IO::AIO::poll_fileno;
3407 my $guard = freeze_mainloop; 3551
3552 cf::sync_job {
3553 cf::load_settings;
3554 cf::load_materials;
3555
3556 reload_resources;
3408 reload_config; 3557 reload_config;
3409 db_init; 3558 db_init;
3559
3560 cf::init_uuid;
3561 cf::init_signals;
3562 cf::init_skills;
3563
3564 cf::init_beforeplay;
3565
3566 atomic;
3567
3410 load_extensions; 3568 load_extensions;
3411 3569
3412 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3413 }
3414
3415 utime time, time, $RUNTIMEFILE; 3570 utime time, time, $RUNTIMEFILE;
3416 3571
3417 # no (long-running) fork's whatsoever before this point(!) 3572 # no (long-running) fork's whatsoever before this point(!)
3573 use POSIX ();
3418 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3574 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3419 3575
3420 EV::loop; 3576 (pop @POST_INIT)->(0) while @POST_INIT;
3577 };
3578
3579 main_loop;
3421} 3580}
3422 3581
3423############################################################################# 3582#############################################################################
3424# initialisation and cleanup 3583# initialisation and cleanup
3425 3584
3432 }; 3591 };
3433 } 3592 }
3434} 3593}
3435 3594
3436sub write_runtime_sync { 3595sub write_runtime_sync {
3596 my $t0 = EV::time;
3597
3437 # first touch the runtime file to show we are still running: 3598 # first touch the runtime file to show we are still running:
3438 # the fsync below can take a very very long time. 3599 # the fsync below can take a very very long time.
3439 3600
3440 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3601 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3441 3602
3442 my $guard = cf::lock_acquire "write_runtime"; 3603 my $guard = cf::lock_acquire "write_runtime";
3443 3604
3444 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3605 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3445 or return; 3606 or return;
3446 3607
3447 my $value = $cf::RUNTIME + 90 + 10; 3608 my $value = $cf::RUNTIME + 90 + 10;
3448 # 10 is the runtime save interval, for a monotonic clock 3609 # 10 is the runtime save interval, for a monotonic clock
3449 # 60 allows for the watchdog to kill the server. 3610 # 60 allows for the watchdog to kill the server.
3462 or return; 3623 or return;
3463 3624
3464 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3625 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3465 and return; 3626 and return;
3466 3627
3467 warn "runtime file written.\n"; 3628 warn sprintf "runtime file written (%gs).\n", EV::time - $t0;
3468 3629
3469 1 3630 1
3470} 3631}
3471 3632
3472our $uuid_lock; 3633our $uuid_lock;
3481 my $uuid = "$LOCALDIR/uuid"; 3642 my $uuid = "$LOCALDIR/uuid";
3482 3643
3483 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3644 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3484 or return; 3645 or return;
3485 3646
3486 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3647 my $value = uuid_seq uuid_cur;
3648
3649 unless ($value) {
3650 warn "cowardly refusing to write zero uuid value!\n";
3651 return;
3652 }
3653
3654 my $value = uuid_str $value + $uuid_skip;
3487 $uuid_skip = 0; 3655 $uuid_skip = 0;
3488 3656
3489 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3657 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3490 and return; 3658 and return;
3491 3659
3513} 3681}
3514 3682
3515sub emergency_save() { 3683sub emergency_save() {
3516 my $freeze_guard = cf::freeze_mainloop; 3684 my $freeze_guard = cf::freeze_mainloop;
3517 3685
3518 warn "enter emergency perl save\n"; 3686 warn "emergency_perl_save: enter\n";
3519 3687
3520 cf::sync_job { 3688 cf::sync_job {
3689 # this is a trade-off: we want to be very quick here, so
3690 # save all maps without fsync, and later call a global sync
3691 # (which in turn might be very very slow)
3692 local $USE_FSYNC = 0;
3693
3521 # use a peculiar iteration method to avoid tripping on perl 3694 # use a peculiar iteration method to avoid tripping on perl
3522 # refcount bugs in for. also avoids problems with players 3695 # refcount bugs in for. also avoids problems with players
3523 # and maps saved/destroyed asynchronously. 3696 # and maps saved/destroyed asynchronously.
3524 warn "begin emergency player save\n"; 3697 warn "emergency_perl_save: begin player save\n";
3525 for my $login (keys %cf::PLAYER) { 3698 for my $login (keys %cf::PLAYER) {
3526 my $pl = $cf::PLAYER{$login} or next; 3699 my $pl = $cf::PLAYER{$login} or next;
3527 $pl->valid or next; 3700 $pl->valid or next;
3528 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3701 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3529 $pl->save; 3702 $pl->save;
3530 } 3703 }
3531 warn "end emergency player save\n"; 3704 warn "emergency_perl_save: end player save\n";
3532 3705
3533 warn "begin emergency map save\n"; 3706 warn "emergency_perl_save: begin map save\n";
3534 for my $path (keys %cf::MAP) { 3707 for my $path (keys %cf::MAP) {
3535 my $map = $cf::MAP{$path} or next; 3708 my $map = $cf::MAP{$path} or next;
3536 $map->valid or next; 3709 $map->valid or next;
3537 $map->save; 3710 $map->save;
3538 } 3711 }
3539 warn "end emergency map save\n"; 3712 warn "emergency_perl_save: end map save\n";
3540 3713
3541 warn "begin emergency database checkpoint\n"; 3714 warn "emergency_perl_save: begin database checkpoint\n";
3542 BDB::db_env_txn_checkpoint $DB_ENV; 3715 BDB::db_env_txn_checkpoint $DB_ENV;
3543 warn "end emergency database checkpoint\n"; 3716 warn "emergency_perl_save: end database checkpoint\n";
3544 3717
3545 warn "begin write uuid\n"; 3718 warn "emergency_perl_save: begin write uuid\n";
3546 write_uuid_sync 1; 3719 write_uuid_sync 1;
3547 warn "end write uuid\n"; 3720 warn "emergency_perl_save: end write uuid\n";
3548 }; 3721 };
3549 3722
3723 warn "emergency_perl_save: starting sync()\n";
3724 IO::AIO::aio_sync sub {
3725 warn "emergency_perl_save: finished sync()\n";
3726 };
3727
3550 warn "leave emergency perl save\n"; 3728 warn "emergency_perl_save: leave\n";
3551} 3729}
3552 3730
3553sub post_cleanup { 3731sub post_cleanup {
3554 my ($make_core) = @_; 3732 my ($make_core) = @_;
3555 3733
3592 warn "can only reload from main coroutine"; 3770 warn "can only reload from main coroutine";
3593 return; 3771 return;
3594 } 3772 }
3595 3773
3596 return if $RELOAD++; 3774 return if $RELOAD++;
3775
3776 my $t1 = EV::time;
3597 3777
3598 while ($RELOAD) { 3778 while ($RELOAD) {
3599 warn "reloading..."; 3779 warn "reloading...";
3600 3780
3601 warn "entering sync_job"; 3781 warn "entering sync_job";
3662 clear_package "safe::$_" 3842 clear_package "safe::$_"
3663 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3843 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3664 3844
3665 warn "unloading cf.pm \"a bit\""; 3845 warn "unloading cf.pm \"a bit\"";
3666 delete $INC{"cf.pm"}; 3846 delete $INC{"cf.pm"};
3667 delete $INC{"cf/pod.pm"}; 3847 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3668 3848
3669 # don't, removes xs symbols, too, 3849 # don't, removes xs symbols, too,
3670 # and global variables created in xs 3850 # and global variables created in xs
3671 #clear_package __PACKAGE__; 3851 #clear_package __PACKAGE__;
3672 3852
3673 warn "unload completed, starting to reload now"; 3853 warn "unload completed, starting to reload now";
3674 3854
3675 warn "reloading cf.pm"; 3855 warn "reloading cf.pm";
3676 require cf; 3856 require cf;
3677 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3857 cf::_connect_to_perl_1;
3678 3858
3679 warn "loading config and database again"; 3859 warn "loading config and database again";
3680 cf::reload_config; 3860 cf::reload_config;
3681 3861
3682 warn "loading extensions"; 3862 warn "loading extensions";
3683 cf::load_extensions; 3863 cf::load_extensions;
3684 3864
3865 if ($REATTACH_ON_RELOAD) {
3685 warn "reattaching attachments to objects/players"; 3866 warn "reattaching attachments to objects/players";
3686 _global_reattach; # objects, sockets 3867 _global_reattach; # objects, sockets
3687 warn "reattaching attachments to maps"; 3868 warn "reattaching attachments to maps";
3688 reattach $_ for values %MAP; 3869 reattach $_ for values %MAP;
3689 warn "reattaching attachments to players"; 3870 warn "reattaching attachments to players";
3690 reattach $_ for values %PLAYER; 3871 reattach $_ for values %PLAYER;
3872 }
3873
3874 warn "running post_init jobs";
3875 (pop @POST_INIT)->(1) while @POST_INIT;
3691 3876
3692 warn "leaving sync_job"; 3877 warn "leaving sync_job";
3693 3878
3694 1 3879 1
3695 } or do { 3880 } or do {
3698 }; 3883 };
3699 3884
3700 warn "reloaded"; 3885 warn "reloaded";
3701 --$RELOAD; 3886 --$RELOAD;
3702 } 3887 }
3888
3889 $t1 = EV::time - $t1;
3890 warn "reload completed in ${t1}s\n";
3703}; 3891};
3704 3892
3705our $RELOAD_WATCHER; # used only during reload 3893our $RELOAD_WATCHER; # used only during reload
3706 3894
3707sub reload_perl() { 3895sub reload_perl() {
3708 # doing reload synchronously and two reloads happen back-to-back, 3896 # doing reload synchronously and two reloads happen back-to-back,
3709 # coro crashes during coro_state_free->destroy here. 3897 # coro crashes during coro_state_free->destroy here.
3710 3898
3899 $RELOAD_WATCHER ||= cf::async {
3900 Coro::AIO::aio_wait cache_extensions;
3901
3711 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub { 3902 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3712 do_reload_perl; 3903 do_reload_perl;
3713 undef $RELOAD_WATCHER; 3904 undef $RELOAD_WATCHER;
3905 };
3714 }; 3906 };
3715} 3907}
3716 3908
3717register_command "reload" => sub { 3909register_command "reload" => sub {
3718 my ($who, $arg) = @_; 3910 my ($who, $arg) = @_;
3732 3924
3733our @WAIT_FOR_TICK; 3925our @WAIT_FOR_TICK;
3734our @WAIT_FOR_TICK_BEGIN; 3926our @WAIT_FOR_TICK_BEGIN;
3735 3927
3736sub wait_for_tick { 3928sub wait_for_tick {
3737 return if tick_inhibit || $Coro::current == $Coro::main; 3929 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3738 3930
3739 my $signal = new Coro::Signal; 3931 my $signal = new Coro::Signal;
3740 push @WAIT_FOR_TICK, $signal; 3932 push @WAIT_FOR_TICK, $signal;
3741 $signal->wait; 3933 $signal->wait;
3742} 3934}
3743 3935
3744sub wait_for_tick_begin { 3936sub wait_for_tick_begin {
3745 return if tick_inhibit || $Coro::current == $Coro::main; 3937 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3746 3938
3747 my $signal = new Coro::Signal; 3939 my $signal = new Coro::Signal;
3748 push @WAIT_FOR_TICK_BEGIN, $signal; 3940 push @WAIT_FOR_TICK_BEGIN, $signal;
3749 $signal->wait; 3941 $signal->wait;
3750} 3942}
3755 unless ++$bug_warning > 10; 3947 unless ++$bug_warning > 10;
3756 return; 3948 return;
3757 } 3949 }
3758 3950
3759 cf::server_tick; # one server iteration 3951 cf::server_tick; # one server iteration
3952
3953 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d#
3760 3954
3761 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3955 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3762 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3956 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3763 Coro::async_pool { 3957 Coro::async_pool {
3764 $Coro::current->{desc} = "runtime saver"; 3958 $Coro::current->{desc} = "runtime saver";
3787} 3981}
3788 3982
3789{ 3983{
3790 # configure BDB 3984 # configure BDB
3791 3985
3792 BDB::min_parallel 8; 3986 BDB::min_parallel 16;
3793 BDB::max_poll_reqs $TICK * 0.1; 3987 BDB::max_poll_reqs $TICK * 0.1;
3794 $AnyEvent::BDB::WATCHER->priority (1); 3988 $AnyEvent::BDB::WATCHER->priority (1);
3795 3989
3796 unless ($DB_ENV) { 3990 unless ($DB_ENV) {
3797 $DB_ENV = BDB::db_env_create; 3991 $DB_ENV = BDB::db_env_create;
3877 LOG llevInfo, "[ABT] [suppressed]\n"; 4071 LOG llevInfo, "[ABT] [suppressed]\n";
3878 } 4072 }
3879} 4073}
3880 4074
3881# load additional modules 4075# load additional modules
3882use cf::pod; 4076require "cf/$_.pm" for @EXTRA_MODULES;
4077cf::_connect_to_perl_2;
3883 4078
3884END { cf::emergency_save } 4079END { cf::emergency_save }
3885 4080
38861 40811
3887 4082

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines