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.267 by root, Sat May 19 00:08:11 2007 UTC vs.
Revision 1.482 by root, Sun Oct 11 05:31:54 2009 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
24use 5.10.0;
3use utf8; 25use utf8;
4use strict; 26use strict qw(vars subs);
5 27
6use Symbol; 28use Symbol;
7use List::Util; 29use List::Util;
8use Socket; 30use Socket;
9use Storable; 31use EV;
10use Event;
11use Opcode; 32use Opcode;
12use Safe; 33use Safe;
13use Safe::Hole; 34use Safe::Hole;
35use Storable ();
14 36
37use Guard ();
15use Coro 3.61 (); 38use Coro ();
16use Coro::State; 39use Coro::State;
17use Coro::Handle; 40use Coro::Handle;
41use Coro::EV;
18use Coro::Event; 42use Coro::AnyEvent;
19use Coro::Timer; 43use Coro::Timer;
20use Coro::Signal; 44use Coro::Signal;
21use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
22use Coro::AIO; 48use Coro::AIO;
49use Coro::BDB 1.6;
23use Coro::Storable; 50use Coro::Storable;
51use Coro::Util ();
24 52
53use JSON::XS 2.01 ();
25use BDB (); 54use BDB ();
26use Data::Dumper; 55use Data::Dumper;
27use Digest::MD5; 56use Digest::MD5;
28use Fcntl; 57use Fcntl;
29use YAML::Syck (); 58use YAML ();
30use IO::AIO 2.32 (); 59use IO::AIO ();
31use Time::HiRes; 60use Time::HiRes;
32use Compress::LZF; 61use Compress::LZF;
62use Digest::MD5 ();
63
64AnyEvent::detect;
33 65
34# configure various modules to our taste 66# configure various modules to our taste
35# 67#
36$Storable::canonical = 1; # reduce rsync transfers 68$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 69Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
70
71$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
72
73# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
38Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
39 76
40$Event::Eval = 1; # no idea why this is required, but it is 77# strictly for debugging
41 78$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
42# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
43$YAML::Syck::ImplicitUnicode = 1;
44
45$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
46 79
47sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 80sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
48 81
49our %COMMAND = (); 82our %COMMAND = ();
50our %COMMAND_TIME = (); 83our %COMMAND_TIME = ();
51 84
52our @EXTS = (); # list of extension package names 85our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 86our %EXTCMD = ();
87our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 88our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 89our %EXT_MAP = (); # pluggable maps
56 90
57our $RELOAD; # number of reloads so far 91our $RELOAD; # number of reloads so far, non-zero while in reload
58our @EVENT; 92our @EVENT;
93our @REFLECT; # set by XS
94our %REFLECT; # set by us
59 95
60our $CONFDIR = confdir; 96our $CONFDIR = confdir;
61our $DATADIR = datadir; 97our $DATADIR = datadir;
62our $LIBDIR = "$DATADIR/ext"; 98our $LIBDIR = "$DATADIR/ext";
63our $PODDIR = "$DATADIR/pod"; 99our $PODDIR = "$DATADIR/pod";
64our $MAPDIR = "$DATADIR/" . mapdir; 100our $MAPDIR = "$DATADIR/" . mapdir;
65our $LOCALDIR = localdir; 101our $LOCALDIR = localdir;
66our $TMPDIR = "$LOCALDIR/" . tmpdir; 102our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 103our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir; 104our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random"; 105our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db"; 106our $BDBDIR = "$LOCALDIR/db";
107our $PIDFILE = "$LOCALDIR/pid";
108our $RUNTIMEFILE = "$LOCALDIR/runtime";
109
110our %RESOURCE;
71 111
72our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 112our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
73our $TICK_WATCHER;
74our $AIO_POLL_WATCHER;
75our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 113our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
76our $NEXT_TICK; 114our $NEXT_TICK;
77our $NOW;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 115our $USE_FSYNC = 1; # use fsync to write maps - default on
79 116
117our $BDB_DEADLOCK_WATCHER;
118our $BDB_CHECKPOINT_WATCHER;
80our $BDB_POLL_WATCHER; 119our $BDB_TRICKLE_WATCHER;
81our $DB_ENV; 120our $DB_ENV;
121
122our @EXTRA_MODULES = qw(pod match mapscript);
82 123
83our %CFG; 124our %CFG;
84 125
85our $UPTIME; $UPTIME ||= time; 126our $UPTIME; $UPTIME ||= time;
86our $RUNTIME; 127our $RUNTIME;
128our $NOW;
87 129
88our %PLAYER; # all users 130our (%PLAYER, %PLAYER_LOADING); # all users
89our %MAP; # all maps 131our (%MAP, %MAP_LOADING ); # all maps
90our $LINK_MAP; # the special {link} map, which is always available 132our $LINK_MAP; # the special {link} map, which is always available
91 133
92# used to convert map paths into valid unix filenames by replacing / by ∕ 134# used to convert map paths into valid unix filenames by replacing / by ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 135our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94 136
95our $LOAD; # a number between 0 (idle) and 1 (too many objects) 137our $LOAD; # a number between 0 (idle) and 1 (too many objects)
96our $LOADAVG; # same thing, but with alpha-smoothing 138our $LOADAVG; # same thing, but with alpha-smoothing
139our $JITTER; # average jitter
97our $tick_start; # for load detecting purposes 140our $TICK_START; # for load detecting purposes
141
142our @POST_INIT;
143
144our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
145our $REALLY_UNLOOP; # never set to true, please :)
98 146
99binmode STDOUT; 147binmode STDOUT;
100binmode STDERR; 148binmode STDERR;
101 149
102# read virtual server time, if available 150# read virtual server time, if available
103unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 151unless ($RUNTIME || !-e $RUNTIMEFILE) {
104 open my $fh, "<", "$LOCALDIR/runtime" 152 open my $fh, "<", $RUNTIMEFILE
105 or die "unable to read runtime file: $!"; 153 or die "unable to read $RUNTIMEFILE file: $!";
106 $RUNTIME = <$fh> + 0.; 154 $RUNTIME = <$fh> + 0.;
107} 155}
156
157eval "sub TICK() { $TICK } 1" or die;
108 158
109mkdir $_ 159mkdir $_
110 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 160 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
111 161
112our $EMERGENCY_POSITION; 162our $EMERGENCY_POSITION;
113 163
114sub cf::map::normalise; 164sub cf::map::normalise;
165
166#############################################################################
167
168%REFLECT = ();
169for (@REFLECT) {
170 my $reflect = JSON::XS::decode_json $_;
171 $REFLECT{$reflect->{class}} = $reflect;
172}
173
174# this is decidedly evil
175$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
115 176
116############################################################################# 177#############################################################################
117 178
118=head2 GLOBAL VARIABLES 179=head2 GLOBAL VARIABLES
119 180
… …
155 216
156The raw value load value from the last tick. 217The raw value load value from the last tick.
157 218
158=item %cf::CFG 219=item %cf::CFG
159 220
160Configuration for the server, loaded from C</etc/crossfire/config>, or 221Configuration for the server, loaded from C</etc/deliantra-server/config>, or
161from wherever your confdir points to. 222from wherever your confdir points to.
162 223
163=item cf::wait_for_tick, cf::wait_for_tick_begin 224=item cf::wait_for_tick, cf::wait_for_tick_begin
164 225
165These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 226These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
166returns directly I<after> the tick processing (and consequently, can only wake one process 227returns directly I<after> the tick processing (and consequently, can only wake one process
167per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 228per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
168 229
230=item @cf::INVOKE_RESULTS
231
232This array contains the results of the last C<invoke ()> call. When
233C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
234that call.
235
236=item %cf::REFLECT
237
238Contains, for each (C++) class name, a hash reference with information
239about object members (methods, scalars, arrays and flags) and other
240metadata, which is useful for introspection.
241
169=back 242=back
170 243
171=cut 244=cut
172 245
173BEGIN { 246$Coro::State::WARNHOOK = sub {
174 *CORE::GLOBAL::warn = sub {
175 my $msg = join "", @_; 247 my $msg = join "", @_;
176 248
177 $msg .= "\n" 249 $msg .= "\n"
178 unless $msg =~ /\n$/; 250 unless $msg =~ /\n$/;
179 251
180 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 252 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
181 253
182 utf8::encode $msg;
183 LOG llevError, $msg; 254 LOG llevError, $msg;
184 }; 255};
185} 256
257$Coro::State::DIEHOOK = sub {
258 return unless $^S eq 0; # "eq", not "=="
259
260 warn Carp::longmess $_[0];
261
262 if ($Coro::current == $Coro::main) {#d#
263 warn "DIEHOOK called in main context, Coro bug?\n";#d#
264 return;#d#
265 }#d#
266
267 # kill coroutine otherwise
268 Coro::terminate
269};
186 270
187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 271@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 272@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 273@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 274@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
191@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 275@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
276@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
192@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 277@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
193 278
194# we bless all objects into (empty) derived classes to force a method lookup 279# we bless all objects into (empty) derived classes to force a method lookup
195# within the Safe compartment. 280# within the Safe compartment.
196for my $pkg (qw( 281for my $pkg (qw(
197 cf::global cf::attachable 282 cf::global cf::attachable
198 cf::object cf::object::player 283 cf::object cf::object::player
199 cf::client cf::player 284 cf::client cf::player
200 cf::arch cf::living 285 cf::arch cf::living
286 cf::map cf::mapspace
201 cf::map cf::party cf::region 287 cf::party cf::region
202)) { 288)) {
203 no strict 'refs';
204 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 289 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
205} 290}
206 291
207$Event::DIED = sub { 292$EV::DIED = sub {
208 warn "error in event callback: @_"; 293 warn "error in event callback: @_";
209}; 294};
295
296#############################################################################
210 297
211=head2 UTILITY FUNCTIONS 298=head2 UTILITY FUNCTIONS
212 299
213=over 4 300=over 4
214 301
… …
233 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 320 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
234 $d 321 $d
235 } || "[unable to dump $_[0]: '$@']"; 322 } || "[unable to dump $_[0]: '$@']";
236} 323}
237 324
238use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
239
240=item $ref = cf::from_json $json 325=item $ref = cf::decode_json $json
241 326
242Converts a JSON string into the corresponding perl data structure. 327Converts a JSON string into the corresponding perl data structure.
243 328
244=item $json = cf::to_json $ref 329=item $json = cf::encode_json $ref
245 330
246Converts a perl data structure into its JSON representation. 331Converts a perl data structure into its JSON representation.
247 332
333=cut
334
335our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
336
337sub encode_json($) { $json_coder->encode ($_[0]) }
338sub decode_json($) { $json_coder->decode ($_[0]) }
339
340=item cf::post_init { BLOCK }
341
342Execute the given codeblock, I<after> all extensions have been (re-)loaded,
343but I<before> the server starts ticking again.
344
345The cdoeblock will have a single boolean argument to indicate whether this
346is a reload or not.
347
348=cut
349
350sub post_init(&) {
351 push @POST_INIT, shift;
352}
353
248=item cf::lock_wait $string 354=item cf::lock_wait $string
249 355
250Wait until the given lock is available. See cf::lock_acquire. 356Wait until the given lock is available. See cf::lock_acquire.
251 357
252=item my $lock = cf::lock_acquire $string 358=item my $lock = cf::lock_acquire $string
253 359
254Wait until the given lock is available and then acquires it and returns 360Wait until the given lock is available and then acquires it and returns
255a Coro::guard object. If the guard object gets destroyed (goes out of scope, 361a L<Guard> object. If the guard object gets destroyed (goes out of scope,
256for example when the coroutine gets canceled), the lock is automatically 362for example when the coroutine gets canceled), the lock is automatically
257returned. 363returned.
258 364
365Locks are *not* recursive, locking from the same coro twice results in a
366deadlocked coro.
367
259Lock names should begin with a unique identifier (for example, cf::map::find 368Lock names should begin with a unique identifier (for example, cf::map::find
260uses map_find and cf::map::load uses map_load). 369uses map_find and cf::map::load uses map_load).
261 370
262=item $locked = cf::lock_active $string 371=item $locked = cf::lock_active $string
263 372
264Return true if the lock is currently active, i.e. somebody has locked it. 373Return true if the lock is currently active, i.e. somebody has locked it.
265 374
266=cut 375=cut
267 376
268our %LOCK; 377our $LOCKS = new Coro::SemaphoreSet;
269 378
270sub lock_wait($) { 379sub lock_wait($) {
271 my ($key) = @_; 380 $LOCKS->wait ($_[0]);
272
273 # wait for lock, if any
274 while ($LOCK{$key}) {
275 push @{ $LOCK{$key} }, $Coro::current;
276 Coro::schedule;
277 }
278} 381}
279 382
280sub lock_acquire($) { 383sub lock_acquire($) {
281 my ($key) = @_; 384 $LOCKS->guard ($_[0])
282
283 # wait, to be sure we are not locked
284 lock_wait $key;
285
286 $LOCK{$key} = [];
287
288 Coro::guard {
289 # wake up all waiters, to be on the safe side
290 $_->ready for @{ delete $LOCK{$key} };
291 }
292} 385}
293 386
294sub lock_active($) { 387sub lock_active($) {
295 my ($key) = @_; 388 $LOCKS->count ($_[0]) < 1
296
297 ! ! $LOCK{$key}
298} 389}
299 390
300sub freeze_mainloop { 391sub freeze_mainloop {
301 return unless $TICK_WATCHER->is_active; 392 tick_inhibit_inc;
302 393
303 my $guard = Coro::guard { 394 &Guard::guard (\&tick_inhibit_dec);
304 $TICK_WATCHER->start; 395}
396
397=item cf::periodic $interval, $cb
398
399Like EV::periodic, but randomly selects a starting point so that the actions
400get spread over timer.
401
402=cut
403
404sub periodic($$) {
405 my ($interval, $cb) = @_;
406
407 my $start = rand List::Util::min 180, $interval;
408
409 EV::periodic $start, $interval, 0, $cb
410}
411
412=item cf::get_slot $time[, $priority[, $name]]
413
414Allocate $time seconds of blocking CPU time at priority C<$priority>:
415This call blocks and returns only when you have at least C<$time> seconds
416of cpu time till the next tick. The slot is only valid till the next cede.
417
418The optional C<$name> can be used to identify the job to run. It might be
419used for statistical purposes and should identify the same time-class.
420
421Useful for short background jobs.
422
423=cut
424
425our @SLOT_QUEUE;
426our $SLOT_QUEUE;
427
428$SLOT_QUEUE->cancel if $SLOT_QUEUE;
429$SLOT_QUEUE = Coro::async {
430 $Coro::current->desc ("timeslot manager");
431
432 my $signal = new Coro::Signal;
433
434 while () {
435 next_job:
436 my $avail = cf::till_tick;
437 if ($avail > 0.01) {
438 for (0 .. $#SLOT_QUEUE) {
439 if ($SLOT_QUEUE[$_][0] < $avail) {
440 my $job = splice @SLOT_QUEUE, $_, 1, ();
441 $job->[2]->send;
442 Coro::cede;
443 goto next_job;
444 }
445 }
446 }
447
448 if (@SLOT_QUEUE) {
449 # we do not use wait_for_tick() as it returns immediately when tick is inactive
450 push @cf::WAIT_FOR_TICK, $signal;
451 $signal->wait;
452 } else {
453 Coro::schedule;
454 }
305 }; 455 }
306 $TICK_WATCHER->stop; 456};
307 $guard 457
458sub get_slot($;$$) {
459 return if tick_inhibit || $Coro::current == $Coro::main;
460
461 my ($time, $pri, $name) = @_;
462
463 $time = $TICK * .6 if $time > $TICK * .6;
464 my $sig = new Coro::Signal;
465
466 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
467 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
468 $SLOT_QUEUE->ready;
469 $sig->wait;
308} 470}
309 471
310=item cf::async { BLOCK } 472=item cf::async { BLOCK }
311 473
312Currently the same as Coro::async_pool, meaning you cannot use 474Currently the same as Coro::async_pool, meaning you cannot use
… …
317 479
318BEGIN { *async = \&Coro::async_pool } 480BEGIN { *async = \&Coro::async_pool }
319 481
320=item cf::sync_job { BLOCK } 482=item cf::sync_job { BLOCK }
321 483
322The design of crossfire+ requires that the main coro ($Coro::main) is 484The design of Deliantra requires that the main coroutine ($Coro::main)
323always able to handle events or runnable, as crossfire+ is only partly 485is always able to handle events or runnable, as Deliantra is only
324reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 486partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
487acceptable.
325 488
326If it must be done, put the blocking parts into C<sync_job>. This will run 489If it must be done, put the blocking parts into C<sync_job>. This will run
327the given BLOCK in another coroutine while waiting for the result. The 490the given BLOCK in another coroutine while waiting for the result. The
328server will be frozen during this time, so the block should either finish 491server will be frozen during this time, so the block should either finish
329fast or be very important. 492fast or be very important.
… …
332 495
333sub sync_job(&) { 496sub sync_job(&) {
334 my ($job) = @_; 497 my ($job) = @_;
335 498
336 if ($Coro::current == $Coro::main) { 499 if ($Coro::current == $Coro::main) {
337 my $time = Event::time; 500 my $time = EV::time;
338 501
339 # this is the main coro, too bad, we have to block 502 # this is the main coro, too bad, we have to block
340 # till the operation succeeds, freezing the server :/ 503 # till the operation succeeds, freezing the server :/
341 504
342 # TODO: use suspend/resume instead 505 LOG llevError, Carp::longmess "sync job";#d#
343 # (but this is cancel-safe) 506
344 my $freeze_guard = freeze_mainloop; 507 my $freeze_guard = freeze_mainloop;
345 508
346 my $busy = 1; 509 my $busy = 1;
347 my @res; 510 my @res;
348 511
349 (async { 512 (async {
513 $Coro::current->desc ("sync job coro");
350 @res = eval { $job->() }; 514 @res = eval { $job->() };
351 warn $@ if $@; 515 warn $@ if $@;
352 undef $busy; 516 undef $busy;
353 })->prio (Coro::PRIO_MAX); 517 })->prio (Coro::PRIO_MAX);
354 518
355 while ($busy) { 519 while ($busy) {
356 Coro::cede or Event::one_event; 520 if (Coro::nready) {
521 Coro::cede_notself;
522 } else {
523 EV::loop EV::LOOP_ONESHOT;
357 } 524 }
525 }
358 526
359 $time = Event::time - $time; 527 my $time = EV::time - $time;
360 528
361 LOG llevError | logBacktrace, Carp::longmess "long sync job"
362 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
363
364 $tick_start += $time; # do not account sync jobs to server load 529 $TICK_START += $time; # do not account sync jobs to server load
365 530
366 wantarray ? @res : $res[0] 531 wantarray ? @res : $res[0]
367 } else { 532 } else {
368 # we are in another coroutine, how wonderful, everything just works 533 # we are in another coroutine, how wonderful, everything just works
369 534
… …
389 $EXT_CORO{$coro+0} = $coro; 554 $EXT_CORO{$coro+0} = $coro;
390 555
391 $coro 556 $coro
392} 557}
393 558
394sub write_runtime { 559=item fork_call { }, $args
395 my $runtime = "$LOCALDIR/runtime";
396 560
397 # first touch the runtime file to show we are still running: 561Executes the given code block with the given arguments in a seperate
398 # the fsync below can take a very very long time. 562process, returning the results. Everything must be serialisable with
563Coro::Storable. May, of course, block. Note that the executed sub may
564never block itself or use any form of event handling.
399 565
400 if (my $fh = aio_open $runtime, O_WRONLY, 0) { 566=cut
401 utime undef, undef, $fh; 567
568sub fork_call(&@) {
569 my ($cb, @args) = @_;
570
571 # we seemingly have to make a local copy of the whole thing,
572 # otherwise perl prematurely frees the stuff :/
573 # TODO: investigate and fix (likely this will be rather laborious)
574
575 my @res = Coro::Util::fork_eval {
576 reset_signals;
577 &$cb
578 }, @args;
579
580 wantarray ? @res : $res[-1]
581}
582
583=item $coin = coin_from_name $name
584
585=cut
586
587our %coin_alias = (
588 "silver" => "silvercoin",
589 "silvercoin" => "silvercoin",
590 "silvercoins" => "silvercoin",
591 "gold" => "goldcoin",
592 "goldcoin" => "goldcoin",
593 "goldcoins" => "goldcoin",
594 "platinum" => "platinacoin",
595 "platinumcoin" => "platinacoin",
596 "platinumcoins" => "platinacoin",
597 "platina" => "platinacoin",
598 "platinacoin" => "platinacoin",
599 "platinacoins" => "platinacoin",
600 "royalty" => "royalty",
601 "royalties" => "royalty",
602);
603
604sub coin_from_name($) {
605 $coin_alias{$_[0]}
606 ? cf::arch::find $coin_alias{$_[0]}
607 : undef
608}
609
610=item $value = cf::db_get $family => $key
611
612Returns a single value from the environment database.
613
614=item cf::db_put $family => $key => $value
615
616Stores the given C<$value> in the family. It can currently store binary
617data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
618
619=item $db = cf::db_table "name"
620
621Create and/or open a new database table. The string must not be "db" and must be unique
622within each server.
623
624=cut
625
626sub db_table($) {
627 my ($name) = @_;
628 my $db = BDB::db_create $DB_ENV;
629
630 eval {
631 $db->set_flags (BDB::CHKSUM);
632
633 utf8::encode $name;
634 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
635 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
636 cf::cleanup "db_open(db): $!" if $!;
402 } 637 };
638 cf::cleanup "db_open(db): $@" if $@;
403 639
404 my $guard = cf::lock_acquire "write_runtime"; 640 $db
641}
405 642
406 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 643our $DB;
407 or return;
408 644
409 my $value = $cf::RUNTIME + 90 + 10; 645sub db_init {
410 # 10 is the runtime save interval, for a monotonic clock 646 cf::sync_job {
411 # 60 allows for the watchdog to kill the server. 647 $DB ||= db_table "db";
648 };
649}
412 650
413 (aio_write $fh, 0, (length $value), $value, 0) <= 0 651sub db_get($$) {
414 and return; 652 my $key = "$_[0]/$_[1]";
415 653
416 # always fsync - this file is important 654 cf::sync_job {
417 aio_fsync $fh 655 BDB::db_get $DB, undef, $key, my $data;
418 and return;
419 656
420 # touch it again to show we are up-to-date 657 $! ? ()
421 utime undef, undef, $fh; 658 : $data
422
423 close $fh
424 or return;
425
426 aio_rename "$runtime~", $runtime
427 and return;
428
429 warn "runtime file written.\n";#d#
430
431 1 659 }
660}
661
662sub db_put($$$) {
663 BDB::dbreq_pri 4;
664 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
665}
666
667=item cf::cache $id => [$paths...], $processversion => $process
668
669Generic caching function that returns the value of the resource $id,
670caching and regenerating as required.
671
672This function can block.
673
674=cut
675
676sub cache {
677 my ($id, $src, $processversion, $process) = @_;
678
679 my $meta =
680 join "\x00",
681 $processversion,
682 map {
683 aio_stat $_
684 and Carp::croak "$_: $!";
685
686 ($_, (stat _)[7,9])
687 } @$src;
688
689 my $dbmeta = db_get cache => "$id/meta";
690 if ($dbmeta ne $meta) {
691 # changed, we may need to process
692
693 my @data;
694 my $md5;
695
696 for (0 .. $#$src) {
697 0 <= aio_load $src->[$_], $data[$_]
698 or Carp::croak "$src->[$_]: $!";
699 }
700
701 # if processing is expensive, check
702 # checksum first
703 if (1) {
704 $md5 =
705 join "\x00",
706 $processversion,
707 map {
708 cf::cede_to_tick;
709 ($src->[$_], Digest::MD5::md5_hex $data[$_])
710 } 0.. $#$src;
711
712
713 my $dbmd5 = db_get cache => "$id/md5";
714 if ($dbmd5 eq $md5) {
715 db_put cache => "$id/meta", $meta;
716
717 return db_get cache => "$id/data";
718 }
719 }
720
721 my $t1 = Time::HiRes::time;
722 my $data = $process->(\@data);
723 my $t2 = Time::HiRes::time;
724
725 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
726
727 db_put cache => "$id/data", $data;
728 db_put cache => "$id/md5" , $md5;
729 db_put cache => "$id/meta", $meta;
730
731 return $data;
732 }
733
734 db_get cache => "$id/data"
432} 735}
433 736
434=item cf::datalog type => key => value, ... 737=item cf::datalog type => key => value, ...
435 738
436Log a datalog packet of the given type with the given key-value pairs. 739Log a datalog packet of the given type with the given key-value pairs.
… …
448 751
449############################################################################# 752#############################################################################
450 753
451=head2 ATTACHABLE OBJECTS 754=head2 ATTACHABLE OBJECTS
452 755
453Many objects in crossfire are so-called attachable objects. That means you can 756Many objects in deliantra are so-called attachable objects. That means you can
454attach callbacks/event handlers (a collection of which is called an "attachment") 757attach callbacks/event handlers (a collection of which is called an "attachment")
455to it. All such attachable objects support the following methods. 758to it. All such attachable objects support the following methods.
456 759
457In the following description, CLASS can be any of C<global>, C<object> 760In the following description, CLASS can be any of C<global>, C<object>
458C<player>, C<client> or C<map> (i.e. the attachable objects in 761C<player>, C<client> or C<map> (i.e. the attachable objects in
459crossfire+). 762Deliantra).
460 763
461=over 4 764=over 4
462 765
463=item $attachable->attach ($attachment, key => $value...) 766=item $attachable->attach ($attachment, key => $value...)
464 767
… …
508=item cf::CLASS::attachment $name, ... 811=item cf::CLASS::attachment $name, ...
509 812
510Register an attachment by C<$name> through which attachable objects of the 813Register an attachment by C<$name> through which attachable objects of the
511given CLASS can refer to this attachment. 814given CLASS can refer to this attachment.
512 815
513Some classes such as crossfire maps and objects can specify attachments 816Some classes such as deliantra maps and objects can specify attachments
514that are attached at load/instantiate time, thus the need for a name. 817that are attached at load/instantiate time, thus the need for a name.
515 818
516These calls expect any number of the following handler/hook descriptions: 819These calls expect any number of the following handler/hook descriptions:
517 820
518=over 4 821=over 4
… …
666 _attach $registry, $klass, @attach; 969 _attach $registry, $klass, @attach;
667 } 970 }
668 971
669 $obj->{$name} = \%arg; 972 $obj->{$name} = \%arg;
670 } else { 973 } else {
671 warn "object uses attachment '$name' that is not available, postponing.\n"; 974 warn "object uses attachment '$name' which is not available, postponing.\n";
672 } 975 }
673 976
674 $obj->{_attachment}{$name} = undef; 977 $obj->{_attachment}{$name} = undef;
675} 978}
676 979
… …
716 "; 1019 ";
717 die if $@; 1020 die if $@;
718} 1021}
719 1022
720our $override; 1023our $override;
721our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 1024our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
722 1025
723sub override { 1026sub override {
724 $override = 1; 1027 $override = 1;
725 @invoke_results = (); 1028 @INVOKE_RESULTS = (@_);
726} 1029}
727 1030
728sub do_invoke { 1031sub do_invoke {
729 my $event = shift; 1032 my $event = shift;
730 my $callbacks = shift; 1033 my $callbacks = shift;
731 1034
732 @invoke_results = (); 1035 @INVOKE_RESULTS = ();
733 1036
734 local $override; 1037 local $override;
735 1038
736 for (@$callbacks) { 1039 for (@$callbacks) {
737 eval { &{$_->[1]} }; 1040 eval { &{$_->[1]} };
… …
746 } 1049 }
747 1050
748 0 1051 0
749} 1052}
750 1053
751=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1054=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
752 1055
753=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1056=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
754 1057
755Generate an object-specific event with the given arguments. 1058Generate an object-specific event with the given arguments.
756 1059
757This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 1060This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
758removed in future versions), and there is no public API to access override 1061removed in future versions), and there is no public API to access override
759results (if you must, access C<@cf::invoke_results> directly). 1062results (if you must, access C<@cf::INVOKE_RESULTS> directly).
760 1063
761=back 1064=back
762 1065
763=cut 1066=cut
764 1067
765############################################################################# 1068#############################################################################
766# object support 1069# object support
1070
1071sub _object_equal($$);
1072sub _object_equal($$) {
1073 my ($a, $b) = @_;
1074
1075 return 0 unless (ref $a) eq (ref $b);
1076
1077 if ("HASH" eq ref $a) {
1078 my @ka = keys %$a;
1079 my @kb = keys %$b;
1080
1081 return 0 if @ka != @kb;
1082
1083 for (0 .. $#ka) {
1084 return 0 unless $ka[$_] eq $kb[$_];
1085 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1086 }
1087
1088 } elsif ("ARRAY" eq ref $a) {
1089
1090 return 0 if @$a != @$b;
1091
1092 for (0 .. $#$a) {
1093 return 0 unless _object_equal $a->[$_], $b->[$_];
1094 }
1095
1096 } elsif ($a ne $b) {
1097 return 0;
1098 }
1099
1100 1
1101}
1102
1103our $SLOW_MERGES;#d#
1104sub _can_merge {
1105 my ($ob1, $ob2) = @_;
1106
1107 ++$SLOW_MERGES;#d#
1108
1109 # we do the slow way here
1110 return _object_equal $ob1, $ob2
1111}
767 1112
768sub reattach { 1113sub reattach {
769 # basically do the same as instantiate, without calling instantiate 1114 # basically do the same as instantiate, without calling instantiate
770 my ($obj) = @_; 1115 my ($obj) = @_;
771 1116
1117 # no longer needed after getting rid of delete_package?
772 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1118 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
773 1119
774 my $registry = $obj->registry; 1120 my $registry = $obj->registry;
775 1121
776 @$registry = (); 1122 @$registry = ();
777 1123
… …
792cf::attachable->attach ( 1138cf::attachable->attach (
793 prio => -1000000, 1139 prio => -1000000,
794 on_instantiate => sub { 1140 on_instantiate => sub {
795 my ($obj, $data) = @_; 1141 my ($obj, $data) = @_;
796 1142
797 $data = from_json $data; 1143 $data = decode_json $data;
798 1144
799 for (@$data) { 1145 for (@$data) {
800 my ($name, $args) = @$_; 1146 my ($name, $args) = @$_;
801 1147
802 $obj->attach ($name, %{$args || {} }); 1148 $obj->attach ($name, %{$args || {} });
… …
818sub object_freezer_save { 1164sub object_freezer_save {
819 my ($filename, $rdata, $objs) = @_; 1165 my ($filename, $rdata, $objs) = @_;
820 1166
821 sync_job { 1167 sync_job {
822 if (length $$rdata) { 1168 if (length $$rdata) {
1169 utf8::decode (my $decname = $filename);
823 warn sprintf "saving %s (%d,%d)\n", 1170 warn sprintf "saving %s (%d,%d)\n",
824 $filename, length $$rdata, scalar @$objs; 1171 $decname, length $$rdata, scalar @$objs;
825 1172
826 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1173 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
827 chmod SAVE_MODE, $fh; 1174 aio_chmod $fh, SAVE_MODE;
828 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1175 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
829 aio_fsync $fh if $cf::USE_FSYNC; 1176 if ($cf::USE_FSYNC) {
1177 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;
1178 aio_fsync $fh;
1179 }
830 close $fh; 1180 aio_close $fh;
831 1181
832 if (@$objs) { 1182 if (@$objs) {
833 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1183 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
834 chmod SAVE_MODE, $fh; 1184 aio_chmod $fh, SAVE_MODE;
835 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1185 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
836 aio_write $fh, 0, (length $data), $data, 0; 1186 aio_write $fh, 0, (length $data), $data, 0;
837 aio_fsync $fh if $cf::USE_FSYNC; 1187 if ($cf::USE_FSYNC) {
1188 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;
1189 aio_fsync $fh;
1190 }
838 close $fh; 1191 aio_close $fh;
839 aio_rename "$filename.pst~", "$filename.pst"; 1192 aio_rename "$filename.pst~", "$filename.pst";
840 } 1193 }
841 } else { 1194 } else {
842 aio_unlink "$filename.pst"; 1195 aio_unlink "$filename.pst";
843 } 1196 }
844 1197
845 aio_rename "$filename~", $filename; 1198 aio_rename "$filename~", $filename;
1199
1200 $filename =~ s%/[^/]+$%%;
1201 aio_pathsync $filename if $cf::USE_FSYNC;
846 } else { 1202 } else {
847 warn "FATAL: $filename~: $!\n"; 1203 warn "unable to save objects: $filename~: $!\n";
848 } 1204 }
849 } else { 1205 } else {
850 aio_unlink $filename; 1206 aio_unlink $filename;
851 aio_unlink "$filename.pst"; 1207 aio_unlink "$filename.pst";
852 } 1208 }
853 } 1209 };
854} 1210}
855 1211
856sub object_freezer_as_string { 1212sub object_freezer_as_string {
857 my ($rdata, $objs) = @_; 1213 my ($rdata, $objs) = @_;
858 1214
… …
870 or return; 1226 or return;
871 1227
872 unless (aio_stat "$filename.pst") { 1228 unless (aio_stat "$filename.pst") {
873 (aio_load "$filename.pst", $av) >= 0 1229 (aio_load "$filename.pst", $av) >= 0
874 or return; 1230 or return;
1231
875 $av = eval { (Storable::thaw $av)->{objs} }; 1232 my $st = eval { Coro::Storable::thaw $av };
1233 $av = $st->{objs};
876 } 1234 }
877 1235
1236 utf8::decode (my $decname = $filename);
878 warn sprintf "loading %s (%d)\n", 1237 warn sprintf "loading %s (%d,%d)\n",
879 $filename, length $data, scalar @{$av || []};#d# 1238 $decname, length $data, scalar @{$av || []};
1239
880 return ($data, $av); 1240 ($data, $av)
881} 1241}
1242
1243=head2 COMMAND CALLBACKS
1244
1245=over 4
1246
1247=cut
882 1248
883############################################################################# 1249#############################################################################
884# command handling &c 1250# command handling &c
885 1251
886=item cf::register_command $name => \&callback($ob,$args); 1252=item cf::register_command $name => \&callback($ob,$args);
… …
899 push @{ $COMMAND{$name} }, [$caller, $cb]; 1265 push @{ $COMMAND{$name} }, [$caller, $cb];
900} 1266}
901 1267
902=item cf::register_extcmd $name => \&callback($pl,$packet); 1268=item cf::register_extcmd $name => \&callback($pl,$packet);
903 1269
904Register a callbackf ro execution when the client sends an extcmd packet. 1270Register a callback for execution when the client sends an (synchronous)
1271extcmd packet. Ext commands will be processed in the order they are
1272received by the server, like other user commands. The first argument is
1273the logged-in player. Ext commands can only be processed after a player
1274has logged in successfully.
905 1275
906If the callback returns something, it is sent back as if reply was being 1276If the callback returns something, it is sent back as if reply was being
907called. 1277called.
908 1278
1279=item cf::register_exticmd $name => \&callback($ns,$packet);
1280
1281Register a callback for execution when the client sends an (asynchronous)
1282exticmd packet. Exti commands are processed by the server as soon as they
1283are received, i.e. out of order w.r.t. other commands. The first argument
1284is a client socket. Exti commands can be received anytime, even before
1285log-in.
1286
1287If the callback returns something, it is sent back as if reply was being
1288called.
1289
909=cut 1290=cut
910 1291
911sub register_extcmd { 1292sub register_extcmd {
912 my ($name, $cb) = @_; 1293 my ($name, $cb) = @_;
913 1294
914 $EXTCMD{$name} = $cb; 1295 $EXTCMD{$name} = $cb;
915} 1296}
1297
1298sub register_exticmd {
1299 my ($name, $cb) = @_;
1300
1301 $EXTICMD{$name} = $cb;
1302}
1303
1304use File::Glob ();
916 1305
917cf::player->attach ( 1306cf::player->attach (
918 on_command => sub { 1307 on_command => sub {
919 my ($pl, $name, $params) = @_; 1308 my ($pl, $name, $params) = @_;
920 1309
… …
928 cf::override; 1317 cf::override;
929 }, 1318 },
930 on_extcmd => sub { 1319 on_extcmd => sub {
931 my ($pl, $buf) = @_; 1320 my ($pl, $buf) = @_;
932 1321
933 my $msg = eval { from_json $buf }; 1322 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
934 1323
935 if (ref $msg) { 1324 if (ref $msg) {
1325 my ($type, $reply, @payload) =
1326 "ARRAY" eq ref $msg
1327 ? @$msg
1328 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1329
1330 my @reply;
1331
936 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1332 if (my $cb = $EXTCMD{$type}) {
937 if (my %reply = $cb->($pl, $msg)) { 1333 @reply = $cb->($pl, @payload);
938 $pl->ext_reply ($msg->{msgid}, %reply);
939 }
940 } 1334 }
1335
1336 $pl->ext_reply ($reply, @reply)
1337 if $reply;
1338
941 } else { 1339 } else {
942 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1340 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
943 } 1341 }
944 1342
945 cf::override; 1343 cf::override;
946 }, 1344 },
947); 1345);
948 1346
1347# "readahead" all extensions
949sub load_extension { 1348sub cache_extensions {
950 my ($path) = @_; 1349 my $grp = IO::AIO::aio_group;
951 1350
952 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 1351 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
953 my $base = $1; 1352 for (grep /\.ext$/, @{$_[0]}) {
954 my $pkg = $1; 1353 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
955 $pkg =~ s/[^[:word:]]/_/g;
956 $pkg = "ext::$pkg";
957
958 warn "... loading '$path' into '$pkg'\n";
959
960 open my $fh, "<:utf8", $path
961 or die "$path: $!";
962
963 my $source =
964 "package $pkg; use strict; use utf8;\n"
965 . "#line 1 \"$path\"\n{\n"
966 . (do { local $/; <$fh> })
967 . "\n};\n1";
968
969 unless (eval $source) {
970 my $msg = $@ ? "$path: $@\n"
971 : "extension disabled.\n";
972 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
973 warn $@;
974 warn "mandatory extension failed to load, exiting.\n";
975 exit 1;
976 } 1354 }
977 die $@;
978 } 1355 };
979 1356
980 push @EXTS, $pkg; 1357 $grp
981} 1358}
982 1359
983sub load_extensions { 1360sub load_extensions {
1361 cf::sync_job {
1362 my %todo;
1363
984 for my $ext (<$LIBDIR/*.ext>) { 1364 for my $path (<$LIBDIR/*.ext>) {
985 next unless -r $ext; 1365 next unless -r $path;
986 eval { 1366
987 load_extension $ext; 1367 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1368 my $base = $1;
1369 my $pkg = $1;
1370 $pkg =~ s/[^[:word:]]/_/g;
1371 $pkg = "ext::$pkg";
1372
1373 open my $fh, "<:utf8", $path
1374 or die "$path: $!";
1375
1376 my $source = do { local $/; <$fh> };
1377
1378 my %ext = (
1379 path => $path,
1380 base => $base,
1381 pkg => $pkg,
1382 );
1383
1384 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1385 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1386
1387 $ext{source} =
1388 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1389 . "#line 1 \"$path\"\n{\n"
1390 . $source
1391 . "\n};\n1";
1392
1393 $todo{$base} = \%ext;
1394 }
1395
1396 my %done;
1397 while (%todo) {
1398 my $progress;
1399
1400 while (my ($k, $v) = each %todo) {
1401 for (split /,\s*/, $v->{meta}{depends}) {
1402 goto skip
1403 unless exists $done{$_};
1404 }
1405
1406 warn "... loading '$k' into '$v->{pkg}'\n";
1407
1408 unless (eval $v->{source}) {
1409 my $msg = $@ ? "$v->{path}: $@\n"
1410 : "$v->{base}: extension inactive.\n";
1411
1412 if (exists $v->{meta}{mandatory}) {
1413 warn $msg;
1414 cf::cleanup "mandatory extension failed to load, exiting.";
1415 }
1416
1417 warn $msg;
1418 }
1419
1420 $done{$k} = delete $todo{$k};
1421 push @EXTS, $v->{pkg};
1422 $progress = 1;
988 1 1423 }
989 } or warn "$ext not loaded: $@"; 1424
1425 skip:
1426 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1427 unless $progress;
1428 }
990 } 1429 };
991} 1430}
992 1431
993############################################################################# 1432#############################################################################
994 1433
1434=back
1435
995=head2 CORE EXTENSIONS 1436=head2 CORE EXTENSIONS
996 1437
997Functions and methods that extend core crossfire objects. 1438Functions and methods that extend core deliantra objects.
998 1439
999=cut 1440=cut
1000 1441
1001package cf::player; 1442package cf::player;
1002 1443
1003use Coro::AIO; 1444use Coro::AIO;
1004 1445
1005=head3 cf::player 1446=head3 cf::player
1006 1447
1007=over 4 1448=over 4
1449
1450=item cf::player::num_playing
1451
1452Returns the official number of playing players, as per the Crossfire metaserver rules.
1453
1454=cut
1455
1456sub num_playing {
1457 scalar grep
1458 $_->ob->map
1459 && !$_->hidden
1460 && !$_->ob->flag (cf::FLAG_WIZ),
1461 cf::player::list
1462}
1008 1463
1009=item cf::player::find $login 1464=item cf::player::find $login
1010 1465
1011Returns the given player object, loading it if necessary (might block). 1466Returns the given player object, loading it if necessary (might block).
1012 1467
… …
1031 1486
1032sub exists($) { 1487sub exists($) {
1033 my ($login) = @_; 1488 my ($login) = @_;
1034 1489
1035 $cf::PLAYER{$login} 1490 $cf::PLAYER{$login}
1036 or cf::sync_job { !aio_stat path $login } 1491 or !aio_stat path $login
1037} 1492}
1038 1493
1039sub find($) { 1494sub find($) {
1040 return $cf::PLAYER{$_[0]} || do { 1495 return $cf::PLAYER{$_[0]} || do {
1041 my $login = $_[0]; 1496 my $login = $_[0];
… …
1048 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1503 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1049 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1504 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1050 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1505 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1051 aio_unlink +(playerdir $login) . "/$login.pl"; 1506 aio_unlink +(playerdir $login) . "/$login.pl";
1052 1507
1053 my $pl = load_pl path $login 1508 my $f = new_from_file cf::object::thawer path $login
1054 or return; 1509 or return;
1510
1511 my $pl = cf::player::load_pl $f
1512 or return;
1513
1514 local $cf::PLAYER_LOADING{$login} = $pl;
1515 $f->resolve_delayed_derefs;
1055 $cf::PLAYER{$login} = $pl 1516 $cf::PLAYER{$login} = $pl
1056 } 1517 }
1057 } 1518 }
1058} 1519}
1059 1520
… …
1068 return if $pl->{deny_save}; 1529 return if $pl->{deny_save};
1069 1530
1070 aio_mkdir playerdir $pl, 0770; 1531 aio_mkdir playerdir $pl, 0770;
1071 $pl->{last_save} = $cf::RUNTIME; 1532 $pl->{last_save} = $cf::RUNTIME;
1072 1533
1534 cf::get_slot 0.01;
1535
1073 $pl->save_pl ($path); 1536 $pl->save_pl ($path);
1074 Coro::cede; 1537 cf::cede_to_tick;
1075} 1538}
1076 1539
1077sub new($) { 1540sub new($) {
1078 my ($login) = @_; 1541 my ($login) = @_;
1079 1542
… …
1085 $cf::PLAYER{$login} = $self; 1548 $cf::PLAYER{$login} = $self;
1086 1549
1087 $self 1550 $self
1088} 1551}
1089 1552
1553=item $player->send_msg ($channel, $msg, $color, [extra...])
1554
1555=cut
1556
1557sub send_msg {
1558 my $ns = shift->ns
1559 or return;
1560 $ns->send_msg (@_);
1561}
1562
1090=item $pl->quit_character 1563=item $pl->quit_character
1091 1564
1092Nukes the player without looking back. If logged in, the connection will 1565Nukes the player without looking back. If logged in, the connection will
1093be destroyed. May block for a long time. 1566be destroyed. May block for a long time.
1094 1567
… …
1098 my ($pl) = @_; 1571 my ($pl) = @_;
1099 1572
1100 my $name = $pl->ob->name; 1573 my $name = $pl->ob->name;
1101 1574
1102 $pl->{deny_save} = 1; 1575 $pl->{deny_save} = 1;
1103 $pl->password ("*"); # this should lock out the player until we nuked the dir 1576 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1104 1577
1105 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1578 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1106 $pl->deactivate; 1579 $pl->deactivate;
1580 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1581 $pl->ob->check_score;
1107 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1582 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1108 $pl->ns->destroy if $pl->ns; 1583 $pl->ns->destroy if $pl->ns;
1109 1584
1110 my $path = playerdir $pl; 1585 my $path = playerdir $pl;
1111 my $temp = "$path~$cf::RUNTIME~deleting~"; 1586 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1147 or return []; 1622 or return [];
1148 1623
1149 my @logins; 1624 my @logins;
1150 1625
1151 for my $login (@$dirs) { 1626 for my $login (@$dirs) {
1627 my $path = path $login;
1628
1629 # a .pst is a dead give-away for a valid player
1630 # if no pst file found, open and chekc for blocked users
1631 if (aio_stat "$path.pst") {
1152 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1632 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1153 aio_read $fh, 0, 512, my $buf, 0 or next; 1633 aio_read $fh, 0, 512, my $buf, 0 or next;
1154 $buf !~ /^password -------------$/m or next; # official not-valid tag 1634 $buf !~ /^password -------------$/m or next; # official not-valid tag
1635 }
1155 1636
1156 utf8::decode $login; 1637 utf8::decode $login;
1157 push @logins, $login; 1638 push @logins, $login;
1158 } 1639 }
1159 1640
… …
1186 } 1667 }
1187 1668
1188 \@paths 1669 \@paths
1189} 1670}
1190 1671
1672=item $protocol_xml = $player->expand_cfpod ($cfpod)
1673
1674Expand deliantra pod fragments into protocol xml.
1675
1191=item $player->ext_reply ($msgid, %msg) 1676=item $player->ext_reply ($msgid, @msg)
1192 1677
1193Sends an ext reply to the player. 1678Sends an ext reply to the player.
1194 1679
1195=cut 1680=cut
1196 1681
1197sub ext_reply($$%) { 1682sub ext_reply($$@) {
1198 my ($self, $id, %msg) = @_; 1683 my ($self, $id, @msg) = @_;
1199 1684
1200 $msg{msgid} = $id; 1685 $self->ns->ext_reply ($id, @msg)
1201
1202 $self->send ("ext " . cf::to_json \%msg);
1203} 1686}
1204 1687
1205=item $player->ext_event ($type, %msg) 1688=item $player->ext_msg ($type, @msg)
1206 1689
1207Sends an ext event to the client. 1690Sends an ext event to the client.
1208 1691
1209=cut 1692=cut
1210 1693
1211sub ext_event($$%) { 1694sub ext_msg($$@) {
1212 my ($self, $type, %msg) = @_; 1695 my ($self, $type, @msg) = @_;
1213 1696
1214 $self->ns->ext_event ($type, %msg); 1697 $self->ns->ext_msg ($type, @msg);
1215} 1698}
1216 1699
1217=head3 cf::region 1700=head3 cf::region
1218 1701
1219=over 4 1702=over 4
… …
1222 1705
1223package cf::region; 1706package cf::region;
1224 1707
1225=item cf::region::find_by_path $path 1708=item cf::region::find_by_path $path
1226 1709
1227Tries to decuce the probable region for a map knowing only its path. 1710Tries to decuce the likely region for a map knowing only its path.
1228 1711
1229=cut 1712=cut
1230 1713
1231sub find_by_path($) { 1714sub find_by_path($) {
1232 my ($path) = @_; 1715 my ($path) = @_;
1233 1716
1234 my ($match, $specificity); 1717 my ($match, $specificity);
1235 1718
1236 for my $region (list) { 1719 for my $region (list) {
1237 if ($region->match && $path =~ $region->match) { 1720 if ($region->{match} && $path =~ $region->{match}) {
1238 ($match, $specificity) = ($region, $region->specificity) 1721 ($match, $specificity) = ($region, $region->specificity)
1239 if $region->specificity > $specificity; 1722 if $region->specificity > $specificity;
1240 } 1723 }
1241 } 1724 }
1242 1725
… …
1263our $MAX_RESET = 3600; 1746our $MAX_RESET = 3600;
1264our $DEFAULT_RESET = 3000; 1747our $DEFAULT_RESET = 3000;
1265 1748
1266sub generate_random_map { 1749sub generate_random_map {
1267 my ($self, $rmp) = @_; 1750 my ($self, $rmp) = @_;
1751
1752 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1753
1268 # mit "rum" bekleckern, nicht 1754 # mit "rum" bekleckern, nicht
1269 $self->_create_random_map ( 1755 $self->_create_random_map (
1270 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1756 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1271 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1757 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1272 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1758 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1306 my ($self, $merge) = @_; 1792 my ($self, $merge) = @_;
1307 1793
1308 # we have to keep some variables in memory intact 1794 # we have to keep some variables in memory intact
1309 local $self->{path}; 1795 local $self->{path};
1310 local $self->{load_path}; 1796 local $self->{load_path};
1311 local $self->{deny_save};
1312 local $self->{deny_reset};
1313 1797
1314 $self->SUPER::thawer_merge ($merge); 1798 $self->SUPER::thawer_merge ($merge);
1315} 1799}
1316 1800
1317sub normalise { 1801sub normalise {
… …
1364 $self->init; # pass $1 etc. 1848 $self->init; # pass $1 etc.
1365 return $self; 1849 return $self;
1366 } 1850 }
1367 } 1851 }
1368 1852
1369 Carp::carp "unable to resolve path '$path' (base '$base')."; 1853 Carp::cluck "unable to resolve path '$path' (base '$base').";
1370 () 1854 ()
1371} 1855}
1372 1856
1373sub init { 1857sub init {
1374 my ($self) = @_; 1858 my ($self) = @_;
… …
1396 1880
1397# the temporary/swap location 1881# the temporary/swap location
1398sub save_path { 1882sub save_path {
1399 my ($self) = @_; 1883 my ($self) = @_;
1400 1884
1401 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1885 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1402 "$TMPDIR/$path.map" 1886 "$TMPDIR/$path.map"
1403} 1887}
1404 1888
1405# the unique path, undef == no special unique path 1889# the unique path, undef == no special unique path
1406sub uniq_path { 1890sub uniq_path {
1407 my ($self) = @_; 1891 my ($self) = @_;
1408 1892
1409 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1893 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1410 "$UNIQUEDIR/$path" 1894 "$UNIQUEDIR/$path"
1411} 1895}
1412 1896
1413# and all this just because we cannot iterate over 1897sub decay_objects {
1414# all maps in C++...
1415sub change_all_map_light {
1416 my ($change) = @_; 1898 my ($self) = @_;
1417 1899
1418 $_->change_map_light ($change) 1900 return if $self->{deny_reset};
1419 for grep $_->outdoor, values %cf::MAP; 1901
1902 $self->do_decay_objects;
1420} 1903}
1421 1904
1422sub unlink_save { 1905sub unlink_save {
1423 my ($self) = @_; 1906 my ($self) = @_;
1424 1907
… …
1429 1912
1430sub load_header_from($) { 1913sub load_header_from($) {
1431 my ($self, $path) = @_; 1914 my ($self, $path) = @_;
1432 1915
1433 utf8::encode $path; 1916 utf8::encode $path;
1434 #aio_open $path, O_RDONLY, 0 1917 my $f = new_from_file cf::object::thawer $path
1435 # or return;
1436
1437 $self->_load_header ($path)
1438 or return; 1918 or return;
1919
1920 $self->_load_header ($f)
1921 or return;
1922
1923 local $MAP_LOADING{$self->{path}} = $self;
1924 $f->resolve_delayed_derefs;
1439 1925
1440 $self->{load_path} = $path; 1926 $self->{load_path} = $path;
1441 1927
1442 1 1928 1
1443} 1929}
… …
1482 $self->load_header_orig 1968 $self->load_header_orig
1483 or return; 1969 or return;
1484 $self->prepare_orig; 1970 $self->prepare_orig;
1485 } 1971 }
1486 1972
1973 $self->{deny_reset} = 1
1974 if $self->no_reset;
1975
1487 $self->default_region (cf::region::find_by_path $self->{path}) 1976 $self->default_region (cf::region::find_by_path $self->{path})
1488 unless $self->default_region; 1977 unless $self->default_region;
1489 1978
1490 1 1979 1
1491} 1980}
… …
1494sub find { 1983sub find {
1495 my ($path, $origin) = @_; 1984 my ($path, $origin) = @_;
1496 1985
1497 $path = normalise $path, $origin && $origin->path; 1986 $path = normalise $path, $origin && $origin->path;
1498 1987
1988 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1499 cf::lock_wait "map_find:$path"; 1989 my $guard2 = cf::lock_acquire "map_find:$path";
1500 1990
1501 $cf::MAP{$path} || do { 1991 $cf::MAP{$path} || do {
1502 my $guard = cf::lock_acquire "map_find:$path";
1503 my $map = new_from_path cf::map $path 1992 my $map = new_from_path cf::map $path
1504 or return; 1993 or return;
1505 1994
1506 $map->{last_save} = $cf::RUNTIME; 1995 $map->{last_save} = $cf::RUNTIME;
1507 1996
1508 $map->load_header 1997 $map->load_header
1509 or return; 1998 or return;
1510 1999
1511 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 2000 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1512 # doing this can freeze the server in a sync job, obviously 2001 # doing this can freeze the server in a sync job, obviously
1513 #$cf::WAIT_FOR_TICK->wait; 2002 #$cf::WAIT_FOR_TICK->wait;
2003 undef $guard2;
2004 undef $guard1;
1514 $map->reset; 2005 $map->reset;
1515 undef $guard;
1516 return find $path; 2006 return find $path;
1517 } 2007 }
1518 2008
1519 $cf::MAP{$path} = $map 2009 $cf::MAP{$path} = $map
1520 } 2010 }
… …
1529 local $self->{deny_reset} = 1; # loading can take a long time 2019 local $self->{deny_reset} = 1; # loading can take a long time
1530 2020
1531 my $path = $self->{path}; 2021 my $path = $self->{path};
1532 2022
1533 { 2023 {
1534 my $guard = cf::lock_acquire "map_load:$path"; 2024 my $guard = cf::lock_acquire "map_data:$path";
1535 2025
2026 return unless $self->valid;
1536 return if $self->in_memory != cf::MAP_SWAPPED; 2027 return unless $self->in_memory == cf::MAP_SWAPPED;
1537 2028
1538 $self->in_memory (cf::MAP_LOADING); 2029 $self->in_memory (cf::MAP_LOADING);
1539 2030
1540 $self->alloc; 2031 $self->alloc;
1541 2032
1542 $self->pre_load; 2033 $self->pre_load;
1543 Coro::cede; 2034 cf::cede_to_tick;
1544 2035
2036 my $f = new_from_file cf::object::thawer $self->{load_path};
2037 $f->skip_block;
1545 $self->_load_objects ($self->{load_path}, 1) 2038 $self->_load_objects ($f)
1546 or return; 2039 or return;
1547 2040
1548 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2041 $self->post_load_original
1549 if delete $self->{load_original}; 2042 if delete $self->{load_original};
1550 2043
1551 if (my $uniq = $self->uniq_path) { 2044 if (my $uniq = $self->uniq_path) {
1552 utf8::encode $uniq; 2045 utf8::encode $uniq;
1553 if (aio_open $uniq, O_RDONLY, 0) { 2046 unless (aio_stat $uniq) {
2047 if (my $f = new_from_file cf::object::thawer $uniq) {
1554 $self->clear_unique_items; 2048 $self->clear_unique_items;
1555 $self->_load_objects ($uniq, 0); 2049 $self->_load_objects ($f);
2050 $f->resolve_delayed_derefs;
2051 }
1556 } 2052 }
1557 } 2053 }
1558 2054
1559 Coro::cede; 2055 $f->resolve_delayed_derefs;
2056
2057 cf::cede_to_tick;
1560 # now do the right thing for maps 2058 # now do the right thing for maps
1561 $self->link_multipart_objects; 2059 $self->link_multipart_objects;
1562 $self->difficulty ($self->estimate_difficulty) 2060 $self->difficulty ($self->estimate_difficulty)
1563 unless $self->difficulty; 2061 unless $self->difficulty;
1564 Coro::cede; 2062 cf::cede_to_tick;
1565 2063
1566 unless ($self->{deny_activate}) { 2064 unless ($self->{deny_activate}) {
1567 $self->decay_objects; 2065 $self->decay_objects;
1568 $self->fix_auto_apply; 2066 $self->fix_auto_apply;
1569 $self->update_buttons; 2067 $self->update_buttons;
1570 Coro::cede; 2068 cf::cede_to_tick;
1571 $self->set_darkness_map;
1572 Coro::cede;
1573 $self->activate; 2069 $self->activate;
1574 } 2070 }
1575 2071
2072 $self->{last_save} = $cf::RUNTIME;
2073 $self->last_access ($cf::RUNTIME);
2074
1576 $self->in_memory (cf::MAP_IN_MEMORY); 2075 $self->in_memory (cf::MAP_ACTIVE);
1577 } 2076 }
1578 2077
1579 $self->post_load; 2078 $self->post_load;
1580} 2079}
1581 2080
… …
1583 my ($self, $ob) = @_; 2082 my ($self, $ob) = @_;
1584 2083
1585 return find "~" . $ob->name . "/" . $self->{path} 2084 return find "~" . $ob->name . "/" . $self->{path}
1586 if $self->per_player; 2085 if $self->per_player;
1587 2086
2087# return find "?party/" . $ob->name . "/" . $self->{path}
2088# if $self->per_party;
2089
1588 $self 2090 $self
1589} 2091}
1590 2092
1591# find and load all maps in the 3x3 area around a map 2093# find and load all maps in the 3x3 area around a map
1592sub load_diag { 2094sub load_neighbours {
1593 my ($map) = @_; 2095 my ($map) = @_;
1594 2096
1595 my @diag; # diagonal neighbours 2097 my @neigh; # diagonal neighbours
1596 2098
1597 for (0 .. 3) { 2099 for (0 .. 3) {
1598 my $neigh = $map->tile_path ($_) 2100 my $neigh = $map->tile_path ($_)
1599 or next; 2101 or next;
1600 $neigh = find $neigh, $map 2102 $neigh = find $neigh, $map
1601 or next; 2103 or next;
1602 $neigh->load; 2104 $neigh->load;
1603 2105
2106 push @neigh,
1604 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2107 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1605 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2108 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1606 } 2109 }
1607 2110
1608 for (@diag) { 2111 for (grep defined $_->[0], @neigh) {
2112 my ($path, $origin) = @$_;
1609 my $neigh = find @$_ 2113 my $neigh = find $path, $origin
1610 or next; 2114 or next;
1611 $neigh->load; 2115 $neigh->load;
1612 } 2116 }
1613} 2117}
1614 2118
… …
1619} 2123}
1620 2124
1621sub do_load_sync { 2125sub do_load_sync {
1622 my ($map) = @_; 2126 my ($map) = @_;
1623 2127
2128 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2129 if $Coro::current == $Coro::main;
2130
1624 cf::sync_job { $map->load }; 2131 cf::sync_job { $map->load };
1625} 2132}
1626 2133
1627our %MAP_PREFETCH; 2134our %MAP_PREFETCH;
1628our $MAP_PREFETCHER = undef; 2135our $MAP_PREFETCHER = undef;
1629 2136
1630sub find_async { 2137sub find_async {
1631 my ($path, $origin) = @_; 2138 my ($path, $origin, $load) = @_;
1632 2139
1633 $path = normalise $path, $origin && $origin->{path}; 2140 $path = normalise $path, $origin && $origin->{path};
1634 2141
1635 if (my $map = $cf::MAP{$path}) { 2142 if (my $map = $cf::MAP{$path}) {
1636 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2143 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1637 } 2144 }
1638 2145
1639 undef $MAP_PREFETCH{$path}; 2146 $MAP_PREFETCH{$path} |= $load;
2147
1640 $MAP_PREFETCHER ||= cf::async { 2148 $MAP_PREFETCHER ||= cf::async {
2149 $Coro::current->{desc} = "map prefetcher";
2150
1641 while (%MAP_PREFETCH) { 2151 while (%MAP_PREFETCH) {
1642 for my $path (keys %MAP_PREFETCH) { 2152 while (my ($k, $v) = each %MAP_PREFETCH) {
1643 my $map = find $path 2153 if (my $map = find $k) {
1644 or next;
1645 $map->load; 2154 $map->load if $v;
2155 }
1646 2156
1647 delete $MAP_PREFETCH{$path}; 2157 delete $MAP_PREFETCH{$k};
1648 } 2158 }
1649 } 2159 }
1650 undef $MAP_PREFETCHER; 2160 undef $MAP_PREFETCHER;
1651 }; 2161 };
1652 $MAP_PREFETCHER->prio (6); 2162 $MAP_PREFETCHER->prio (6);
… …
1655} 2165}
1656 2166
1657sub save { 2167sub save {
1658 my ($self) = @_; 2168 my ($self) = @_;
1659 2169
1660 my $lock = cf::lock_acquire "map_data:" . $self->path; 2170 my $lock = cf::lock_acquire "map_data:$self->{path}";
1661 2171
1662 $self->{last_save} = $cf::RUNTIME; 2172 $self->{last_save} = $cf::RUNTIME;
1663 2173
1664 return unless $self->dirty; 2174 return unless $self->dirty;
1665 2175
… …
1671 return if $self->{deny_save}; 2181 return if $self->{deny_save};
1672 2182
1673 local $self->{last_access} = $self->last_access;#d# 2183 local $self->{last_access} = $self->last_access;#d#
1674 2184
1675 cf::async { 2185 cf::async {
2186 $Coro::current->{desc} = "map player save";
1676 $_->contr->save for $self->players; 2187 $_->contr->save for $self->players;
1677 }; 2188 };
2189
2190 cf::get_slot 0.02;
1678 2191
1679 if ($uniq) { 2192 if ($uniq) {
1680 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2193 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1681 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2194 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1682 } else { 2195 } else {
… …
1688 my ($self) = @_; 2201 my ($self) = @_;
1689 2202
1690 # save first because save cedes 2203 # save first because save cedes
1691 $self->save; 2204 $self->save;
1692 2205
1693 my $lock = cf::lock_acquire "map_data:" . $self->path; 2206 my $lock = cf::lock_acquire "map_data:$self->{path}";
1694 2207
1695 return if $self->players; 2208 return if $self->players;
1696 return if $self->in_memory != cf::MAP_IN_MEMORY; 2209 return if $self->in_memory != cf::MAP_ACTIVE;
1697 return if $self->{deny_save}; 2210 return if $self->{deny_save};
1698 2211
2212 $self->in_memory (cf::MAP_SWAPPED);
2213
2214 $self->deactivate;
2215 $_->clear_links_to ($self) for values %cf::MAP;
1699 $self->clear; 2216 $self->clear;
1700 $self->in_memory (cf::MAP_SWAPPED);
1701} 2217}
1702 2218
1703sub reset_at { 2219sub reset_at {
1704 my ($self) = @_; 2220 my ($self) = @_;
1705 2221
1706 # TODO: safety, remove and allow resettable per-player maps 2222 # TODO: safety, remove and allow resettable per-player maps
1707 return 1e99 if $self->isa ("ext::map_per_player");#d#
1708 return 1e99 if $self->{deny_reset}; 2223 return 1e99 if $self->{deny_reset};
1709 2224
1710 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2225 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1711 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2226 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1712 2227
… …
1723 my ($self) = @_; 2238 my ($self) = @_;
1724 2239
1725 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2240 my $lock = cf::lock_acquire "map_data:$self->{path}";
1726 2241
1727 return if $self->players; 2242 return if $self->players;
1728 return if $self->isa ("ext::map_per_player");#d#
1729 2243
1730 warn "resetting map ", $self->path;#d# 2244 warn "resetting map ", $self->path, "\n";
1731 2245
1732 $self->in_memory (cf::MAP_SWAPPED); 2246 $self->in_memory (cf::MAP_SWAPPED);
1733 2247
1734 # need to save uniques path 2248 # need to save uniques path
1735 unless ($self->{deny_save}) { 2249 unless ($self->{deny_save}) {
… …
1739 if $uniq; 2253 if $uniq;
1740 } 2254 }
1741 2255
1742 delete $cf::MAP{$self->path}; 2256 delete $cf::MAP{$self->path};
1743 2257
2258 $self->deactivate;
2259 $_->clear_links_to ($self) for values %cf::MAP;
1744 $self->clear; 2260 $self->clear;
1745
1746 $_->clear_links_to ($self) for values %cf::MAP;
1747 2261
1748 $self->unlink_save; 2262 $self->unlink_save;
1749 $self->destroy; 2263 $self->destroy;
1750} 2264}
1751 2265
1752my $nuke_counter = "aaaa"; 2266my $nuke_counter = "aaaa";
1753 2267
1754sub nuke { 2268sub nuke {
1755 my ($self) = @_; 2269 my ($self) = @_;
1756 2270
2271 {
2272 my $lock = cf::lock_acquire "map_data:$self->{path}";
2273
1757 delete $cf::MAP{$self->path}; 2274 delete $cf::MAP{$self->path};
1758 2275
1759 $self->unlink_save; 2276 $self->unlink_save;
1760 2277
1761 bless $self, "cf::map"; 2278 bless $self, "cf::map";
1762 delete $self->{deny_reset}; 2279 delete $self->{deny_reset};
1763 $self->{deny_save} = 1; 2280 $self->{deny_save} = 1;
1764 $self->reset_timeout (1); 2281 $self->reset_timeout (1);
1765 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2282 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1766 2283
1767 $cf::MAP{$self->path} = $self; 2284 $cf::MAP{$self->path} = $self;
2285 }
1768 2286
1769 $self->reset; # polite request, might not happen 2287 $self->reset; # polite request, might not happen
2288}
2289
2290=item $maps = cf::map::tmp_maps
2291
2292Returns an arrayref with all map paths of currently instantiated and saved
2293maps. May block.
2294
2295=cut
2296
2297sub tmp_maps() {
2298 [
2299 map {
2300 utf8::decode $_;
2301 /\.map$/
2302 ? normalise $_
2303 : ()
2304 } @{ aio_readdir $TMPDIR or [] }
2305 ]
2306}
2307
2308=item $maps = cf::map::random_maps
2309
2310Returns an arrayref with all map paths of currently instantiated and saved
2311random maps. May block.
2312
2313=cut
2314
2315sub random_maps() {
2316 [
2317 map {
2318 utf8::decode $_;
2319 /\.map$/
2320 ? normalise "?random/$_"
2321 : ()
2322 } @{ aio_readdir $RANDOMDIR or [] }
2323 ]
1770} 2324}
1771 2325
1772=item cf::map::unique_maps 2326=item cf::map::unique_maps
1773 2327
1774Returns an arrayref of paths of all shared maps that have 2328Returns an arrayref of paths of all shared maps that have
1775instantiated unique items. May block. 2329instantiated unique items. May block.
1776 2330
1777=cut 2331=cut
1778 2332
1779sub unique_maps() { 2333sub unique_maps() {
1780 my $files = aio_readdir $UNIQUEDIR 2334 [
1781 or return; 2335 map {
1782
1783 my @paths;
1784
1785 for (@$files) {
1786 utf8::decode $_; 2336 utf8::decode $_;
1787 next if /\.pst$/; 2337 s/\.map$//; # TODO future compatibility hack
1788 next unless /^$PATH_SEP/o; 2338 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
1789 2339 ? ()
1790 push @paths, cf::map::normalise $_; 2340 : normalise $_
2341 } @{ aio_readdir $UNIQUEDIR or [] }
1791 } 2342 ]
1792
1793 \@paths
1794} 2343}
1795
1796package cf;
1797 2344
1798=back 2345=back
1799 2346
1800=head3 cf::object 2347=head3 cf::object
1801 2348
… …
1805 2352
1806=over 4 2353=over 4
1807 2354
1808=item $ob->inv_recursive 2355=item $ob->inv_recursive
1809 2356
1810Returns the inventory of the object _and_ their inventories, recursively. 2357Returns the inventory of the object I<and> their inventories, recursively,
2358but I<not> the object itself.
1811 2359
1812=cut 2360=cut
1813 2361
1814sub inv_recursive_; 2362sub inv_recursive_;
1815sub inv_recursive_ { 2363sub inv_recursive_ {
… …
1818 2366
1819sub inv_recursive { 2367sub inv_recursive {
1820 inv_recursive_ inv $_[0] 2368 inv_recursive_ inv $_[0]
1821} 2369}
1822 2370
2371=item $ref = $ob->ref
2372
2373Creates and returns a persistent reference to an object that can be stored as a string.
2374
2375=item $ob = cf::object::deref ($refstring)
2376
2377returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2378even if the object actually exists. May block.
2379
2380=cut
2381
2382sub deref {
2383 my ($ref) = @_;
2384
2385 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2386 my ($uuid, $name) = ($1, $2);
2387 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2388 or return;
2389 $pl->ob->uuid eq $uuid
2390 or return;
2391
2392 $pl->ob
2393 } else {
2394 warn "$ref: cannot resolve object reference\n";
2395 undef
2396 }
2397}
2398
1823package cf; 2399package cf;
1824 2400
1825=back 2401=back
1826 2402
1827=head3 cf::object::player 2403=head3 cf::object::player
… …
1833Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2409Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
1834can be C<undef>. Does the right thing when the player is currently in a 2410can be C<undef>. Does the right thing when the player is currently in a
1835dialogue with the given NPC character. 2411dialogue with the given NPC character.
1836 2412
1837=cut 2413=cut
2414
2415our $SAY_CHANNEL = {
2416 id => "say",
2417 title => "Map",
2418 reply => "say ",
2419 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2420};
2421
2422our $CHAT_CHANNEL = {
2423 id => "chat",
2424 title => "Chat",
2425 reply => "chat ",
2426 tooltip => "Player chat and shouts, global to the server.",
2427};
1838 2428
1839# rough implementation of a future "reply" method that works 2429# rough implementation of a future "reply" method that works
1840# with dialog boxes. 2430# with dialog boxes.
1841#TODO: the first argument must go, split into a $npc->reply_to ( method 2431#TODO: the first argument must go, split into a $npc->reply_to ( method
1842sub cf::object::player::reply($$$;$) { 2432sub cf::object::player::reply($$$;$) {
… …
1844 2434
1845 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2435 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1846 2436
1847 if ($self->{record_replies}) { 2437 if ($self->{record_replies}) {
1848 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2438 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2439
1849 } else { 2440 } else {
2441 my $pl = $self->contr;
2442
2443 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2444 my $dialog = $pl->{npc_dialog};
2445 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2446
2447 } else {
1850 $msg = $npc->name . " says: $msg" if $npc; 2448 $msg = $npc->name . " says: $msg" if $npc;
1851 $self->message ($msg, $flags); 2449 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2450 }
1852 } 2451 }
2452}
2453
2454=item $object->send_msg ($channel, $msg, $color, [extra...])
2455
2456=cut
2457
2458sub cf::object::send_msg {
2459 my $pl = shift->contr
2460 or return;
2461 $pl->send_msg (@_);
1853} 2462}
1854 2463
1855=item $player_object->may ("access") 2464=item $player_object->may ("access")
1856 2465
1857Returns wether the given player is authorized to access resource "access" 2466Returns wether the given player is authorized to access resource "access"
… …
1870 2479
1871=item $player_object->enter_link 2480=item $player_object->enter_link
1872 2481
1873Freezes the player and moves him/her to a special map (C<{link}>). 2482Freezes the player and moves him/her to a special map (C<{link}>).
1874 2483
1875The player should be reasonably safe there for short amounts of time. You 2484The player should be reasonably safe there for short amounts of time (e.g.
1876I<MUST> call C<leave_link> as soon as possible, though. 2485for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2486though, as the palyer cannot control the character while it is on the link
2487map.
1877 2488
1878Will never block. 2489Will never block.
1879 2490
1880=item $player_object->leave_link ($map, $x, $y) 2491=item $player_object->leave_link ($map, $x, $y)
1881 2492
… …
1904 $self->deactivate_recursive; 2515 $self->deactivate_recursive;
1905 2516
1906 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2517 return if UNIVERSAL::isa $self->map, "ext::map_link";
1907 2518
1908 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2519 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1909 if $self->map; 2520 if $self->map && $self->map->{path} ne "{link}";
1910 2521
1911 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2522 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1912} 2523}
1913 2524
1914sub cf::object::player::leave_link { 2525sub cf::object::player::leave_link {
1915 my ($self, $map, $x, $y) = @_; 2526 my ($self, $map, $x, $y) = @_;
2527
2528 return unless $self->contr->active;
1916 2529
1917 my $link_pos = delete $self->{_link_pos}; 2530 my $link_pos = delete $self->{_link_pos};
1918 2531
1919 unless ($map) { 2532 unless ($map) {
1920 # restore original map position 2533 # restore original map position
… …
1934 # use -1 or undef as default coordinates, not 0, 0 2547 # use -1 or undef as default coordinates, not 0, 0
1935 ($x, $y) = ($map->enter_x, $map->enter_y) 2548 ($x, $y) = ($map->enter_x, $map->enter_y)
1936 if $x <=0 && $y <= 0; 2549 if $x <=0 && $y <= 0;
1937 2550
1938 $map->load; 2551 $map->load;
1939 $map->load_diag; 2552 $map->load_neighbours;
1940 2553
1941 return unless $self->contr->active; 2554 return unless $self->contr->active;
1942 $self->activate_recursive;
1943 2555
1944 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2556 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1945 $self->enter_map ($map, $x, $y); 2557 $self->enter_map ($map, $x, $y);
1946}
1947 2558
1948cf::player->attach ( 2559 # only activate afterwards, to support waiting in hooks
1949 on_logout => sub { 2560 $self->activate_recursive;
1950 my ($pl) = @_; 2561}
1951 2562
1952 # abort map switching before logout 2563=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1953 if ($pl->ob->{_link_pos}) {
1954 cf::sync_job {
1955 $pl->ob->leave_link
1956 };
1957 }
1958 },
1959 on_login => sub {
1960 my ($pl) = @_;
1961 2564
1962 # try to abort aborted map switching on player login :) 2565Moves the player to the given map-path and coordinates by first freezing
1963 # should happen only on crashes 2566her, loading and preparing them map, calling the provided $check callback
1964 if ($pl->ob->{_link_pos}) { 2567that has to return the map if sucecssful, and then unfreezes the player on
1965 $pl->ob->enter_link; 2568the new (success) or old (failed) map position. In either case, $done will
1966 (async { 2569be called at the end of this process.
1967 $pl->ob->reply (undef,
1968 "There was an internal problem at your last logout, "
1969 . "the server will try to bring you to your intended destination in a second.",
1970 cf::NDI_RED);
1971 # we need this sleep as the login has a concurrent enter_exit running
1972 # and this sleep increases chances of the player not ending up in scorn
1973 Coro::Timer::sleep 1;
1974 $pl->ob->leave_link;
1975 })->prio (2);
1976 }
1977 },
1978);
1979 2570
1980=item $player_object->goto ($path, $x, $y) 2571Note that $check will be called with a potentially non-loaded map, so if
2572it needs a loaded map it has to call C<< ->load >>.
1981 2573
1982=cut 2574=cut
2575
2576our $GOTOGEN;
1983 2577
1984sub cf::object::player::goto { 2578sub cf::object::player::goto {
1985 my ($self, $path, $x, $y) = @_; 2579 my ($self, $path, $x, $y, $check, $done) = @_;
2580
2581 # do generation counting so two concurrent goto's will be executed in-order
2582 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1986 2583
1987 $self->enter_link; 2584 $self->enter_link;
1988 2585
1989 (async { 2586 (async {
2587 $Coro::current->{desc} = "player::goto $path $x $y";
2588
2589 # *tag paths override both path and x|y
2590 if ($path =~ /^\*(.*)$/) {
2591 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2592 my $ob = $obs[rand @obs];
2593
2594 # see if we actually can go there
2595 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2596 $ob = $obs[rand @obs];
2597 } else {
2598 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2599 }
2600 # else put us there anyways for now #d#
2601
2602 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2603 } else {
2604 ($path, $x, $y) = (undef, undef, undef);
2605 }
2606 }
2607
1990 my $map = eval { 2608 my $map = eval {
1991 my $map = cf::map::find $path; 2609 my $map = defined $path ? cf::map::find $path : undef;
2610
2611 if ($map) {
1992 $map = $map->customise_for ($self) if $map; 2612 $map = $map->customise_for ($self);
2613 $map = $check->($map) if $check && $map;
2614 } else {
2615 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2616 }
2617
1993 $map 2618 $map
2619 };
2620
2621 if ($@) {
2622 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2623 LOG llevError | logBacktrace, Carp::longmess $@;
1994 } or 2624 }
1995 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1996 2625
2626 if ($gen == $self->{_goto_generation}) {
2627 delete $self->{_goto_generation};
1997 $self->leave_link ($map, $x, $y); 2628 $self->leave_link ($map, $x, $y);
2629 }
2630
2631 $done->() if $done;
1998 })->prio (1); 2632 })->prio (1);
1999} 2633}
2000 2634
2001=item $player_object->enter_exit ($exit_object) 2635=item $player_object->enter_exit ($exit_object)
2002 2636
… …
2022} 2656}
2023 2657
2024sub prepare_random_map { 2658sub prepare_random_map {
2025 my ($exit) = @_; 2659 my ($exit) = @_;
2026 2660
2027 my $guard = cf::lock_acquire "exit_prepare:$exit";
2028
2029 # all this does is basically replace the /! path by 2661 # all this does is basically replace the /! path by
2030 # a new random map path (?random/...) with a seed 2662 # a new random map path (?random/...) with a seed
2031 # that depends on the exit object 2663 # that depends on the exit object
2032 2664
2033 my $rmp = parse_random_map_params $exit->msg; 2665 my $rmp = parse_random_map_params $exit->msg;
… …
2035 if ($exit->map) { 2667 if ($exit->map) {
2036 $rmp->{region} = $exit->region->name; 2668 $rmp->{region} = $exit->region->name;
2037 $rmp->{origin_map} = $exit->map->path; 2669 $rmp->{origin_map} = $exit->map->path;
2038 $rmp->{origin_x} = $exit->x; 2670 $rmp->{origin_x} = $exit->x;
2039 $rmp->{origin_y} = $exit->y; 2671 $rmp->{origin_y} = $exit->y;
2672
2673 $exit->map->touch;
2040 } 2674 }
2041 2675
2042 $rmp->{random_seed} ||= $exit->random_seed; 2676 $rmp->{random_seed} ||= $exit->random_seed;
2043 2677
2044 my $data = cf::to_json $rmp; 2678 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2045 my $md5 = Digest::MD5::md5_hex $data; 2679 my $md5 = Digest::MD5::md5_hex $data;
2046 my $meta = "$RANDOMDIR/$md5.meta"; 2680 my $meta = "$RANDOMDIR/$md5.meta";
2047 2681
2048 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2682 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2049 aio_write $fh, 0, (length $data), $data, 0; 2683 aio_write $fh, 0, (length $data), $data, 0;
2050 undef $fh; 2684 undef $fh;
2051 aio_rename "$meta~", $meta; 2685 aio_rename "$meta~", $meta;
2052 2686
2687 my $slaying = "?random/$md5";
2688
2689 if ($exit->valid) {
2053 $exit->slaying ("?random/$md5"); 2690 $exit->slaying ("?random/$md5");
2054 $exit->msg (undef); 2691 $exit->msg (undef);
2692 }
2055 } 2693 }
2056} 2694}
2057 2695
2058sub cf::object::player::enter_exit { 2696sub cf::object::player::enter_exit {
2059 my ($self, $exit) = @_; 2697 my ($self, $exit) = @_;
2060 2698
2061 return unless $self->type == cf::PLAYER; 2699 return unless $self->type == cf::PLAYER;
2062 2700
2063 if ($exit->slaying eq "/!") {
2064 #TODO: this should de-fi-ni-te-ly not be a sync-job
2065 # the problem is that $exit might not survive long enough
2066 # so it needs to be done right now, right here
2067 cf::sync_job { prepare_random_map $exit };
2068 }
2069
2070 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2071 my $hp = $exit->stats->hp;
2072 my $sp = $exit->stats->sp;
2073
2074 $self->enter_link; 2701 $self->enter_link;
2075 2702
2076 (async { 2703 (async {
2077 $self->deactivate_recursive; # just to be sure 2704 $Coro::current->{desc} = "enter_exit";
2705
2078 unless (eval { 2706 unless (eval {
2707 $self->deactivate_recursive; # just to be sure
2708
2709 # random map handling
2710 {
2711 my $guard = cf::lock_acquire "exit_prepare:$exit";
2712
2713 prepare_random_map $exit
2714 if $exit->slaying eq "/!";
2715 }
2716
2717 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2718 my $x = $exit->stats->hp;
2719 my $y = $exit->stats->sp;
2720
2079 $self->goto ($slaying, $hp, $sp); 2721 $self->goto ($map, $x, $y);
2080 2722
2723 # if exit is damned, update players death & WoR home-position
2724 $self->contr->savebed ($map, $x, $y)
2725 if $exit->flag (cf::FLAG_DAMNED);
2726
2081 1; 2727 1
2082 }) { 2728 }) {
2083 $self->message ("Something went wrong deep within the crossfire server. " 2729 $self->message ("Something went wrong deep within the deliantra server. "
2084 . "I'll try to bring you back to the map you were before. " 2730 . "I'll try to bring you back to the map you were before. "
2085 . "Please report this to the dungeon master!", 2731 . "Please report this to the dungeon master!",
2086 cf::NDI_UNIQUE | cf::NDI_RED); 2732 cf::NDI_UNIQUE | cf::NDI_RED);
2087 2733
2088 warn "ERROR in enter_exit: $@"; 2734 warn "ERROR in enter_exit: $@";
… …
2107 2753
2108 utf8::encode $text; 2754 utf8::encode $text;
2109 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2755 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2110} 2756}
2111 2757
2758=item $client->send_msg ($channel, $msg, $color, [extra...])
2759
2760Send a drawinfo or msg packet to the client, formatting the msg for the
2761client if neccessary. C<$type> should be a string identifying the type of
2762the message, with C<log> being the default. If C<$color> is negative, suppress
2763the message unless the client supports the msg packet.
2764
2765=cut
2766
2767# non-persistent channels (usually the info channel)
2768our %CHANNEL = (
2769 "c/identify" => {
2770 id => "infobox",
2771 title => "Identify",
2772 reply => undef,
2773 tooltip => "Items recently identified",
2774 },
2775 "c/examine" => {
2776 id => "infobox",
2777 title => "Examine",
2778 reply => undef,
2779 tooltip => "Signs and other items you examined",
2780 },
2781 "c/book" => {
2782 id => "infobox",
2783 title => "Book",
2784 reply => undef,
2785 tooltip => "The contents of a note or book",
2786 },
2787 "c/lookat" => {
2788 id => "infobox",
2789 title => "Look",
2790 reply => undef,
2791 tooltip => "What you saw there",
2792 },
2793 "c/who" => {
2794 id => "infobox",
2795 title => "Players",
2796 reply => undef,
2797 tooltip => "Shows players who are currently online",
2798 },
2799 "c/body" => {
2800 id => "infobox",
2801 title => "Body Parts",
2802 reply => undef,
2803 tooltip => "Shows which body parts you posess and are available",
2804 },
2805 "c/statistics" => {
2806 id => "infobox",
2807 title => "Statistics",
2808 reply => undef,
2809 tooltip => "Shows your primary statistics",
2810 },
2811 "c/skills" => {
2812 id => "infobox",
2813 title => "Skills",
2814 reply => undef,
2815 tooltip => "Shows your experience per skill and item power",
2816 },
2817 "c/shopitems" => {
2818 id => "infobox",
2819 title => "Shop Items",
2820 reply => undef,
2821 tooltip => "Shows the items currently for sale in this shop",
2822 },
2823 "c/resistances" => {
2824 id => "infobox",
2825 title => "Resistances",
2826 reply => undef,
2827 tooltip => "Shows your resistances",
2828 },
2829 "c/pets" => {
2830 id => "infobox",
2831 title => "Pets",
2832 reply => undef,
2833 tooltip => "Shows information abotu your pets/a specific pet",
2834 },
2835 "c/perceiveself" => {
2836 id => "infobox",
2837 title => "Perceive Self",
2838 reply => undef,
2839 tooltip => "You gained detailed knowledge about yourself",
2840 },
2841 "c/uptime" => {
2842 id => "infobox",
2843 title => "Uptime",
2844 reply => undef,
2845 tooltip => "How long the server has been running since last restart",
2846 },
2847 "c/mapinfo" => {
2848 id => "infobox",
2849 title => "Map Info",
2850 reply => undef,
2851 tooltip => "Information related to the maps",
2852 },
2853 "c/party" => {
2854 id => "party",
2855 title => "Party",
2856 reply => "gsay ",
2857 tooltip => "Messages and chat related to your party",
2858 },
2859 "c/death" => {
2860 id => "death",
2861 title => "Death",
2862 reply => undef,
2863 tooltip => "Reason for and more info about your most recent death",
2864 },
2865 "c/say" => $SAY_CHANNEL,
2866 "c/chat" => $CHAT_CHANNEL,
2867);
2868
2869sub cf::client::send_msg {
2870 my ($self, $channel, $msg, $color, @extra) = @_;
2871
2872 $msg = $self->pl->expand_cfpod ($msg)
2873 unless $color & cf::NDI_VERBATIM;
2874
2875 $color &= cf::NDI_CLIENT_MASK; # just in case...
2876
2877 # check predefined channels, for the benefit of C
2878 if ($CHANNEL{$channel}) {
2879 $channel = $CHANNEL{$channel};
2880
2881 $self->ext_msg (channel_info => $channel);
2882 $channel = $channel->{id};
2883
2884 } elsif (ref $channel) {
2885 # send meta info to client, if not yet sent
2886 unless (exists $self->{channel}{$channel->{id}}) {
2887 $self->{channel}{$channel->{id}} = $channel;
2888 $self->ext_msg (channel_info => $channel);
2889 }
2890
2891 $channel = $channel->{id};
2892 }
2893
2894 return unless @extra || length $msg;
2895
2896 # default colour, mask it out
2897 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2898 if $color & cf::NDI_DEF;
2899
2900 my $pkt = "msg "
2901 . $self->{json_coder}->encode (
2902 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2903 );
2904
2905 # try lzf for large packets
2906 $pkt = "lzf " . Compress::LZF::compress $pkt
2907 if 1024 <= length $pkt and $self->{can_lzf};
2908
2909 # split very large packets
2910 if (8192 < length $pkt and $self->{can_lzf}) {
2911 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2912 $pkt = "frag";
2913 }
2914
2915 $self->send_packet ($pkt);
2916}
2917
2112=item $client->ext_event ($type, %msg) 2918=item $client->ext_msg ($type, @msg)
2113 2919
2114Sends an exti event to the client. 2920Sends an ext event to the client.
2115 2921
2116=cut 2922=cut
2117 2923
2118sub cf::client::ext_event($$%) { 2924sub cf::client::ext_msg($$@) {
2119 my ($self, $type, %msg) = @_; 2925 my ($self, $type, @msg) = @_;
2120 2926
2927 if ($self->extcmd == 2) {
2928 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2929 } elsif ($self->extcmd == 1) { # TODO: remove
2121 $msg{msgtype} = "event_$type"; 2930 push @msg, msgtype => "event_$type";
2122 $self->send_packet ("ext " . cf::to_json \%msg); 2931 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2932 }
2933}
2934
2935=item $client->ext_reply ($msgid, @msg)
2936
2937Sends an ext reply to the client.
2938
2939=cut
2940
2941sub cf::client::ext_reply($$@) {
2942 my ($self, $id, @msg) = @_;
2943
2944 if ($self->extcmd == 2) {
2945 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2946 } elsif ($self->extcmd == 1) {
2947 #TODO: version 1, remove
2948 unshift @msg, msgtype => "reply", msgid => $id;
2949 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2950 }
2123} 2951}
2124 2952
2125=item $success = $client->query ($flags, "text", \&cb) 2953=item $success = $client->query ($flags, "text", \&cb)
2126 2954
2127Queues a query to the client, calling the given callback with 2955Queues a query to the client, calling the given callback with
2128the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2956the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2129C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2957C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2130 2958
2131Queries can fail, so check the return code. Or don't, as queries will become 2959Queries can fail, so check the return code. Or don't, as queries will
2132reliable at some point in the future. 2960become reliable at some point in the future.
2133 2961
2134=cut 2962=cut
2135 2963
2136sub cf::client::query { 2964sub cf::client::query {
2137 my ($self, $flags, $text, $cb) = @_; 2965 my ($self, $flags, $text, $cb) = @_;
… …
2145 utf8::encode $text; 2973 utf8::encode $text;
2146 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2974 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2147 2975
2148 $self->send_packet ($self->{query_queue}[0][0]) 2976 $self->send_packet ($self->{query_queue}[0][0])
2149 if @{ $self->{query_queue} } == 1; 2977 if @{ $self->{query_queue} } == 1;
2978
2979 1
2150} 2980}
2151 2981
2152cf::client->attach ( 2982cf::client->attach (
2983 on_connect => sub {
2984 my ($ns) = @_;
2985
2986 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2987 },
2153 on_reply => sub { 2988 on_reply => sub {
2154 my ($ns, $msg) = @_; 2989 my ($ns, $msg) = @_;
2155 2990
2156 # this weird shuffling is so that direct followup queries 2991 # this weird shuffling is so that direct followup queries
2157 # get handled first 2992 # get handled first
… …
2169 } else { 3004 } else {
2170 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 3005 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2171 } 3006 }
2172 } 3007 }
2173 }, 3008 },
3009 on_exticmd => sub {
3010 my ($ns, $buf) = @_;
3011
3012 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3013
3014 if (ref $msg) {
3015 my ($type, $reply, @payload) =
3016 "ARRAY" eq ref $msg
3017 ? @$msg
3018 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3019
3020 my @reply;
3021
3022 if (my $cb = $EXTICMD{$type}) {
3023 @reply = $cb->($ns, @payload);
3024 }
3025
3026 $ns->ext_reply ($reply, @reply)
3027 if $reply;
3028
3029 } else {
3030 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3031 }
3032
3033 cf::override;
3034 },
2174); 3035);
2175 3036
2176=item $client->async (\&cb) 3037=item $client->async (\&cb)
2177 3038
2178Create a new coroutine, running the specified callback. The coroutine will 3039Create a new coroutine, running the specified callback. The coroutine will
… …
2219our $safe = new Safe "safe"; 3080our $safe = new Safe "safe";
2220our $safe_hole = new Safe::Hole; 3081our $safe_hole = new Safe::Hole;
2221 3082
2222$SIG{FPE} = 'IGNORE'; 3083$SIG{FPE} = 'IGNORE';
2223 3084
2224$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3085$safe->permit_only (Opcode::opset qw(
3086 :base_core :base_mem :base_orig :base_math
3087 grepstart grepwhile mapstart mapwhile
3088 sort time
3089));
2225 3090
2226# here we export the classes and methods available to script code 3091# here we export the classes and methods available to script code
2227 3092
2228=pod 3093=pod
2229 3094
2230The following functions and methods are available within a safe environment: 3095The following functions and methods are available within a safe environment:
2231 3096
2232 cf::object contr pay_amount pay_player map 3097 cf::object
3098 contr pay_amount pay_player map x y force_find force_add destroy
3099 insert remove name archname title slaying race decrease split
3100 value
3101
2233 cf::object::player player 3102 cf::object::player
2234 cf::player peaceful 3103 player
2235 cf::map trigger 3104
3105 cf::player
3106 peaceful
3107
3108 cf::map
3109 trigger
2236 3110
2237=cut 3111=cut
2238 3112
2239for ( 3113for (
2240 ["cf::object" => qw(contr pay_amount pay_player map)], 3114 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3115 insert remove inv nrof name archname title slaying race
3116 decrease split destroy change_exp value msg lore send_msg)],
2241 ["cf::object::player" => qw(player)], 3117 ["cf::object::player" => qw(player)],
2242 ["cf::player" => qw(peaceful)], 3118 ["cf::player" => qw(peaceful send_msg)],
2243 ["cf::map" => qw(trigger)], 3119 ["cf::map" => qw(trigger)],
2244) { 3120) {
2245 no strict 'refs'; 3121 no strict 'refs';
2246 my ($pkg, @funs) = @$_; 3122 my ($pkg, @funs) = @$_;
2247 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3123 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
2264 my ($code, %vars) = @_; 3140 my ($code, %vars) = @_;
2265 3141
2266 my $qcode = $code; 3142 my $qcode = $code;
2267 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3143 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2268 $qcode =~ s/\n/\\n/g; 3144 $qcode =~ s/\n/\\n/g;
3145
3146 %vars = (_dummy => 0) unless %vars;
2269 3147
2270 local $_; 3148 local $_;
2271 local @safe::cf::_safe_eval_args = values %vars; 3149 local @safe::cf::_safe_eval_args = values %vars;
2272 3150
2273 my $eval = 3151 my $eval =
… …
2316=back 3194=back
2317 3195
2318=cut 3196=cut
2319 3197
2320############################################################################# 3198#############################################################################
2321
2322=head2 EXTENSION DATABASE SUPPORT
2323
2324Crossfire maintains a very simple database for extension use. It can
2325currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2326convert to/from binary).
2327
2328The parameter C<$family> should best start with the name of the extension
2329using it, it should be unique.
2330
2331=over 4
2332
2333=item $value = cf::db_get $family => $key
2334
2335Returns a single value from the database.
2336
2337=item cf::db_put $family => $key => $value
2338
2339Stores the given C<$value> in the family.
2340
2341=cut
2342
2343our $DB;
2344
2345sub db_init {
2346 unless ($DB) {
2347 $DB = BDB::db_create $DB_ENV;
2348
2349 cf::sync_job {
2350 eval {
2351 $DB->set_flags (BDB::CHKSUM);
2352
2353 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2354 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2355 cf::cleanup "db_open(db): $!" if $!;
2356 };
2357 cf::cleanup "db_open(db): $@" if $@;
2358 };
2359 }
2360}
2361
2362sub db_get($$) {
2363 my $key = "$_[0]/$_[1]";
2364
2365 cf::sync_job {
2366 BDB::db_get $DB, undef, $key, my $data;
2367
2368 $! ? ()
2369 : $data
2370 }
2371}
2372
2373sub db_put($$$) {
2374 BDB::dbreq_pri 4;
2375 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2376}
2377
2378=item cf::cache $id => [$paths...], $processversion => $process
2379
2380Generic caching function that returns the value of the resource $id,
2381caching and regenerating as required.
2382
2383This function can block.
2384
2385=cut
2386
2387sub cache {
2388 my ($id, $src, $processversion, $process) = @_;
2389
2390 my $meta =
2391 join "\x00",
2392 $processversion,
2393 map {
2394 aio_stat $_
2395 and Carp::croak "$_: $!";
2396
2397 ($_, (stat _)[7,9])
2398 } @$src;
2399
2400 my $dbmeta = db_get cache => "$id/meta";
2401 if ($dbmeta ne $meta) {
2402 # changed, we may need to process
2403
2404 my @data;
2405 my $md5;
2406
2407 for (0 .. $#$src) {
2408 0 <= aio_load $src->[$_], $data[$_]
2409 or Carp::croak "$src->[$_]: $!";
2410 }
2411
2412 # if processing is expensive, check
2413 # checksum first
2414 if (1) {
2415 $md5 =
2416 join "\x00",
2417 $processversion,
2418 map {
2419 Coro::cede;
2420 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2421 } 0.. $#$src;
2422
2423
2424 my $dbmd5 = db_get cache => "$id/md5";
2425 if ($dbmd5 eq $md5) {
2426 db_put cache => "$id/meta", $meta;
2427
2428 return db_get cache => "$id/data";
2429 }
2430 }
2431
2432 my $t1 = Time::HiRes::time;
2433 my $data = $process->(\@data);
2434 my $t2 = Time::HiRes::time;
2435
2436 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2437
2438 db_put cache => "$id/data", $data;
2439 db_put cache => "$id/md5" , $md5;
2440 db_put cache => "$id/meta", $meta;
2441
2442 return $data;
2443 }
2444
2445 db_get cache => "$id/data"
2446}
2447
2448=item fork_call { }, $args
2449
2450Executes the given code block with the given arguments in a seperate
2451process, returning the results. Everything must be serialisable with
2452Coro::Storable. May, of course, block. Note that the executed sub may
2453never block itself or use any form of Event handling.
2454
2455=cut
2456
2457sub fork_call(&@) {
2458 my ($cb, @args) = @_;
2459
2460# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2461# or die "socketpair: $!";
2462 pipe my $fh1, my $fh2
2463 or die "pipe: $!";
2464
2465 if (my $pid = fork) {
2466 close $fh2;
2467
2468 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2469 $res = Coro::Storable::thaw $res;
2470
2471 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2472
2473 die $$res unless "ARRAY" eq ref $res;
2474
2475 return wantarray ? @$res : $res->[-1];
2476 } else {
2477 reset_signals;
2478 local $SIG{__WARN__};
2479 local $SIG{__DIE__};
2480 eval {
2481 close $fh1;
2482
2483 my @res = eval { $cb->(@args) };
2484 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2485 };
2486
2487 warn $@ if $@;
2488 _exit 0;
2489 }
2490}
2491
2492
2493
2494#############################################################################
2495# the server's init and main functions 3199# the server's init and main functions
2496 3200
2497sub load_facedata($) { 3201sub load_facedata($) {
2498 my ($path) = @_; 3202 my ($path) = @_;
3203
3204 # HACK to clear player env face cache, we need some signal framework
3205 # for this (global event?)
3206 %ext::player_env::MUSIC_FACE_CACHE = ();
3207
3208 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2499 3209
2500 warn "loading facedata from $path\n"; 3210 warn "loading facedata from $path\n";
2501 3211
2502 my $facedata; 3212 my $facedata;
2503 0 < aio_load $path, $facedata 3213 0 < aio_load $path, $facedata
… …
2506 $facedata = Coro::Storable::thaw $facedata; 3216 $facedata = Coro::Storable::thaw $facedata;
2507 3217
2508 $facedata->{version} == 2 3218 $facedata->{version} == 2
2509 or cf::cleanup "$path: version mismatch, cannot proceed."; 3219 or cf::cleanup "$path: version mismatch, cannot proceed.";
2510 3220
3221 # patch in the exptable
3222 $facedata->{resource}{"res/exp_table"} = {
3223 type => FT_RSRC,
3224 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3225 };
3226 cf::cede_to_tick;
3227
2511 { 3228 {
2512 my $faces = $facedata->{faceinfo}; 3229 my $faces = $facedata->{faceinfo};
2513 3230
2514 while (my ($face, $info) = each %$faces) { 3231 while (my ($face, $info) = each %$faces) {
2515 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3232 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3233
2516 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3234 cf::face::set_visibility $idx, $info->{visibility};
3235 cf::face::set_magicmap $idx, $info->{magicmap};
2517 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3236 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2518 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3237 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2519 Coro::cede; 3238
3239 cf::cede_to_tick;
2520 } 3240 }
2521 3241
2522 while (my ($face, $info) = each %$faces) { 3242 while (my ($face, $info) = each %$faces) {
2523 next unless $info->{smooth}; 3243 next unless $info->{smooth};
3244
2524 my $idx = cf::face::find $face 3245 my $idx = cf::face::find $face
2525 or next; 3246 or next;
3247
2526 if (my $smooth = cf::face::find $info->{smooth}) { 3248 if (my $smooth = cf::face::find $info->{smooth}) {
3249 cf::face::set_smooth $idx, $smooth;
2527 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3250 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2528 } else { 3251 } else {
2529 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3252 warn "smooth face '$info->{smooth}' not found for face '$face'";
2530 } 3253 }
2531 Coro::cede; 3254
3255 cf::cede_to_tick;
2532 } 3256 }
2533 } 3257 }
2534 3258
2535 { 3259 {
2536 my $anims = $facedata->{animinfo}; 3260 my $anims = $facedata->{animinfo};
2537 3261
2538 while (my ($anim, $info) = each %$anims) { 3262 while (my ($anim, $info) = each %$anims) {
2539 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3263 cf::anim::set $anim, $info->{frames}, $info->{facings};
2540 Coro::cede; 3264 cf::cede_to_tick;
2541 } 3265 }
2542 3266
2543 cf::anim::invalidate_all; # d'oh 3267 cf::anim::invalidate_all; # d'oh
2544 } 3268 }
2545 3269
3270 {
3271 # TODO: for gcfclient pleasure, we should give resources
3272 # that gcfclient doesn't grok a >10000 face index.
3273 my $res = $facedata->{resource};
3274
3275 while (my ($name, $info) = each %$res) {
3276 if (defined $info->{type}) {
3277 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3278 my $data;
3279
3280 if ($info->{type} & 1) {
3281 # prepend meta info
3282
3283 my $meta = $enc->encode ({
3284 name => $name,
3285 %{ $info->{meta} || {} },
3286 });
3287
3288 $data = pack "(w/a*)*", $meta, $info->{data};
3289 } else {
3290 $data = $info->{data};
3291 }
3292
3293 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3294 cf::face::set_type $idx, $info->{type};
3295 } else {
3296 $RESOURCE{$name} = $info;
3297 }
3298
3299 cf::cede_to_tick;
3300 }
3301 }
3302
3303 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3304
2546 1 3305 1
2547} 3306}
2548 3307
3308cf::global->attach (on_resource_update => sub {
3309 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3310 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3311
3312 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3313 my $sound = $soundconf->{compat}[$_]
3314 or next;
3315
3316 my $face = cf::face::find "sound/$sound->[1]";
3317 cf::sound::set $sound->[0] => $face;
3318 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3319 }
3320
3321 while (my ($k, $v) = each %{$soundconf->{event}}) {
3322 my $face = cf::face::find "sound/$v";
3323 cf::sound::set $k => $face;
3324 }
3325 }
3326});
3327
3328register_exticmd fx_want => sub {
3329 my ($ns, $want) = @_;
3330
3331 while (my ($k, $v) = each %$want) {
3332 $ns->fx_want ($k, $v);
3333 }
3334};
3335
3336sub load_resource_file($) {
3337 my $guard = lock_acquire "load_resource_file";
3338
3339 my $status = load_resource_file_ $_[0];
3340 get_slot 0.1, 100;
3341 cf::arch::commit_load;
3342
3343 $status
3344}
3345
2549sub reload_regions { 3346sub reload_regions {
3347 # HACK to clear player env face cache, we need some signal framework
3348 # for this (global event?)
3349 %ext::player_env::MUSIC_FACE_CACHE = ();
3350
2550 load_resource_file "$MAPDIR/regions" 3351 load_resource_file "$MAPDIR/regions"
2551 or die "unable to load regions file\n"; 3352 or die "unable to load regions file\n";
3353
3354 for (cf::region::list) {
3355 $_->{match} = qr/$_->{match}/
3356 if exists $_->{match};
3357 }
2552} 3358}
2553 3359
2554sub reload_facedata { 3360sub reload_facedata {
2555 load_facedata "$DATADIR/facedata" 3361 load_facedata "$DATADIR/facedata"
2556 or die "unable to load facedata\n"; 3362 or die "unable to load facedata\n";
… …
2567} 3373}
2568 3374
2569sub reload_resources { 3375sub reload_resources {
2570 warn "reloading resource files...\n"; 3376 warn "reloading resource files...\n";
2571 3377
2572 reload_regions;
2573 reload_facedata; 3378 reload_facedata;
2574 reload_archetypes; 3379 reload_archetypes;
3380 reload_regions;
2575 reload_treasures; 3381 reload_treasures;
2576 3382
2577 warn "finished reloading resource files\n"; 3383 warn "finished reloading resource files\n";
2578} 3384}
2579 3385
2580sub init { 3386sub reload_config {
2581 reload_resources;
2582}
2583
2584sub cfg_load {
2585 open my $fh, "<:utf8", "$CONFDIR/config" 3387 open my $fh, "<:utf8", "$CONFDIR/config"
2586 or return; 3388 or return;
2587 3389
2588 local $/; 3390 local $/;
2589 *CFG = YAML::Syck::Load <$fh>; 3391 *CFG = YAML::Load <$fh>;
2590 3392
2591 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3393 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2592 3394
2593 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3395 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2594 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3396 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
2600 }; 3402 };
2601 warn $@ if $@; 3403 warn $@ if $@;
2602 } 3404 }
2603} 3405}
2604 3406
3407sub pidfile() {
3408 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3409 or die "$PIDFILE: $!";
3410 flock $fh, &Fcntl::LOCK_EX
3411 or die "$PIDFILE: flock: $!";
3412 $fh
3413}
3414
3415# make sure only one server instance is running at any one time
3416sub atomic {
3417 my $fh = pidfile;
3418
3419 my $pid = <$fh>;
3420 kill 9, $pid if $pid > 0;
3421
3422 seek $fh, 0, 0;
3423 print $fh $$;
3424}
3425
3426sub main_loop {
3427 warn "EV::loop starting\n";
3428 if (1) {
3429 EV::loop;
3430 }
3431 warn "EV::loop returned\n";
3432 goto &main_loop unless $REALLY_UNLOOP;
3433}
3434
2605sub main { 3435sub main {
3436 cf::init_globals; # initialise logging
3437
3438 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3439 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3440 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3441 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3442
3443 cf::init_experience;
3444 cf::init_anim;
3445 cf::init_attackmess;
3446 cf::init_dynamic;
3447
3448 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3449
2606 # we must not ever block the main coroutine 3450 # we must not ever block the main coroutine
2607 local $Coro::idle = sub { 3451 local $Coro::idle = sub {
2608 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3452 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2609 (async { 3453 (async {
2610 Event::one_event; 3454 $Coro::current->{desc} = "IDLE BUG HANDLER";
3455 EV::loop EV::LOOP_ONESHOT;
2611 })->prio (Coro::PRIO_MAX); 3456 })->prio (Coro::PRIO_MAX);
2612 }; 3457 };
2613 3458
2614 cfg_load; 3459 evthread_start IO::AIO::poll_fileno;
3460
3461 cf::sync_job {
3462 reload_resources;
3463 reload_config;
2615 db_init; 3464 db_init;
3465
3466 cf::load_settings;
3467 cf::load_materials;
3468 cf::init_uuid;
3469 cf::init_signals;
3470 cf::init_commands;
3471 cf::init_skills;
3472
3473 cf::init_beforeplay;
3474
3475 atomic;
3476
2616 load_extensions; 3477 load_extensions;
2617 3478
2618 $TICK_WATCHER->start; 3479 utime time, time, $RUNTIMEFILE;
2619 Event::loop; 3480
3481 # no (long-running) fork's whatsoever before this point(!)
3482 use POSIX ();
3483 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3484
3485 (pop @POST_INIT)->(0) while @POST_INIT;
3486 };
3487
3488 main_loop;
2620} 3489}
2621 3490
2622############################################################################# 3491#############################################################################
2623# initialisation and cleanup 3492# initialisation and cleanup
2624 3493
2625# install some emergency cleanup handlers 3494# install some emergency cleanup handlers
2626BEGIN { 3495BEGIN {
3496 our %SIGWATCHER = ();
2627 for my $signal (qw(INT HUP TERM)) { 3497 for my $signal (qw(INT HUP TERM)) {
2628 Event->signal ( 3498 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2629 reentrant => 0,
2630 data => WF_AUTOCANCEL,
2631 signal => $signal,
2632 prio => 0,
2633 cb => sub {
2634 cf::cleanup "SIG$signal"; 3499 cf::cleanup "SIG$signal";
2635 },
2636 ); 3500 };
3501 }
3502}
3503
3504sub write_runtime_sync {
3505 # first touch the runtime file to show we are still running:
3506 # the fsync below can take a very very long time.
3507
3508 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3509
3510 my $guard = cf::lock_acquire "write_runtime";
3511
3512 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3513 or return;
3514
3515 my $value = $cf::RUNTIME + 90 + 10;
3516 # 10 is the runtime save interval, for a monotonic clock
3517 # 60 allows for the watchdog to kill the server.
3518
3519 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3520 and return;
3521
3522 # always fsync - this file is important
3523 aio_fsync $fh
3524 and return;
3525
3526 # touch it again to show we are up-to-date
3527 aio_utime $fh, undef, undef;
3528
3529 close $fh
3530 or return;
3531
3532 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3533 and return;
3534
3535 warn "runtime file written.\n";
3536
2637 } 3537 1
3538}
3539
3540our $uuid_lock;
3541our $uuid_skip;
3542
3543sub write_uuid_sync($) {
3544 $uuid_skip ||= $_[0];
3545
3546 return if $uuid_lock;
3547 local $uuid_lock = 1;
3548
3549 my $uuid = "$LOCALDIR/uuid";
3550
3551 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3552 or return;
3553
3554 my $value = uuid_seq uuid_cur;
3555
3556 unless ($value) {
3557 warn "cowardly refusing to write zero uuid value!\n";
3558 return;
3559 }
3560
3561 my $value = uuid_str $value + $uuid_skip;
3562 $uuid_skip = 0;
3563
3564 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3565 and return;
3566
3567 # always fsync - this file is important
3568 aio_fsync $fh
3569 and return;
3570
3571 close $fh
3572 or return;
3573
3574 aio_rename "$uuid~", $uuid
3575 and return;
3576
3577 warn "uuid file written ($value).\n";
3578
3579 1
3580
3581}
3582
3583sub write_uuid($$) {
3584 my ($skip, $sync) = @_;
3585
3586 $sync ? write_uuid_sync $skip
3587 : async { write_uuid_sync $skip };
2638} 3588}
2639 3589
2640sub emergency_save() { 3590sub emergency_save() {
2641 my $freeze_guard = cf::freeze_mainloop; 3591 my $freeze_guard = cf::freeze_mainloop;
2642 3592
2643 warn "enter emergency perl save\n"; 3593 warn "emergency_perl_save: enter\n";
2644 3594
2645 cf::sync_job { 3595 cf::sync_job {
3596 # this is a trade-off: we want to be very quick here, so
3597 # save all maps without fsync, and later call a global sync
3598 # (which in turn might be very very slow)
3599 local $USE_FSYNC = 0;
3600
2646 # use a peculiar iteration method to avoid tripping on perl 3601 # use a peculiar iteration method to avoid tripping on perl
2647 # refcount bugs in for. also avoids problems with players 3602 # refcount bugs in for. also avoids problems with players
2648 # and maps saved/destroyed asynchronously. 3603 # and maps saved/destroyed asynchronously.
2649 warn "begin emergency player save\n"; 3604 warn "emergency_perl_save: begin player save\n";
2650 for my $login (keys %cf::PLAYER) { 3605 for my $login (keys %cf::PLAYER) {
2651 my $pl = $cf::PLAYER{$login} or next; 3606 my $pl = $cf::PLAYER{$login} or next;
2652 $pl->valid or next; 3607 $pl->valid or next;
3608 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2653 $pl->save; 3609 $pl->save;
2654 } 3610 }
2655 warn "end emergency player save\n"; 3611 warn "emergency_perl_save: end player save\n";
2656 3612
2657 warn "begin emergency map save\n"; 3613 warn "emergency_perl_save: begin map save\n";
2658 for my $path (keys %cf::MAP) { 3614 for my $path (keys %cf::MAP) {
2659 my $map = $cf::MAP{$path} or next; 3615 my $map = $cf::MAP{$path} or next;
2660 $map->valid or next; 3616 $map->valid or next;
2661 $map->save; 3617 $map->save;
2662 } 3618 }
2663 warn "end emergency map save\n"; 3619 warn "emergency_perl_save: end map save\n";
2664 3620
2665 warn "begin emergency database checkpoint\n"; 3621 warn "emergency_perl_save: begin database checkpoint\n";
2666 BDB::db_env_txn_checkpoint $DB_ENV; 3622 BDB::db_env_txn_checkpoint $DB_ENV;
2667 warn "end emergency database checkpoint\n"; 3623 warn "emergency_perl_save: end database checkpoint\n";
3624
3625 warn "emergency_perl_save: begin write uuid\n";
3626 write_uuid_sync 1;
3627 warn "emergency_perl_save: end write uuid\n";
2668 }; 3628 };
2669 3629
3630 warn "emergency_perl_save: starting sync()\n";
3631 IO::AIO::aio_sync sub {
3632 warn "emergency_perl_save: finished sync()\n";
3633 };
3634
2670 warn "leave emergency perl save\n"; 3635 warn "emergency_perl_save: leave\n";
2671} 3636}
2672 3637
2673sub post_cleanup { 3638sub post_cleanup {
2674 my ($make_core) = @_; 3639 my ($make_core) = @_;
2675 3640
2676 warn Carp::longmess "post_cleanup backtrace" 3641 warn Carp::longmess "post_cleanup backtrace"
2677 if $make_core; 3642 if $make_core;
3643
3644 my $fh = pidfile;
3645 unlink $PIDFILE if <$fh> == $$;
3646}
3647
3648# a safer delete_package, copied from Symbol
3649sub clear_package($) {
3650 my $pkg = shift;
3651
3652 # expand to full symbol table name if needed
3653 unless ($pkg =~ /^main::.*::$/) {
3654 $pkg = "main$pkg" if $pkg =~ /^::/;
3655 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3656 $pkg .= '::' unless $pkg =~ /::$/;
3657 }
3658
3659 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3660 my $stem_symtab = *{$stem}{HASH};
3661
3662 defined $stem_symtab and exists $stem_symtab->{$leaf}
3663 or return;
3664
3665 # clear all symbols
3666 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3667 for my $name (keys %$leaf_symtab) {
3668 _gv_clear *{"$pkg$name"};
3669# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3670 }
3671 warn "cleared package $pkg\n";#d#
2678} 3672}
2679 3673
2680sub do_reload_perl() { 3674sub do_reload_perl() {
2681 # can/must only be called in main 3675 # can/must only be called in main
2682 if ($Coro::current != $Coro::main) { 3676 if ($Coro::current != $Coro::main) {
2683 warn "can only reload from main coroutine"; 3677 warn "can only reload from main coroutine";
2684 return; 3678 return;
2685 } 3679 }
2686 3680
3681 return if $RELOAD++;
3682
3683 my $t1 = EV::time;
3684
3685 while ($RELOAD) {
2687 warn "reloading..."; 3686 warn "reloading...";
2688 3687
2689 warn "entering sync_job"; 3688 warn "entering sync_job";
2690 3689
2691 cf::sync_job { 3690 cf::sync_job {
2692 cf::write_runtime; # external watchdog should not bark 3691 cf::write_runtime_sync; # external watchdog should not bark
2693 cf::emergency_save; 3692 cf::emergency_save;
2694 cf::write_runtime; # external watchdog should not bark 3693 cf::write_runtime_sync; # external watchdog should not bark
2695 3694
2696 warn "syncing database to disk"; 3695 warn "syncing database to disk";
2697 BDB::db_env_txn_checkpoint $DB_ENV; 3696 BDB::db_env_txn_checkpoint $DB_ENV;
2698 3697
2699 # if anything goes wrong in here, we should simply crash as we already saved 3698 # if anything goes wrong in here, we should simply crash as we already saved
2700 3699
2701 warn "cancelling all WF_AUTOCANCEL watchers";
2702 for (Event::all_watchers) {
2703 $_->cancel if $_->data & WF_AUTOCANCEL;
2704 }
2705
2706 warn "flushing outstanding aio requests"; 3700 warn "flushing outstanding aio requests";
2707 for (;;) {
2708 BDB::flush;
2709 IO::AIO::flush;
2710 Coro::cede;
2711 last unless IO::AIO::nreqs || BDB::nreqs; 3701 while (IO::AIO::nreqs || BDB::nreqs) {
2712 warn "iterate..."; 3702 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
2713 }
2714
2715 ++$RELOAD;
2716
2717 warn "cancelling all extension coros";
2718 $_->cancel for values %EXT_CORO;
2719 %EXT_CORO = ();
2720
2721 warn "removing commands";
2722 %COMMAND = ();
2723
2724 warn "removing ext commands";
2725 %EXTCMD = ();
2726
2727 warn "unloading/nuking all extensions";
2728 for my $pkg (@EXTS) {
2729 warn "... unloading $pkg";
2730
2731 if (my $cb = $pkg->can ("unload")) {
2732 eval {
2733 $cb->($pkg);
2734 1
2735 } or warn "$pkg unloaded, but with errors: $@";
2736 } 3703 }
2737 3704
2738 warn "... nuking $pkg"; 3705 warn "cancelling all extension coros";
2739 Symbol::delete_package $pkg; 3706 $_->cancel for values %EXT_CORO;
2740 } 3707 %EXT_CORO = ();
2741 3708
2742 warn "unloading all perl modules loaded from $LIBDIR"; 3709 warn "removing commands";
2743 while (my ($k, $v) = each %INC) { 3710 %COMMAND = ();
2744 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2745 3711
3712 warn "removing ext/exti commands";
3713 %EXTCMD = ();
3714 %EXTICMD = ();
3715
3716 warn "unloading/nuking all extensions";
3717 for my $pkg (@EXTS) {
2746 warn "... unloading $k"; 3718 warn "... unloading $pkg";
2747 delete $INC{$k};
2748 3719
2749 $k =~ s/\.pm$//;
2750 $k =~ s/\//::/g;
2751
2752 if (my $cb = $k->can ("unload_module")) { 3720 if (my $cb = $pkg->can ("unload")) {
3721 eval {
2753 $cb->(); 3722 $cb->($pkg);
3723 1
3724 } or warn "$pkg unloaded, but with errors: $@";
3725 }
3726
3727 warn "... clearing $pkg";
3728 clear_package $pkg;
2754 } 3729 }
2755 3730
2756 Symbol::delete_package $k; 3731 warn "unloading all perl modules loaded from $LIBDIR";
3732 while (my ($k, $v) = each %INC) {
3733 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3734
3735 warn "... unloading $k";
3736 delete $INC{$k};
3737
3738 $k =~ s/\.pm$//;
3739 $k =~ s/\//::/g;
3740
3741 if (my $cb = $k->can ("unload_module")) {
3742 $cb->();
3743 }
3744
3745 clear_package $k;
2757 } 3746 }
2758 3747
2759 warn "getting rid of safe::, as good as possible"; 3748 warn "getting rid of safe::, as good as possible";
2760 Symbol::delete_package "safe::$_" 3749 clear_package "safe::$_"
2761 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3750 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2762 3751
2763 warn "unloading cf.pm \"a bit\""; 3752 warn "unloading cf.pm \"a bit\"";
2764 delete $INC{"cf.pm"}; 3753 delete $INC{"cf.pm"};
2765 delete $INC{"cf/pod.pm"}; 3754 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
2766 3755
2767 # don't, removes xs symbols, too, 3756 # don't, removes xs symbols, too,
2768 # and global variables created in xs 3757 # and global variables created in xs
2769 #Symbol::delete_package __PACKAGE__; 3758 #clear_package __PACKAGE__;
2770 3759
2771 warn "unload completed, starting to reload now"; 3760 warn "unload completed, starting to reload now";
2772 3761
2773 warn "reloading cf.pm"; 3762 warn "reloading cf.pm";
2774 require cf; 3763 require cf;
2775 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3764 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2776 3765
2777 warn "loading config and database again"; 3766 warn "loading config and database again";
2778 cf::cfg_load; 3767 cf::reload_config;
2779 3768
2780 warn "loading extensions"; 3769 warn "loading extensions";
2781 cf::load_extensions; 3770 cf::load_extensions;
2782 3771
3772 if ($REATTACH_ON_RELOAD) {
2783 warn "reattaching attachments to objects/players"; 3773 warn "reattaching attachments to objects/players";
2784 _global_reattach; # objects, sockets 3774 _global_reattach; # objects, sockets
2785 warn "reattaching attachments to maps"; 3775 warn "reattaching attachments to maps";
2786 reattach $_ for values %MAP; 3776 reattach $_ for values %MAP;
2787 warn "reattaching attachments to players"; 3777 warn "reattaching attachments to players";
2788 reattach $_ for values %PLAYER; 3778 reattach $_ for values %PLAYER;
3779 }
2789 3780
3781 warn "running post_init jobs";
3782 (pop @POST_INIT)->(1) while @POST_INIT;
3783
2790 warn "leaving sync_job"; 3784 warn "leaving sync_job";
2791 3785
2792 1 3786 1
2793 } or do { 3787 } or do {
2794 warn $@; 3788 warn $@;
2795 warn "error while reloading, exiting."; 3789 cf::cleanup "error while reloading, exiting.";
2796 exit 1;
2797 }; 3790 };
2798 3791
2799 warn "reloaded"; 3792 warn "reloaded";
3793 --$RELOAD;
3794 }
3795
3796 $t1 = EV::time - $t1;
3797 warn "reload completed in ${t1}s\n";
2800}; 3798};
2801 3799
2802our $RELOAD_WATCHER; # used only during reload 3800our $RELOAD_WATCHER; # used only during reload
2803 3801
2804sub reload_perl() { 3802sub reload_perl() {
2805 # doing reload synchronously and two reloads happen back-to-back, 3803 # doing reload synchronously and two reloads happen back-to-back,
2806 # coro crashes during coro_state_free->destroy here. 3804 # coro crashes during coro_state_free->destroy here.
2807 3805
2808 $RELOAD_WATCHER ||= Event->timer ( 3806 $RELOAD_WATCHER ||= cf::async {
2809 reentrant => 0, 3807 Coro::AIO::aio_wait cache_extensions;
2810 after => 0, 3808
2811 data => WF_AUTOCANCEL, 3809 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
2812 cb => sub {
2813 do_reload_perl; 3810 do_reload_perl;
2814 undef $RELOAD_WATCHER; 3811 undef $RELOAD_WATCHER;
2815 }, 3812 };
2816 ); 3813 };
2817} 3814}
2818 3815
2819register_command "reload" => sub { 3816register_command "reload" => sub {
2820 my ($who, $arg) = @_; 3817 my ($who, $arg) = @_;
2821 3818
2822 if ($who->flag (FLAG_WIZ)) { 3819 if ($who->flag (FLAG_WIZ)) {
2823 $who->message ("reloading server."); 3820 $who->message ("reloading server.");
3821 async {
3822 $Coro::current->{desc} = "perl_reload";
2824 async { reload_perl }; 3823 reload_perl;
3824 };
2825 } 3825 }
2826}; 3826};
2827 3827
2828unshift @INC, $LIBDIR; 3828unshift @INC, $LIBDIR;
2829 3829
… …
2831 3831
2832our @WAIT_FOR_TICK; 3832our @WAIT_FOR_TICK;
2833our @WAIT_FOR_TICK_BEGIN; 3833our @WAIT_FOR_TICK_BEGIN;
2834 3834
2835sub wait_for_tick { 3835sub wait_for_tick {
2836 return unless $TICK_WATCHER->is_active;
2837 return if $Coro::current == $Coro::main; 3836 return if tick_inhibit || $Coro::current == $Coro::main;
2838 3837
2839 my $signal = new Coro::Signal; 3838 my $signal = new Coro::Signal;
2840 push @WAIT_FOR_TICK, $signal; 3839 push @WAIT_FOR_TICK, $signal;
2841 $signal->wait; 3840 $signal->wait;
2842} 3841}
2843 3842
2844sub wait_for_tick_begin { 3843sub wait_for_tick_begin {
2845 return unless $TICK_WATCHER->is_active;
2846 return if $Coro::current == $Coro::main; 3844 return if tick_inhibit || $Coro::current == $Coro::main;
2847 3845
2848 my $signal = new Coro::Signal; 3846 my $signal = new Coro::Signal;
2849 push @WAIT_FOR_TICK_BEGIN, $signal; 3847 push @WAIT_FOR_TICK_BEGIN, $signal;
2850 $signal->wait; 3848 $signal->wait;
2851} 3849}
2852 3850
2853$TICK_WATCHER = Event->timer ( 3851sub tick {
2854 reentrant => 0,
2855 parked => 1,
2856 prio => 0,
2857 at => $NEXT_TICK || $TICK,
2858 data => WF_AUTOCANCEL,
2859 cb => sub {
2860 if ($Coro::current != $Coro::main) { 3852 if ($Coro::current != $Coro::main) {
2861 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3853 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2862 unless ++$bug_warning > 10; 3854 unless ++$bug_warning > 10;
2863 return; 3855 return;
2864 } 3856 }
2865 3857
2866 $NOW = $tick_start = Event::time;
2867
2868 cf::server_tick; # one server iteration 3858 cf::server_tick; # one server iteration
2869 3859
2870 $RUNTIME += $TICK;
2871 $NEXT_TICK += $TICK;
2872
2873 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3860 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2874 $NEXT_RUNTIME_WRITE = $NOW + 10; 3861 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
2875 Coro::async_pool { 3862 Coro::async_pool {
3863 $Coro::current->{desc} = "runtime saver";
2876 write_runtime 3864 write_runtime_sync
2877 or warn "ERROR: unable to write runtime file: $!"; 3865 or warn "ERROR: unable to write runtime file: $!";
2878 };
2879 } 3866 };
3867 }
2880 3868
2881# my $AFTER = Event::time;
2882# warn $AFTER - $NOW;#d#
2883
2884 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3869 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2885 $sig->send; 3870 $sig->send;
2886 } 3871 }
2887 while (my $sig = shift @WAIT_FOR_TICK) { 3872 while (my $sig = shift @WAIT_FOR_TICK) {
2888 $sig->send; 3873 $sig->send;
2889 } 3874 }
2890 3875
2891 $NOW = Event::time; 3876 $LOAD = ($NOW - $TICK_START) / $TICK;
2892
2893 # if we are delayed by four ticks or more, skip them all
2894 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2895
2896 $TICK_WATCHER->at ($NEXT_TICK);
2897 $TICK_WATCHER->start;
2898
2899 $LOAD = ($NOW - $tick_start) / $TICK;
2900 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3877 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2901 3878
2902 _post_tick; 3879 if (0) {
2903 3880 if ($NEXT_TICK) {
2904 3881 my $jitter = $TICK_START - $NEXT_TICK;
3882 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3883 warn "jitter $JITTER\n";#d#
3884 }
2905 }, 3885 }
2906); 3886}
2907 3887
2908{ 3888{
2909 BDB::max_poll_time $TICK * 0.1; 3889 # configure BDB
2910 $BDB_POLL_WATCHER = Event->io ( 3890
2911 reentrant => 0,
2912 fd => BDB::poll_fileno,
2913 poll => 'r',
2914 prio => 0,
2915 data => WF_AUTOCANCEL,
2916 cb => \&BDB::poll_cb,
2917 );
2918 BDB::min_parallel 8; 3891 BDB::min_parallel 8;
2919 3892 BDB::max_poll_reqs $TICK * 0.1;
2920 BDB::set_sync_prepare { 3893 $AnyEvent::BDB::WATCHER->priority (1);
2921 my $status;
2922 my $current = $Coro::current;
2923 (
2924 sub {
2925 $status = $!;
2926 $current->ready; undef $current;
2927 },
2928 sub {
2929 Coro::schedule while defined $current;
2930 $! = $status;
2931 },
2932 )
2933 };
2934 3894
2935 unless ($DB_ENV) { 3895 unless ($DB_ENV) {
2936 $DB_ENV = BDB::db_env_create; 3896 $DB_ENV = BDB::db_env_create;
3897 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3898 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3899 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3900 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3901 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
2937 3902
2938 cf::sync_job { 3903 cf::sync_job {
2939 eval { 3904 eval {
2940 BDB::db_env_open 3905 BDB::db_env_open
2941 $DB_ENV, 3906 $DB_ENV,
… …
2943 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3908 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2944 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3909 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2945 0666; 3910 0666;
2946 3911
2947 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3912 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2948
2949 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2950 $DB_ENV->set_lk_detect;
2951 }; 3913 };
2952 3914
2953 cf::cleanup "db_env_open(db): $@" if $@; 3915 cf::cleanup "db_env_open(db): $@" if $@;
2954 }; 3916 };
2955 } 3917 }
3918
3919 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3920 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3921 };
3922 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3923 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3924 };
3925 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3926 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3927 };
2956} 3928}
2957 3929
2958{ 3930{
3931 # configure IO::AIO
3932
2959 IO::AIO::min_parallel 8; 3933 IO::AIO::min_parallel 8;
2960
2961 undef $Coro::AIO::WATCHER;
2962 IO::AIO::max_poll_time $TICK * 0.1; 3934 IO::AIO::max_poll_time $TICK * 0.1;
2963 $AIO_POLL_WATCHER = Event->io ( 3935 undef $AnyEvent::AIO::WATCHER;
2964 reentrant => 0,
2965 data => WF_AUTOCANCEL,
2966 fd => IO::AIO::poll_fileno,
2967 poll => 'r',
2968 prio => 6,
2969 cb => \&IO::AIO::poll_cb,
2970 );
2971} 3936}
2972 3937
2973my $_log_backtrace; 3938my $_log_backtrace;
2974 3939
2975sub _log_backtrace { 3940sub _log_backtrace {
… …
2978 $msg =~ s/\n//; 3943 $msg =~ s/\n//;
2979 3944
2980 # limit the # of concurrent backtraces 3945 # limit the # of concurrent backtraces
2981 if ($_log_backtrace < 2) { 3946 if ($_log_backtrace < 2) {
2982 ++$_log_backtrace; 3947 ++$_log_backtrace;
3948 my $perl_bt = Carp::longmess $msg;
2983 async { 3949 async {
3950 $Coro::current->{desc} = "abt $msg";
3951
2984 my @bt = fork_call { 3952 my @bt = fork_call {
2985 @addr = map { sprintf "%x", $_ } @addr; 3953 @addr = map { sprintf "%x", $_ } @addr;
2986 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3954 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
2987 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3955 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
2988 or die "addr2line: $!"; 3956 or die "addr2line: $!";
… …
2996 } 3964 }
2997 3965
2998 @funcs 3966 @funcs
2999 }; 3967 };
3000 3968
3001 LOG llevInfo, "[ABT] $msg\n"; 3969 LOG llevInfo, "[ABT] $perl_bt\n";
3970 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3002 LOG llevInfo, "[ABT] $_\n" for @bt; 3971 LOG llevInfo, "[ABT] $_\n" for @bt;
3003 --$_log_backtrace; 3972 --$_log_backtrace;
3004 }; 3973 };
3005 } else { 3974 } else {
3006 LOG llevInfo, "[ABT] $msg\n"; 3975 LOG llevInfo, "[ABT] $msg\n";
3007 LOG llevInfo, "[ABT] [suppressed]\n"; 3976 LOG llevInfo, "[ABT] [suppressed]\n";
3008 } 3977 }
3009} 3978}
3010 3979
3011# load additional modules 3980# load additional modules
3012use cf::pod; 3981require "cf/$_.pm" for @EXTRA_MODULES;
3013 3982
3014END { cf::emergency_save } 3983END { cf::emergency_save }
3015 3984
30161 39851
3017 3986

Diff Legend

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