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.312 by root, Sat Jul 21 18:01:26 2007 UTC vs.
Revision 1.480 by root, Thu Oct 8 05:09:43 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
25use JSON::XS 1.4 (); 53use JSON::XS 2.01 ();
26use BDB (); 54use BDB ();
27use Data::Dumper; 55use Data::Dumper;
28use Digest::MD5; 56use Digest::MD5;
29use Fcntl; 57use Fcntl;
30use YAML::Syck (); 58use YAML ();
31use IO::AIO 2.32 (); 59use IO::AIO ();
32use Time::HiRes; 60use Time::HiRes;
33use Compress::LZF; 61use Compress::LZF;
34use Digest::MD5 (); 62use Digest::MD5 ();
63
64AnyEvent::detect;
35 65
36# configure various modules to our taste 66# configure various modules to our taste
37# 67#
38$Storable::canonical = 1; # reduce rsync transfers 68$Storable::canonical = 1; # reduce rsync transfers
39Coro::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";
40Compress::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
41 76
42$Event::Eval = 1; # no idea why this is required, but it is 77# strictly for debugging
43 78$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
45$YAML::Syck::ImplicitUnicode = 1;
46
47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
48 79
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 80sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
50 81
51our %COMMAND = (); 82our %COMMAND = ();
52our %COMMAND_TIME = (); 83our %COMMAND_TIME = ();
… …
55our %EXTCMD = (); 86our %EXTCMD = ();
56our %EXTICMD = (); 87our %EXTICMD = ();
57our %EXT_CORO = (); # coroutines bound to extensions 88our %EXT_CORO = (); # coroutines bound to extensions
58our %EXT_MAP = (); # pluggable maps 89our %EXT_MAP = (); # pluggable maps
59 90
60our $RELOAD; # number of reloads so far 91our $RELOAD; # number of reloads so far, non-zero while in reload
61our @EVENT; 92our @EVENT;
93our @REFLECT; # set by XS
94our %REFLECT; # set by us
62 95
63our $CONFDIR = confdir; 96our $CONFDIR = confdir;
64our $DATADIR = datadir; 97our $DATADIR = datadir;
65our $LIBDIR = "$DATADIR/ext"; 98our $LIBDIR = "$DATADIR/ext";
66our $PODDIR = "$DATADIR/pod"; 99our $PODDIR = "$DATADIR/pod";
67our $MAPDIR = "$DATADIR/" . mapdir; 100our $MAPDIR = "$DATADIR/" . mapdir;
68our $LOCALDIR = localdir; 101our $LOCALDIR = localdir;
69our $TMPDIR = "$LOCALDIR/" . tmpdir; 102our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 103our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir; 104our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random"; 105our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 106our $BDBDIR = "$LOCALDIR/db";
107our $PIDFILE = "$LOCALDIR/pid";
108our $RUNTIMEFILE = "$LOCALDIR/runtime";
109
110our %RESOURCE;
74 111
75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 112our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
76our $TICK_WATCHER;
77our $AIO_POLL_WATCHER;
78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 113our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
79our $NEXT_TICK; 114our $NEXT_TICK;
80our $NOW;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 115our $USE_FSYNC = 1; # use fsync to write maps - default on
82 116
117our $BDB_DEADLOCK_WATCHER;
118our $BDB_CHECKPOINT_WATCHER;
83our $BDB_POLL_WATCHER; 119our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 120our $DB_ENV;
121
122our @EXTRA_MODULES = qw(pod mapscript);
85 123
86our %CFG; 124our %CFG;
87 125
88our $UPTIME; $UPTIME ||= time; 126our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 127our $RUNTIME;
128our $NOW;
90 129
91our %PLAYER; # all users 130our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 131our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 132our $LINK_MAP; # the special {link} map, which is always available
94 133
95# 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 ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 135our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 136
98our $LOAD; # a number between 0 (idle) and 1 (too many objects) 137our $LOAD; # a number between 0 (idle) and 1 (too many objects)
99our $LOADAVG; # same thing, but with alpha-smoothing 138our $LOADAVG; # same thing, but with alpha-smoothing
139our $JITTER; # average jitter
100our $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 :)
101 146
102binmode STDOUT; 147binmode STDOUT;
103binmode STDERR; 148binmode STDERR;
104 149
105# read virtual server time, if available 150# read virtual server time, if available
106unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 151unless ($RUNTIME || !-e $RUNTIMEFILE) {
107 open my $fh, "<", "$LOCALDIR/runtime" 152 open my $fh, "<", $RUNTIMEFILE
108 or die "unable to read runtime file: $!"; 153 or die "unable to read $RUNTIMEFILE file: $!";
109 $RUNTIME = <$fh> + 0.; 154 $RUNTIME = <$fh> + 0.;
110} 155}
156
157eval "sub TICK() { $TICK } 1" or die;
111 158
112mkdir $_ 159mkdir $_
113 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 160 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
114 161
115our $EMERGENCY_POSITION; 162our $EMERGENCY_POSITION;
116 163
117sub 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} = [grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"}];
118 176
119############################################################################# 177#############################################################################
120 178
121=head2 GLOBAL VARIABLES 179=head2 GLOBAL VARIABLES
122 180
… …
158 216
159The raw value load value from the last tick. 217The raw value load value from the last tick.
160 218
161=item %cf::CFG 219=item %cf::CFG
162 220
163Configuration for the server, loaded from C</etc/crossfire/config>, or 221Configuration for the server, loaded from C</etc/deliantra-server/config>, or
164from wherever your confdir points to. 222from wherever your confdir points to.
165 223
166=item cf::wait_for_tick, cf::wait_for_tick_begin 224=item cf::wait_for_tick, cf::wait_for_tick_begin
167 225
168These 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
… …
173 231
174This array contains the results of the last C<invoke ()> call. When 232This array contains the results of the last C<invoke ()> call. When
175C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 233C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
176that call. 234that call.
177 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
178=back 242=back
179 243
180=cut 244=cut
181 245
182BEGIN { 246$Coro::State::WARNHOOK = sub {
183 *CORE::GLOBAL::warn = sub {
184 my $msg = join "", @_; 247 my $msg = join "", @_;
185 248
186 $msg .= "\n" 249 $msg .= "\n"
187 unless $msg =~ /\n$/; 250 unless $msg =~ /\n$/;
188 251
189 $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;
190 253
191 utf8::encode $msg;
192 LOG llevError, $msg; 254 LOG llevError, $msg;
193 }; 255};
194} 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};
195 270
196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 271@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
197@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 272@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
198@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 273@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
199@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 274@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
206for my $pkg (qw( 281for my $pkg (qw(
207 cf::global cf::attachable 282 cf::global cf::attachable
208 cf::object cf::object::player 283 cf::object cf::object::player
209 cf::client cf::player 284 cf::client cf::player
210 cf::arch cf::living 285 cf::arch cf::living
286 cf::map cf::mapspace
211 cf::map cf::party cf::region 287 cf::party cf::region
212)) { 288)) {
213 no strict 'refs';
214 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 289 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
215} 290}
216 291
217$Event::DIED = sub { 292$EV::DIED = sub {
218 warn "error in event callback: @_"; 293 warn "error in event callback: @_";
219}; 294};
220 295
221############################################################################# 296#############################################################################
222 297
… …
245 $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;
246 $d 321 $d
247 } || "[unable to dump $_[0]: '$@']"; 322 } || "[unable to dump $_[0]: '$@']";
248} 323}
249 324
250=item $ref = cf::from_json $json 325=item $ref = cf::decode_json $json
251 326
252Converts a JSON string into the corresponding perl data structure. 327Converts a JSON string into the corresponding perl data structure.
253 328
254=item $json = cf::to_json $ref 329=item $json = cf::encode_json $ref
255 330
256Converts a perl data structure into its JSON representation. 331Converts a perl data structure into its JSON representation.
257 332
258=cut 333=cut
259 334
260our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 335our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
261 336
262sub to_json ($) { $json_coder->encode ($_[0]) } 337sub encode_json($) { $json_coder->encode ($_[0]) }
263sub from_json ($) { $json_coder->decode ($_[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}
264 353
265=item cf::lock_wait $string 354=item cf::lock_wait $string
266 355
267Wait until the given lock is available. See cf::lock_acquire. 356Wait until the given lock is available. See cf::lock_acquire.
268 357
269=item my $lock = cf::lock_acquire $string 358=item my $lock = cf::lock_acquire $string
270 359
271Wait 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
272a 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,
273for example when the coroutine gets canceled), the lock is automatically 362for example when the coroutine gets canceled), the lock is automatically
274returned. 363returned.
275 364
365Locks are *not* recursive, locking from the same coro twice results in a
366deadlocked coro.
367
276Lock 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
277uses map_find and cf::map::load uses map_load). 369uses map_find and cf::map::load uses map_load).
278 370
279=item $locked = cf::lock_active $string 371=item $locked = cf::lock_active $string
280 372
281Return 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.
282 374
283=cut 375=cut
284 376
285our %LOCK; 377our $LOCKS = new Coro::SemaphoreSet;
286 378
287sub lock_wait($) { 379sub lock_wait($) {
288 my ($key) = @_; 380 $LOCKS->wait ($_[0]);
289
290 # wait for lock, if any
291 while ($LOCK{$key}) {
292 push @{ $LOCK{$key} }, $Coro::current;
293 Coro::schedule;
294 }
295} 381}
296 382
297sub lock_acquire($) { 383sub lock_acquire($) {
298 my ($key) = @_; 384 $LOCKS->guard ($_[0])
299
300 # wait, to be sure we are not locked
301 lock_wait $key;
302
303 $LOCK{$key} = [];
304
305 Coro::guard {
306 # wake up all waiters, to be on the safe side
307 $_->ready for @{ delete $LOCK{$key} };
308 }
309} 385}
310 386
311sub lock_active($) { 387sub lock_active($) {
312 my ($key) = @_; 388 $LOCKS->count ($_[0]) < 1
313
314 ! ! $LOCK{$key}
315} 389}
316 390
317sub freeze_mainloop { 391sub freeze_mainloop {
318 return unless $TICK_WATCHER->is_active; 392 tick_inhibit_inc;
319 393
320 my $guard = Coro::guard { 394 &Guard::guard (\&tick_inhibit_dec);
321 $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 }
322 }; 455 }
323 $TICK_WATCHER->stop; 456};
324 $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;
325} 470}
326 471
327=item cf::async { BLOCK } 472=item cf::async { BLOCK }
328 473
329Currently the same as Coro::async_pool, meaning you cannot use 474Currently the same as Coro::async_pool, meaning you cannot use
… …
334 479
335BEGIN { *async = \&Coro::async_pool } 480BEGIN { *async = \&Coro::async_pool }
336 481
337=item cf::sync_job { BLOCK } 482=item cf::sync_job { BLOCK }
338 483
339The design of Crossfire TRT requires that the main coroutine ($Coro::main) 484The design of Deliantra requires that the main coroutine ($Coro::main)
340is always able to handle events or runnable, as Crossfire TRT is only 485is always able to handle events or runnable, as Deliantra is only
341partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 486partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
342acceptable. 487acceptable.
343 488
344If 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
345the given BLOCK in another coroutine while waiting for the result. The 490the given BLOCK in another coroutine while waiting for the result. The
… …
350 495
351sub sync_job(&) { 496sub sync_job(&) {
352 my ($job) = @_; 497 my ($job) = @_;
353 498
354 if ($Coro::current == $Coro::main) { 499 if ($Coro::current == $Coro::main) {
355 my $time = Event::time; 500 my $time = EV::time;
356 501
357 # this is the main coro, too bad, we have to block 502 # this is the main coro, too bad, we have to block
358 # till the operation succeeds, freezing the server :/ 503 # till the operation succeeds, freezing the server :/
359 504
360 # TODO: use suspend/resume instead 505 LOG llevError, Carp::longmess "sync job";#d#
361 # (but this is cancel-safe) 506
362 my $freeze_guard = freeze_mainloop; 507 my $freeze_guard = freeze_mainloop;
363 508
364 my $busy = 1; 509 my $busy = 1;
365 my @res; 510 my @res;
366 511
367 (async { 512 (async {
513 $Coro::current->desc ("sync job coro");
368 @res = eval { $job->() }; 514 @res = eval { $job->() };
369 warn $@ if $@; 515 warn $@ if $@;
370 undef $busy; 516 undef $busy;
371 })->prio (Coro::PRIO_MAX); 517 })->prio (Coro::PRIO_MAX);
372 518
373 while ($busy) { 519 while ($busy) {
374 Coro::cede or Event::one_event; 520 if (Coro::nready) {
521 Coro::cede_notself;
522 } else {
523 EV::loop EV::LOOP_ONESHOT;
375 } 524 }
525 }
376 526
377 $time = Event::time - $time; 527 my $time = EV::time - $time;
378 528
379 LOG llevError | logBacktrace, Carp::longmess "long sync job"
380 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
381
382 $tick_start += $time; # do not account sync jobs to server load 529 $TICK_START += $time; # do not account sync jobs to server load
383 530
384 wantarray ? @res : $res[0] 531 wantarray ? @res : $res[0]
385 } else { 532 } else {
386 # we are in another coroutine, how wonderful, everything just works 533 # we are in another coroutine, how wonderful, everything just works
387 534
… …
412=item fork_call { }, $args 559=item fork_call { }, $args
413 560
414Executes the given code block with the given arguments in a seperate 561Executes the given code block with the given arguments in a seperate
415process, returning the results. Everything must be serialisable with 562process, returning the results. Everything must be serialisable with
416Coro::Storable. May, of course, block. Note that the executed sub may 563Coro::Storable. May, of course, block. Note that the executed sub may
417never block itself or use any form of Event handling. 564never block itself or use any form of event handling.
418 565
419=cut 566=cut
420
421sub _store_scalar {
422 open my $fh, ">", \my $buf
423 or die "fork_call: cannot open fh-to-buf in child : $!";
424 Storable::store_fd $_[0], $fh;
425 close $fh;
426
427 $buf
428}
429 567
430sub fork_call(&@) { 568sub fork_call(&@) {
431 my ($cb, @args) = @_; 569 my ($cb, @args) = @_;
432 570
433# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 571 # we seemingly have to make a local copy of the whole thing,
434# or die "socketpair: $!"; 572 # otherwise perl prematurely frees the stuff :/
435 pipe my $fh1, my $fh2 573 # TODO: investigate and fix (likely this will be rather laborious)
436 or die "pipe: $!";
437 574
438 if (my $pid = fork) { 575 my @res = Coro::Util::fork_eval {
439 close $fh2;
440
441 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
442 warn "pst<$res>" unless $res =~ /^pst/;
443 $res = Coro::Storable::thaw $res;
444
445 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
446
447 Carp::confess $$res unless "ARRAY" eq ref $res;
448
449 return wantarray ? @$res : $res->[-1];
450 } else {
451 reset_signals; 576 reset_signals;
452 local $SIG{__WARN__}; 577 &$cb
453 local $SIG{__DIE__}; 578 }, @args;
454 # just in case, this hack effectively disables event
455 # in the child. cleaner and slower would be canceling all watchers,
456 # but this works for the time being.
457 local $Coro::idle;
458 $Coro::current->prio (Coro::PRIO_MAX);
459 579
460 eval { 580 wantarray ? @res : $res[-1]
461 close $fh1; 581}
462 582
463 my @res = eval { $cb->(@args) }; 583=item $coin = coin_from_name $name
464 584
465 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res; 585=cut
466 close $fh2;
467 };
468 586
469 warn $@ if $@; 587our %coin_alias = (
470 _exit 0; 588 "silver" => "silvercoin",
471 } 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
472} 608}
473 609
474=item $value = cf::db_get $family => $key 610=item $value = cf::db_get $family => $key
475 611
476Returns a single value from the environment database. 612Returns a single value from the environment database.
… …
478=item cf::db_put $family => $key => $value 614=item cf::db_put $family => $key => $value
479 615
480Stores the given C<$value> in the family. It can currently store binary 616Stores the given C<$value> in the family. It can currently store binary
481data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 617data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
482 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
483=cut 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 $!;
637 };
638 cf::cleanup "db_open(db): $@" if $@;
639
640 $db
641}
484 642
485our $DB; 643our $DB;
486 644
487sub db_init { 645sub db_init {
488 unless ($DB) {
489 $DB = BDB::db_create $DB_ENV;
490
491 cf::sync_job { 646 cf::sync_job {
492 eval { 647 $DB ||= db_table "db";
493 $DB->set_flags (BDB::CHKSUM);
494
495 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
496 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
497 cf::cleanup "db_open(db): $!" if $!;
498 };
499 cf::cleanup "db_open(db): $@" if $@;
500 };
501 } 648 };
502} 649}
503 650
504sub db_get($$) { 651sub db_get($$) {
505 my $key = "$_[0]/$_[1]"; 652 my $key = "$_[0]/$_[1]";
506 653
… …
556 if (1) { 703 if (1) {
557 $md5 = 704 $md5 =
558 join "\x00", 705 join "\x00",
559 $processversion, 706 $processversion,
560 map { 707 map {
561 Coro::cede; 708 cf::cede_to_tick;
562 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 709 ($src->[$_], Digest::MD5::md5_hex $data[$_])
563 } 0.. $#$src; 710 } 0.. $#$src;
564 711
565 712
566 my $dbmd5 = db_get cache => "$id/md5"; 713 my $dbmd5 = db_get cache => "$id/md5";
… …
604 751
605############################################################################# 752#############################################################################
606 753
607=head2 ATTACHABLE OBJECTS 754=head2 ATTACHABLE OBJECTS
608 755
609Many 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
610attach callbacks/event handlers (a collection of which is called an "attachment") 757attach callbacks/event handlers (a collection of which is called an "attachment")
611to it. All such attachable objects support the following methods. 758to it. All such attachable objects support the following methods.
612 759
613In 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>
614C<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
615Crossfire TRT). 762Deliantra).
616 763
617=over 4 764=over 4
618 765
619=item $attachable->attach ($attachment, key => $value...) 766=item $attachable->attach ($attachment, key => $value...)
620 767
… …
664=item cf::CLASS::attachment $name, ... 811=item cf::CLASS::attachment $name, ...
665 812
666Register an attachment by C<$name> through which attachable objects of the 813Register an attachment by C<$name> through which attachable objects of the
667given CLASS can refer to this attachment. 814given CLASS can refer to this attachment.
668 815
669Some classes such as crossfire maps and objects can specify attachments 816Some classes such as deliantra maps and objects can specify attachments
670that 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.
671 818
672These calls expect any number of the following handler/hook descriptions: 819These calls expect any number of the following handler/hook descriptions:
673 820
674=over 4 821=over 4
… …
902 } 1049 }
903 1050
904 0 1051 0
905} 1052}
906 1053
907=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1054=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
908 1055
909=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1056=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
910 1057
911Generate an object-specific event with the given arguments. 1058Generate an object-specific event with the given arguments.
912 1059
… …
918 1065
919=cut 1066=cut
920 1067
921############################################################################# 1068#############################################################################
922# object support 1069# object support
923#
924 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#
925sub _can_merge { 1104sub _can_merge {
926 my ($ob1, $ob2) = @_; 1105 my ($ob1, $ob2) = @_;
927 1106
928 local $Storable::canonical = 1; 1107 ++$SLOW_MERGES;#d#
929 my $fob1 = Storable::freeze $ob1;
930 my $fob2 = Storable::freeze $ob2;
931 1108
932 $fob1 eq $fob2 1109 # we do the slow way here
1110 return _object_equal $ob1, $ob2
933} 1111}
934 1112
935sub reattach { 1113sub reattach {
936 # basically do the same as instantiate, without calling instantiate 1114 # basically do the same as instantiate, without calling instantiate
937 my ($obj) = @_; 1115 my ($obj) = @_;
938 1116
1117 # no longer needed after getting rid of delete_package?
939 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
940 1119
941 my $registry = $obj->registry; 1120 my $registry = $obj->registry;
942 1121
943 @$registry = (); 1122 @$registry = ();
944 1123
… …
959cf::attachable->attach ( 1138cf::attachable->attach (
960 prio => -1000000, 1139 prio => -1000000,
961 on_instantiate => sub { 1140 on_instantiate => sub {
962 my ($obj, $data) = @_; 1141 my ($obj, $data) = @_;
963 1142
964 $data = from_json $data; 1143 $data = decode_json $data;
965 1144
966 for (@$data) { 1145 for (@$data) {
967 my ($name, $args) = @$_; 1146 my ($name, $args) = @$_;
968 1147
969 $obj->attach ($name, %{$args || {} }); 1148 $obj->attach ($name, %{$args || {} });
… …
985sub object_freezer_save { 1164sub object_freezer_save {
986 my ($filename, $rdata, $objs) = @_; 1165 my ($filename, $rdata, $objs) = @_;
987 1166
988 sync_job { 1167 sync_job {
989 if (length $$rdata) { 1168 if (length $$rdata) {
1169 utf8::decode (my $decname = $filename);
990 warn sprintf "saving %s (%d,%d)\n", 1170 warn sprintf "saving %s (%d,%d)\n",
991 $filename, length $$rdata, scalar @$objs; 1171 $decname, length $$rdata, scalar @$objs;
992 1172
993 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1173 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
994 chmod SAVE_MODE, $fh; 1174 aio_chmod $fh, SAVE_MODE;
995 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1175 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
996 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 }
997 close $fh; 1180 aio_close $fh;
998 1181
999 if (@$objs) { 1182 if (@$objs) {
1000 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) {
1001 chmod SAVE_MODE, $fh; 1184 aio_chmod $fh, SAVE_MODE;
1002 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1185 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1003 aio_write $fh, 0, (length $data), $data, 0; 1186 aio_write $fh, 0, (length $data), $data, 0;
1004 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 }
1005 close $fh; 1191 aio_close $fh;
1006 aio_rename "$filename.pst~", "$filename.pst"; 1192 aio_rename "$filename.pst~", "$filename.pst";
1007 } 1193 }
1008 } else { 1194 } else {
1009 aio_unlink "$filename.pst"; 1195 aio_unlink "$filename.pst";
1010 } 1196 }
1011 1197
1012 aio_rename "$filename~", $filename; 1198 aio_rename "$filename~", $filename;
1199
1200 $filename =~ s%/[^/]+$%%;
1201 aio_pathsync $filename if $cf::USE_FSYNC;
1013 } else { 1202 } else {
1014 warn "FATAL: $filename~: $!\n"; 1203 warn "unable to save objects: $filename~: $!\n";
1015 } 1204 }
1016 } else { 1205 } else {
1017 aio_unlink $filename; 1206 aio_unlink $filename;
1018 aio_unlink "$filename.pst"; 1207 aio_unlink "$filename.pst";
1019 } 1208 }
1020 } 1209 };
1021} 1210}
1022 1211
1023sub object_freezer_as_string { 1212sub object_freezer_as_string {
1024 my ($rdata, $objs) = @_; 1213 my ($rdata, $objs) = @_;
1025 1214
… …
1037 or return; 1226 or return;
1038 1227
1039 unless (aio_stat "$filename.pst") { 1228 unless (aio_stat "$filename.pst") {
1040 (aio_load "$filename.pst", $av) >= 0 1229 (aio_load "$filename.pst", $av) >= 0
1041 or return; 1230 or return;
1231
1042 $av = eval { (Storable::thaw $av)->{objs} }; 1232 my $st = eval { Coro::Storable::thaw $av };
1233 $av = $st->{objs};
1043 } 1234 }
1044 1235
1236 utf8::decode (my $decname = $filename);
1045 warn sprintf "loading %s (%d)\n", 1237 warn sprintf "loading %s (%d,%d)\n",
1046 $filename, length $data, scalar @{$av || []}; 1238 $decname, length $data, scalar @{$av || []};
1239
1047 return ($data, $av); 1240 ($data, $av)
1048} 1241}
1049 1242
1050=head2 COMMAND CALLBACKS 1243=head2 COMMAND CALLBACKS
1051 1244
1052=over 4 1245=over 4
… …
1106 my ($name, $cb) = @_; 1299 my ($name, $cb) = @_;
1107 1300
1108 $EXTICMD{$name} = $cb; 1301 $EXTICMD{$name} = $cb;
1109} 1302}
1110 1303
1304use File::Glob ();
1305
1111cf::player->attach ( 1306cf::player->attach (
1112 on_command => sub { 1307 on_command => sub {
1113 my ($pl, $name, $params) = @_; 1308 my ($pl, $name, $params) = @_;
1114 1309
1115 my $cb = $COMMAND{$name} 1310 my $cb = $COMMAND{$name}
… …
1125 my ($pl, $buf) = @_; 1320 my ($pl, $buf) = @_;
1126 1321
1127 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1322 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1128 1323
1129 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
1130 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1332 if (my $cb = $EXTCMD{$type}) {
1131 if (my %reply = $cb->($pl, $msg)) { 1333 @reply = $cb->($pl, @payload);
1132 $pl->ext_reply ($msg->{msgid}, %reply);
1133 }
1134 } 1334 }
1335
1336 $pl->ext_reply ($reply, @reply)
1337 if $reply;
1338
1135 } else { 1339 } else {
1136 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1340 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1137 } 1341 }
1138 1342
1139 cf::override; 1343 cf::override;
1140 }, 1344 },
1141); 1345);
1346
1347# "readahead" all extensions
1348sub cache_extensions {
1349 my $grp = IO::AIO::aio_group;
1350
1351 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1352 for (grep /\.ext$/, @{$_[0]}) {
1353 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1354 }
1355 };
1356
1357 $grp
1358}
1142 1359
1143sub load_extensions { 1360sub load_extensions {
1144 cf::sync_job { 1361 cf::sync_job {
1145 my %todo; 1362 my %todo;
1146 1363
… …
1166 1383
1167 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1384 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1168 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1385 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1169 1386
1170 $ext{source} = 1387 $ext{source} =
1171 "package $pkg; use strict; use utf8;\n" 1388 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1172 . "#line 1 \"$path\"\n{\n" 1389 . "#line 1 \"$path\"\n{\n"
1173 . $source 1390 . $source
1174 . "\n};\n1"; 1391 . "\n};\n1";
1175 1392
1176 $todo{$base} = \%ext; 1393 $todo{$base} = \%ext;
… …
1192 my $msg = $@ ? "$v->{path}: $@\n" 1409 my $msg = $@ ? "$v->{path}: $@\n"
1193 : "$v->{base}: extension inactive.\n"; 1410 : "$v->{base}: extension inactive.\n";
1194 1411
1195 if (exists $v->{meta}{mandatory}) { 1412 if (exists $v->{meta}{mandatory}) {
1196 warn $msg; 1413 warn $msg;
1197 warn "mandatory extension failed to load, exiting.\n"; 1414 cf::cleanup "mandatory extension failed to load, exiting.";
1198 exit 1;
1199 } 1415 }
1200 1416
1201 warn $msg; 1417 warn $msg;
1202 } 1418 }
1203 1419
… …
1217 1433
1218=back 1434=back
1219 1435
1220=head2 CORE EXTENSIONS 1436=head2 CORE EXTENSIONS
1221 1437
1222Functions and methods that extend core crossfire objects. 1438Functions and methods that extend core deliantra objects.
1223 1439
1224=cut 1440=cut
1225 1441
1226package cf::player; 1442package cf::player;
1227 1443
1228use Coro::AIO; 1444use Coro::AIO;
1229 1445
1230=head3 cf::player 1446=head3 cf::player
1231 1447
1232=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}
1233 1463
1234=item cf::player::find $login 1464=item cf::player::find $login
1235 1465
1236Returns the given player object, loading it if necessary (might block). 1466Returns the given player object, loading it if necessary (might block).
1237 1467
… …
1256 1486
1257sub exists($) { 1487sub exists($) {
1258 my ($login) = @_; 1488 my ($login) = @_;
1259 1489
1260 $cf::PLAYER{$login} 1490 $cf::PLAYER{$login}
1261 or cf::sync_job { !aio_stat path $login } 1491 or !aio_stat path $login
1262} 1492}
1263 1493
1264sub find($) { 1494sub find($) {
1265 return $cf::PLAYER{$_[0]} || do { 1495 return $cf::PLAYER{$_[0]} || do {
1266 my $login = $_[0]; 1496 my $login = $_[0];
… …
1273 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1503 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1274 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1504 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1275 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1505 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1276 aio_unlink +(playerdir $login) . "/$login.pl"; 1506 aio_unlink +(playerdir $login) . "/$login.pl";
1277 1507
1278 my $pl = load_pl path $login 1508 my $f = new_from_file cf::object::thawer path $login
1279 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;
1280 $cf::PLAYER{$login} = $pl 1516 $cf::PLAYER{$login} = $pl
1281 } 1517 }
1282 } 1518 }
1283} 1519}
1284 1520
… …
1293 return if $pl->{deny_save}; 1529 return if $pl->{deny_save};
1294 1530
1295 aio_mkdir playerdir $pl, 0770; 1531 aio_mkdir playerdir $pl, 0770;
1296 $pl->{last_save} = $cf::RUNTIME; 1532 $pl->{last_save} = $cf::RUNTIME;
1297 1533
1534 cf::get_slot 0.01;
1535
1298 $pl->save_pl ($path); 1536 $pl->save_pl ($path);
1299 Coro::cede; 1537 cf::cede_to_tick;
1300} 1538}
1301 1539
1302sub new($) { 1540sub new($) {
1303 my ($login) = @_; 1541 my ($login) = @_;
1304 1542
… …
1310 $cf::PLAYER{$login} = $self; 1548 $cf::PLAYER{$login} = $self;
1311 1549
1312 $self 1550 $self
1313} 1551}
1314 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
1315=item $pl->quit_character 1563=item $pl->quit_character
1316 1564
1317Nukes the player without looking back. If logged in, the connection will 1565Nukes the player without looking back. If logged in, the connection will
1318be destroyed. May block for a long time. 1566be destroyed. May block for a long time.
1319 1567
… …
1323 my ($pl) = @_; 1571 my ($pl) = @_;
1324 1572
1325 my $name = $pl->ob->name; 1573 my $name = $pl->ob->name;
1326 1574
1327 $pl->{deny_save} = 1; 1575 $pl->{deny_save} = 1;
1328 $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
1329 1577
1330 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1578 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1331 $pl->deactivate; 1579 $pl->deactivate;
1580 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1581 $pl->ob->check_score;
1332 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1582 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1333 $pl->ns->destroy if $pl->ns; 1583 $pl->ns->destroy if $pl->ns;
1334 1584
1335 my $path = playerdir $pl; 1585 my $path = playerdir $pl;
1336 my $temp = "$path~$cf::RUNTIME~deleting~"; 1586 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1372 or return []; 1622 or return [];
1373 1623
1374 my @logins; 1624 my @logins;
1375 1625
1376 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") {
1377 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1632 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1378 aio_read $fh, 0, 512, my $buf, 0 or next; 1633 aio_read $fh, 0, 512, my $buf, 0 or next;
1379 $buf !~ /^password -------------$/m or next; # official not-valid tag 1634 $buf !~ /^password -------------$/m or next; # official not-valid tag
1635 }
1380 1636
1381 utf8::decode $login; 1637 utf8::decode $login;
1382 push @logins, $login; 1638 push @logins, $login;
1383 } 1639 }
1384 1640
… …
1411 } 1667 }
1412 1668
1413 \@paths 1669 \@paths
1414} 1670}
1415 1671
1416=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1672=item $protocol_xml = $player->expand_cfpod ($cfpod)
1417 1673
1418Expand crossfire pod fragments into protocol xml. 1674Expand deliantra pod fragments into protocol xml.
1419 1675
1420=cut
1421
1422sub expand_cfpod {
1423 ((my $self), (local $_)) = @_;
1424
1425 # escape & and <
1426 s/&/&amp;/g;
1427 s/(?<![BIUGH])</&lt;/g;
1428
1429 # this is buggy, it needs to properly take care of nested <'s
1430
1431 1 while
1432 # replace B<>, I<>, U<> etc.
1433 s/B<([^\>]*)>/<b>$1<\/b>/
1434 || s/I<([^\>]*)>/<i>$1<\/i>/
1435 || s/U<([^\>]*)>/<u>$1<\/u>/
1436 # replace G<male|female> tags
1437 || s{G<([^>|]*)\|([^>]*)>}{
1438 $self->gender ? $2 : $1
1439 }ge
1440 # replace H<hint text>
1441 || s{H<([^\>]*)>}
1442 {
1443 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1444 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1445 "")
1446 [$self->{hintmode}]
1447 }ge;
1448
1449 # create single paragraphs (very hackish)
1450 s/(?<=\S)\n(?=\w)/ /g;
1451
1452 # compress some whitespace
1453 s/\s+\n/\n/g; # ws line-ends
1454 s/\n\n+/\n/g; # double lines
1455 s/^\n+//; # beginning lines
1456 s/\n+$//; # ending lines
1457
1458 $_
1459}
1460
1461sub hintmode {
1462 $_[0]{hintmode} = $_[1] if @_ > 1;
1463 $_[0]{hintmode}
1464}
1465
1466=item $player->ext_reply ($msgid, %msg) 1676=item $player->ext_reply ($msgid, @msg)
1467 1677
1468Sends an ext reply to the player. 1678Sends an ext reply to the player.
1469 1679
1470=cut 1680=cut
1471 1681
1472sub ext_reply($$%) { 1682sub ext_reply($$@) {
1473 my ($self, $id, %msg) = @_; 1683 my ($self, $id, @msg) = @_;
1474 1684
1475 $msg{msgid} = $id; 1685 $self->ns->ext_reply ($id, @msg)
1476 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1477} 1686}
1478 1687
1479=item $player->ext_event ($type, %msg) 1688=item $player->ext_msg ($type, @msg)
1480 1689
1481Sends an ext event to the client. 1690Sends an ext event to the client.
1482 1691
1483=cut 1692=cut
1484 1693
1485sub ext_event($$%) { 1694sub ext_msg($$@) {
1486 my ($self, $type, %msg) = @_; 1695 my ($self, $type, @msg) = @_;
1487 1696
1488 $self->ns->ext_event ($type, %msg); 1697 $self->ns->ext_msg ($type, @msg);
1489} 1698}
1490 1699
1491=head3 cf::region 1700=head3 cf::region
1492 1701
1493=over 4 1702=over 4
… …
1537our $MAX_RESET = 3600; 1746our $MAX_RESET = 3600;
1538our $DEFAULT_RESET = 3000; 1747our $DEFAULT_RESET = 3000;
1539 1748
1540sub generate_random_map { 1749sub generate_random_map {
1541 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
1542 # mit "rum" bekleckern, nicht 1754 # mit "rum" bekleckern, nicht
1543 $self->_create_random_map ( 1755 $self->_create_random_map (
1544 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1756 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1545 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1757 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1546 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1758 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1668 1880
1669# the temporary/swap location 1881# the temporary/swap location
1670sub save_path { 1882sub save_path {
1671 my ($self) = @_; 1883 my ($self) = @_;
1672 1884
1673 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1885 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1674 "$TMPDIR/$path.map" 1886 "$TMPDIR/$path.map"
1675} 1887}
1676 1888
1677# the unique path, undef == no special unique path 1889# the unique path, undef == no special unique path
1678sub uniq_path { 1890sub uniq_path {
1679 my ($self) = @_; 1891 my ($self) = @_;
1680 1892
1681 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1893 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1682 "$UNIQUEDIR/$path" 1894 "$UNIQUEDIR/$path"
1683}
1684
1685# and all this just because we cannot iterate over
1686# all maps in C++...
1687sub change_all_map_light {
1688 my ($change) = @_;
1689
1690 $_->change_map_light ($change)
1691 for grep $_->outdoor, values %cf::MAP;
1692} 1895}
1693 1896
1694sub decay_objects { 1897sub decay_objects {
1695 my ($self) = @_; 1898 my ($self) = @_;
1696 1899
… …
1709 1912
1710sub load_header_from($) { 1913sub load_header_from($) {
1711 my ($self, $path) = @_; 1914 my ($self, $path) = @_;
1712 1915
1713 utf8::encode $path; 1916 utf8::encode $path;
1714 #aio_open $path, O_RDONLY, 0 1917 my $f = new_from_file cf::object::thawer $path
1715 # or return;
1716
1717 $self->_load_header ($path)
1718 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;
1719 1925
1720 $self->{load_path} = $path; 1926 $self->{load_path} = $path;
1721 1927
1722 1 1928 1
1723} 1929}
… …
1777sub find { 1983sub find {
1778 my ($path, $origin) = @_; 1984 my ($path, $origin) = @_;
1779 1985
1780 $path = normalise $path, $origin && $origin->path; 1986 $path = normalise $path, $origin && $origin->path;
1781 1987
1988 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1782 cf::lock_wait "map_find:$path"; 1989 my $guard2 = cf::lock_acquire "map_find:$path";
1783 1990
1784 $cf::MAP{$path} || do { 1991 $cf::MAP{$path} || do {
1785 my $guard = cf::lock_acquire "map_find:$path";
1786 my $map = new_from_path cf::map $path 1992 my $map = new_from_path cf::map $path
1787 or return; 1993 or return;
1788 1994
1789 $map->{last_save} = $cf::RUNTIME; 1995 $map->{last_save} = $cf::RUNTIME;
1790 1996
… …
1792 or return; 1998 or return;
1793 1999
1794 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2000 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1795 # doing this can freeze the server in a sync job, obviously 2001 # doing this can freeze the server in a sync job, obviously
1796 #$cf::WAIT_FOR_TICK->wait; 2002 #$cf::WAIT_FOR_TICK->wait;
2003 undef $guard2;
2004 undef $guard1;
1797 $map->reset; 2005 $map->reset;
1798 undef $guard;
1799 return find $path; 2006 return find $path;
1800 } 2007 }
1801 2008
1802 $cf::MAP{$path} = $map 2009 $cf::MAP{$path} = $map
1803 } 2010 }
… …
1812 local $self->{deny_reset} = 1; # loading can take a long time 2019 local $self->{deny_reset} = 1; # loading can take a long time
1813 2020
1814 my $path = $self->{path}; 2021 my $path = $self->{path};
1815 2022
1816 { 2023 {
1817 my $guard = cf::lock_acquire "map_load:$path"; 2024 my $guard = cf::lock_acquire "map_data:$path";
1818 2025
2026 return unless $self->valid;
1819 return if $self->in_memory != cf::MAP_SWAPPED; 2027 return unless $self->in_memory == cf::MAP_SWAPPED;
1820 2028
1821 $self->in_memory (cf::MAP_LOADING); 2029 $self->in_memory (cf::MAP_LOADING);
1822 2030
1823 $self->alloc; 2031 $self->alloc;
1824 2032
1825 $self->pre_load; 2033 $self->pre_load;
1826 Coro::cede; 2034 cf::cede_to_tick;
1827 2035
2036 my $f = new_from_file cf::object::thawer $self->{load_path};
2037 $f->skip_block;
1828 $self->_load_objects ($self->{load_path}, 1) 2038 $self->_load_objects ($f)
1829 or return; 2039 or return;
1830 2040
1831 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2041 $self->post_load_original
1832 if delete $self->{load_original}; 2042 if delete $self->{load_original};
1833 2043
1834 if (my $uniq = $self->uniq_path) { 2044 if (my $uniq = $self->uniq_path) {
1835 utf8::encode $uniq; 2045 utf8::encode $uniq;
1836 if (aio_open $uniq, O_RDONLY, 0) { 2046 unless (aio_stat $uniq) {
2047 if (my $f = new_from_file cf::object::thawer $uniq) {
1837 $self->clear_unique_items; 2048 $self->clear_unique_items;
1838 $self->_load_objects ($uniq, 0); 2049 $self->_load_objects ($f);
2050 $f->resolve_delayed_derefs;
2051 }
1839 } 2052 }
1840 } 2053 }
1841 2054
1842 Coro::cede; 2055 $f->resolve_delayed_derefs;
2056
2057 cf::cede_to_tick;
1843 # now do the right thing for maps 2058 # now do the right thing for maps
1844 $self->link_multipart_objects; 2059 $self->link_multipart_objects;
1845 $self->difficulty ($self->estimate_difficulty) 2060 $self->difficulty ($self->estimate_difficulty)
1846 unless $self->difficulty; 2061 unless $self->difficulty;
1847 Coro::cede; 2062 cf::cede_to_tick;
1848 2063
1849 unless ($self->{deny_activate}) { 2064 unless ($self->{deny_activate}) {
1850 $self->decay_objects; 2065 $self->decay_objects;
1851 $self->fix_auto_apply; 2066 $self->fix_auto_apply;
1852 $self->update_buttons; 2067 $self->update_buttons;
1853 Coro::cede; 2068 cf::cede_to_tick;
1854 $self->set_darkness_map;
1855 Coro::cede;
1856 $self->activate; 2069 $self->activate;
1857 } 2070 }
1858 2071
2072 $self->{last_save} = $cf::RUNTIME;
2073 $self->last_access ($cf::RUNTIME);
2074
1859 $self->in_memory (cf::MAP_IN_MEMORY); 2075 $self->in_memory (cf::MAP_ACTIVE);
1860 } 2076 }
1861 2077
1862 $self->post_load; 2078 $self->post_load;
1863} 2079}
1864 2080
… …
1873 2089
1874 $self 2090 $self
1875} 2091}
1876 2092
1877# 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
1878sub load_diag { 2094sub load_neighbours {
1879 my ($map) = @_; 2095 my ($map) = @_;
1880 2096
1881 my @diag; # diagonal neighbours 2097 my @neigh; # diagonal neighbours
1882 2098
1883 for (0 .. 3) { 2099 for (0 .. 3) {
1884 my $neigh = $map->tile_path ($_) 2100 my $neigh = $map->tile_path ($_)
1885 or next; 2101 or next;
1886 $neigh = find $neigh, $map 2102 $neigh = find $neigh, $map
1887 or next; 2103 or next;
1888 $neigh->load; 2104 $neigh->load;
1889 2105
2106 push @neigh,
1890 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2107 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1891 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2108 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1892 } 2109 }
1893 2110
1894 for (@diag) { 2111 for (grep defined $_->[0], @neigh) {
2112 my ($path, $origin) = @$_;
1895 my $neigh = find @$_ 2113 my $neigh = find $path, $origin
1896 or next; 2114 or next;
1897 $neigh->load; 2115 $neigh->load;
1898 } 2116 }
1899} 2117}
1900 2118
… …
1905} 2123}
1906 2124
1907sub do_load_sync { 2125sub do_load_sync {
1908 my ($map) = @_; 2126 my ($map) = @_;
1909 2127
2128 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2129 if $Coro::current == $Coro::main;
2130
1910 cf::sync_job { $map->load }; 2131 cf::sync_job { $map->load };
1911} 2132}
1912 2133
1913our %MAP_PREFETCH; 2134our %MAP_PREFETCH;
1914our $MAP_PREFETCHER = undef; 2135our $MAP_PREFETCHER = undef;
1915 2136
1916sub find_async { 2137sub find_async {
1917 my ($path, $origin) = @_; 2138 my ($path, $origin, $load) = @_;
1918 2139
1919 $path = normalise $path, $origin && $origin->{path}; 2140 $path = normalise $path, $origin && $origin->{path};
1920 2141
1921 if (my $map = $cf::MAP{$path}) { 2142 if (my $map = $cf::MAP{$path}) {
1922 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2143 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1923 } 2144 }
1924 2145
1925 undef $MAP_PREFETCH{$path}; 2146 $MAP_PREFETCH{$path} |= $load;
2147
1926 $MAP_PREFETCHER ||= cf::async { 2148 $MAP_PREFETCHER ||= cf::async {
2149 $Coro::current->{desc} = "map prefetcher";
2150
1927 while (%MAP_PREFETCH) { 2151 while (%MAP_PREFETCH) {
1928 for my $path (keys %MAP_PREFETCH) { 2152 while (my ($k, $v) = each %MAP_PREFETCH) {
1929 if (my $map = find $path) { 2153 if (my $map = find $k) {
1930 $map->load; 2154 $map->load if $v;
1931 } 2155 }
1932 2156
1933 delete $MAP_PREFETCH{$path}; 2157 delete $MAP_PREFETCH{$k};
1934 } 2158 }
1935 } 2159 }
1936 undef $MAP_PREFETCHER; 2160 undef $MAP_PREFETCHER;
1937 }; 2161 };
1938 $MAP_PREFETCHER->prio (6); 2162 $MAP_PREFETCHER->prio (6);
… …
1941} 2165}
1942 2166
1943sub save { 2167sub save {
1944 my ($self) = @_; 2168 my ($self) = @_;
1945 2169
1946 my $lock = cf::lock_acquire "map_data:" . $self->path; 2170 my $lock = cf::lock_acquire "map_data:$self->{path}";
1947 2171
1948 $self->{last_save} = $cf::RUNTIME; 2172 $self->{last_save} = $cf::RUNTIME;
1949 2173
1950 return unless $self->dirty; 2174 return unless $self->dirty;
1951 2175
… …
1957 return if $self->{deny_save}; 2181 return if $self->{deny_save};
1958 2182
1959 local $self->{last_access} = $self->last_access;#d# 2183 local $self->{last_access} = $self->last_access;#d#
1960 2184
1961 cf::async { 2185 cf::async {
2186 $Coro::current->{desc} = "map player save";
1962 $_->contr->save for $self->players; 2187 $_->contr->save for $self->players;
1963 }; 2188 };
2189
2190 cf::get_slot 0.02;
1964 2191
1965 if ($uniq) { 2192 if ($uniq) {
1966 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2193 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1967 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2194 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1968 } else { 2195 } else {
… …
1974 my ($self) = @_; 2201 my ($self) = @_;
1975 2202
1976 # save first because save cedes 2203 # save first because save cedes
1977 $self->save; 2204 $self->save;
1978 2205
1979 my $lock = cf::lock_acquire "map_data:" . $self->path; 2206 my $lock = cf::lock_acquire "map_data:$self->{path}";
1980 2207
1981 return if $self->players; 2208 return if $self->players;
1982 return if $self->in_memory != cf::MAP_IN_MEMORY; 2209 return if $self->in_memory != cf::MAP_ACTIVE;
1983 return if $self->{deny_save}; 2210 return if $self->{deny_save};
1984 2211
2212 $self->in_memory (cf::MAP_SWAPPED);
2213
2214 $self->deactivate;
2215 $_->clear_links_to ($self) for values %cf::MAP;
1985 $self->clear; 2216 $self->clear;
1986 $self->in_memory (cf::MAP_SWAPPED);
1987} 2217}
1988 2218
1989sub reset_at { 2219sub reset_at {
1990 my ($self) = @_; 2220 my ($self) = @_;
1991 2221
… …
2009 2239
2010 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2240 my $lock = cf::lock_acquire "map_data:$self->{path}";
2011 2241
2012 return if $self->players; 2242 return if $self->players;
2013 2243
2014 warn "resetting map ", $self->path; 2244 warn "resetting map ", $self->path, "\n";
2015 2245
2016 $self->in_memory (cf::MAP_SWAPPED); 2246 $self->in_memory (cf::MAP_SWAPPED);
2017 2247
2018 # need to save uniques path 2248 # need to save uniques path
2019 unless ($self->{deny_save}) { 2249 unless ($self->{deny_save}) {
… …
2023 if $uniq; 2253 if $uniq;
2024 } 2254 }
2025 2255
2026 delete $cf::MAP{$self->path}; 2256 delete $cf::MAP{$self->path};
2027 2257
2258 $self->deactivate;
2259 $_->clear_links_to ($self) for values %cf::MAP;
2028 $self->clear; 2260 $self->clear;
2029
2030 $_->clear_links_to ($self) for values %cf::MAP;
2031 2261
2032 $self->unlink_save; 2262 $self->unlink_save;
2033 $self->destroy; 2263 $self->destroy;
2034} 2264}
2035 2265
2036my $nuke_counter = "aaaa"; 2266my $nuke_counter = "aaaa";
2037 2267
2038sub nuke { 2268sub nuke {
2039 my ($self) = @_; 2269 my ($self) = @_;
2040 2270
2271 {
2272 my $lock = cf::lock_acquire "map_data:$self->{path}";
2273
2041 delete $cf::MAP{$self->path}; 2274 delete $cf::MAP{$self->path};
2042 2275
2043 $self->unlink_save; 2276 $self->unlink_save;
2044 2277
2045 bless $self, "cf::map"; 2278 bless $self, "cf::map";
2046 delete $self->{deny_reset}; 2279 delete $self->{deny_reset};
2047 $self->{deny_save} = 1; 2280 $self->{deny_save} = 1;
2048 $self->reset_timeout (1); 2281 $self->reset_timeout (1);
2049 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2282 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2050 2283
2051 $cf::MAP{$self->path} = $self; 2284 $cf::MAP{$self->path} = $self;
2285 }
2052 2286
2053 $self->reset; # polite request, might not happen 2287 $self->reset; # polite request, might not happen
2054} 2288}
2055 2289
2056=item $maps = cf::map::tmp_maps 2290=item $maps = cf::map::tmp_maps
… …
2098 2332
2099sub unique_maps() { 2333sub unique_maps() {
2100 [ 2334 [
2101 map { 2335 map {
2102 utf8::decode $_; 2336 utf8::decode $_;
2103 /\.map$/ 2337 s/\.map$//; # TODO future compatibility hack
2338 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2339 ? ()
2104 ? normalise $_ 2340 : normalise $_
2105 : ()
2106 } @{ aio_readdir $UNIQUEDIR or [] } 2341 } @{ aio_readdir $UNIQUEDIR or [] }
2107 ] 2342 ]
2108} 2343}
2109 2344
2110package cf;
2111
2112=back 2345=back
2113 2346
2114=head3 cf::object 2347=head3 cf::object
2115 2348
2116=cut 2349=cut
… …
2119 2352
2120=over 4 2353=over 4
2121 2354
2122=item $ob->inv_recursive 2355=item $ob->inv_recursive
2123 2356
2124Returns 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.
2125 2359
2126=cut 2360=cut
2127 2361
2128sub inv_recursive_; 2362sub inv_recursive_;
2129sub inv_recursive_ { 2363sub inv_recursive_ {
… …
2132 2366
2133sub inv_recursive { 2367sub inv_recursive {
2134 inv_recursive_ inv $_[0] 2368 inv_recursive_ inv $_[0]
2135} 2369}
2136 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
2137package cf; 2399package cf;
2138 2400
2139=back 2401=back
2140 2402
2141=head3 cf::object::player 2403=head3 cf::object::player
… …
2147Sends 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>
2148can 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
2149dialogue with the given NPC character. 2411dialogue with the given NPC character.
2150 2412
2151=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};
2152 2428
2153# rough implementation of a future "reply" method that works 2429# rough implementation of a future "reply" method that works
2154# with dialog boxes. 2430# with dialog boxes.
2155#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
2156sub cf::object::player::reply($$$;$) { 2432sub cf::object::player::reply($$$;$) {
… …
2163 2439
2164 } else { 2440 } else {
2165 my $pl = $self->contr; 2441 my $pl = $self->contr;
2166 2442
2167 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2443 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2168 my $diag = $pl->{npc_dialog}; 2444 my $dialog = $pl->{npc_dialog};
2169 $diag->{pl}->ext_reply ( 2445 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2170 $diag->{id},
2171 msgtype => "reply",
2172 msg => $diag->{pl}->expand_cfpod ($msg),
2173 add_topics => []
2174 );
2175 2446
2176 } else { 2447 } else {
2177 $msg = $npc->name . " says: $msg" if $npc; 2448 $msg = $npc->name . " says: $msg" if $npc;
2178 $self->message ($msg, $flags); 2449 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2179 } 2450 }
2180 } 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 (@_);
2181} 2462}
2182 2463
2183=item $player_object->may ("access") 2464=item $player_object->may ("access")
2184 2465
2185Returns wether the given player is authorized to access resource "access" 2466Returns wether the given player is authorized to access resource "access"
… …
2198 2479
2199=item $player_object->enter_link 2480=item $player_object->enter_link
2200 2481
2201Freezes 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}>).
2202 2483
2203The 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.
2204I<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.
2205 2488
2206Will never block. 2489Will never block.
2207 2490
2208=item $player_object->leave_link ($map, $x, $y) 2491=item $player_object->leave_link ($map, $x, $y)
2209 2492
… …
2264 # use -1 or undef as default coordinates, not 0, 0 2547 # use -1 or undef as default coordinates, not 0, 0
2265 ($x, $y) = ($map->enter_x, $map->enter_y) 2548 ($x, $y) = ($map->enter_x, $map->enter_y)
2266 if $x <=0 && $y <= 0; 2549 if $x <=0 && $y <= 0;
2267 2550
2268 $map->load; 2551 $map->load;
2269 $map->load_diag; 2552 $map->load_neighbours;
2270 2553
2271 return unless $self->contr->active; 2554 return unless $self->contr->active;
2272 $self->activate_recursive;
2273 2555
2274 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2556 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2275 $self->enter_map ($map, $x, $y); 2557 $self->enter_map ($map, $x, $y);
2558
2559 # only activate afterwards, to support waiting in hooks
2560 $self->activate_recursive;
2276} 2561}
2277 2562
2278=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2563=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2279 2564
2280Moves the player to the given map-path and coordinates by first freezing 2565Moves the player to the given map-path and coordinates by first freezing
2281her, loading and preparing them map, calling the provided $check callback 2566her, loading and preparing them map, calling the provided $check callback
2282that has to return the map if sucecssful, and then unfreezes the player on 2567that has to return the map if sucecssful, and then unfreezes the player on
2283the new (success) or old (failed) map position. In either case, $done will 2568the new (success) or old (failed) map position. In either case, $done will
2284be called at the end of this process. 2569be called at the end of this process.
2285 2570
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 >>.
2573
2286=cut 2574=cut
2287 2575
2288our $GOTOGEN; 2576our $GOTOGEN;
2289 2577
2290sub cf::object::player::goto { 2578sub cf::object::player::goto {
… …
2294 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2582 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2295 2583
2296 $self->enter_link; 2584 $self->enter_link;
2297 2585
2298 (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
2299 my $map = eval { 2608 my $map = eval {
2300 my $map = cf::map::find $path; 2609 my $map = defined $path ? cf::map::find $path : undef;
2301 2610
2302 if ($map) { 2611 if ($map) {
2303 $map = $map->customise_for ($self); 2612 $map = $map->customise_for ($self);
2304 $map = $check->($map) if $check && $map; 2613 $map = $check->($map) if $check && $map;
2305 } else { 2614 } else {
2306 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2615 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2307 } 2616 }
2308 2617
2309 $map 2618 $map
2310 }; 2619 };
2311 2620
… …
2347} 2656}
2348 2657
2349sub prepare_random_map { 2658sub prepare_random_map {
2350 my ($exit) = @_; 2659 my ($exit) = @_;
2351 2660
2352 my $guard = cf::lock_acquire "exit_prepare:$exit";
2353
2354 # all this does is basically replace the /! path by 2661 # all this does is basically replace the /! path by
2355 # a new random map path (?random/...) with a seed 2662 # a new random map path (?random/...) with a seed
2356 # that depends on the exit object 2663 # that depends on the exit object
2357 2664
2358 my $rmp = parse_random_map_params $exit->msg; 2665 my $rmp = parse_random_map_params $exit->msg;
… …
2360 if ($exit->map) { 2667 if ($exit->map) {
2361 $rmp->{region} = $exit->region->name; 2668 $rmp->{region} = $exit->region->name;
2362 $rmp->{origin_map} = $exit->map->path; 2669 $rmp->{origin_map} = $exit->map->path;
2363 $rmp->{origin_x} = $exit->x; 2670 $rmp->{origin_x} = $exit->x;
2364 $rmp->{origin_y} = $exit->y; 2671 $rmp->{origin_y} = $exit->y;
2672
2673 $exit->map->touch;
2365 } 2674 }
2366 2675
2367 $rmp->{random_seed} ||= $exit->random_seed; 2676 $rmp->{random_seed} ||= $exit->random_seed;
2368 2677
2369 my $data = cf::to_json $rmp; 2678 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2370 my $md5 = Digest::MD5::md5_hex $data; 2679 my $md5 = Digest::MD5::md5_hex $data;
2371 my $meta = "$RANDOMDIR/$md5.meta"; 2680 my $meta = "$RANDOMDIR/$md5.meta";
2372 2681
2373 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2682 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2374 aio_write $fh, 0, (length $data), $data, 0; 2683 aio_write $fh, 0, (length $data), $data, 0;
2375 undef $fh; 2684 undef $fh;
2376 aio_rename "$meta~", $meta; 2685 aio_rename "$meta~", $meta;
2377 2686
2687 my $slaying = "?random/$md5";
2688
2689 if ($exit->valid) {
2378 $exit->slaying ("?random/$md5"); 2690 $exit->slaying ("?random/$md5");
2379 $exit->msg (undef); 2691 $exit->msg (undef);
2692 }
2380 } 2693 }
2381} 2694}
2382 2695
2383sub cf::object::player::enter_exit { 2696sub cf::object::player::enter_exit {
2384 my ($self, $exit) = @_; 2697 my ($self, $exit) = @_;
2385 2698
2386 return unless $self->type == cf::PLAYER; 2699 return unless $self->type == cf::PLAYER;
2387 2700
2388 if ($exit->slaying eq "/!") {
2389 #TODO: this should de-fi-ni-te-ly not be a sync-job
2390 # the problem is that $exit might not survive long enough
2391 # so it needs to be done right now, right here
2392 cf::sync_job { prepare_random_map $exit };
2393 }
2394
2395 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2396 my $hp = $exit->stats->hp;
2397 my $sp = $exit->stats->sp;
2398
2399 $self->enter_link; 2701 $self->enter_link;
2400 2702
2401 # if exit is damned, update players death & WoR home-position
2402 $self->contr->savebed ($slaying, $hp, $sp)
2403 if $exit->flag (FLAG_DAMNED);
2404
2405 (async { 2703 (async {
2406 $self->deactivate_recursive; # just to be sure 2704 $Coro::current->{desc} = "enter_exit";
2705
2407 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
2408 $self->goto ($slaying, $hp, $sp); 2721 $self->goto ($map, $x, $y);
2409 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
2410 1; 2727 1
2411 }) { 2728 }) {
2412 $self->message ("Something went wrong deep within the crossfire server. " 2729 $self->message ("Something went wrong deep within the deliantra server. "
2413 . "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. "
2414 . "Please report this to the dungeon master!", 2731 . "Please report this to the dungeon master!",
2415 cf::NDI_UNIQUE | cf::NDI_RED); 2732 cf::NDI_UNIQUE | cf::NDI_RED);
2416 2733
2417 warn "ERROR in enter_exit: $@"; 2734 warn "ERROR in enter_exit: $@";
… …
2445the message, with C<log> being the default. If C<$color> is negative, suppress 2762the message, with C<log> being the default. If C<$color> is negative, suppress
2446the message unless the client supports the msg packet. 2763the message unless the client supports the msg packet.
2447 2764
2448=cut 2765=cut
2449 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
2450sub cf::client::send_msg { 2869sub cf::client::send_msg {
2451 my ($self, $channel, $msg, $color, @extra) = @_; 2870 my ($self, $channel, $msg, $color, @extra) = @_;
2452 2871
2453 $msg = $self->pl->expand_cfpod ($msg); 2872 $msg = $self->pl->expand_cfpod ($msg)
2873 unless $color & cf::NDI_VERBATIM;
2454 2874
2455 return unless @extra || length $msg;
2456
2457 $color &= ~cf::NDI_UNIQUE; # just in case... 2875 $color &= cf::NDI_CLIENT_MASK; # just in case...
2458 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
2459 if (ref $channel) { 2884 } elsif (ref $channel) {
2460 # send meta info to client, if not yet sent 2885 # send meta info to client, if not yet sent
2461 unless (exists $self->{channel}{$channel->{id}}) { 2886 unless (exists $self->{channel}{$channel->{id}}) {
2462 $self->{channel}{$channel->{id}} = $channel; 2887 $self->{channel}{$channel->{id}} = $channel;
2463 $self->ext_event (channel_info => %$channel); 2888 $self->ext_msg (channel_info => $channel);
2464 } 2889 }
2465 2890
2466 $channel = $channel->{id}; 2891 $channel = $channel->{id};
2467 } 2892 }
2468 2893
2469 if ($self->can_msg) { 2894 return unless @extra || length $msg;
2470 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra]));
2471 } else {
2472 # replace some tags by gcfclient-compatible ones
2473 for ($msg) {
2474 1 while
2475 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2476 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2477 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2478 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2479 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2480 }
2481 2895
2482 if ($color >= 0) { 2896 # default colour, mask it out
2483 if (0 && $msg =~ /\[/) { 2897 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2484 $self->send_packet ("drawextinfo $color 4 0 $msg") 2898 if $color & cf::NDI_DEF;
2485 } else {
2486 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2487 $self->send_packet ("drawinfo $color $msg")
2488 }
2489 }
2490 }
2491}
2492 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
2493=item $client->ext_event ($type, %msg) 2918=item $client->ext_msg ($type, @msg)
2494 2919
2495Sends an ext event to the client. 2920Sends an ext event to the client.
2496 2921
2497=cut 2922=cut
2498 2923
2499sub cf::client::ext_event($$%) { 2924sub cf::client::ext_msg($$@) {
2500 my ($self, $type, %msg) = @_; 2925 my ($self, $type, @msg) = @_;
2501 2926
2502 return unless $self->extcmd; 2927 if ($self->extcmd == 2) {
2503 2928 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2929 } elsif ($self->extcmd == 1) { # TODO: remove
2504 $msg{msgtype} = "event_$type"; 2930 push @msg, msgtype => "event_$type";
2505 $self->send_packet ("ext " . $self->{json_coder}->encode (\%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 }
2506} 2951}
2507 2952
2508=item $success = $client->query ($flags, "text", \&cb) 2953=item $success = $client->query ($flags, "text", \&cb)
2509 2954
2510Queues a query to the client, calling the given callback with 2955Queues a query to the client, calling the given callback with
… …
2565 my ($ns, $buf) = @_; 3010 my ($ns, $buf) = @_;
2566 3011
2567 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3012 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2568 3013
2569 if (ref $msg) { 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
2570 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 3022 if (my $cb = $EXTICMD{$type}) {
2571 if (my %reply = $cb->($ns, $msg)) { 3023 @reply = $cb->($ns, @payload);
2572 $reply{msgid} = $msg->{msgid};
2573 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2574 }
2575 } 3024 }
3025
3026 $ns->ext_reply ($reply, @reply)
3027 if $reply;
3028
2576 } else { 3029 } else {
2577 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3030 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2578 } 3031 }
2579 3032
2580 cf::override; 3033 cf::override;
… …
2627our $safe = new Safe "safe"; 3080our $safe = new Safe "safe";
2628our $safe_hole = new Safe::Hole; 3081our $safe_hole = new Safe::Hole;
2629 3082
2630$SIG{FPE} = 'IGNORE'; 3083$SIG{FPE} = 'IGNORE';
2631 3084
2632$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));
2633 3090
2634# here we export the classes and methods available to script code 3091# here we export the classes and methods available to script code
2635 3092
2636=pod 3093=pod
2637 3094
2638The following functions and methods are available within a safe environment: 3095The following functions and methods are available within a safe environment:
2639 3096
2640 cf::object 3097 cf::object
2641 contr pay_amount pay_player map x y force_find force_add 3098 contr pay_amount pay_player map x y force_find force_add destroy
2642 insert remove 3099 insert remove name archname title slaying race decrease split
3100 value
2643 3101
2644 cf::object::player 3102 cf::object::player
2645 player 3103 player
2646 3104
2647 cf::player 3105 cf::player
… …
2652 3110
2653=cut 3111=cut
2654 3112
2655for ( 3113for (
2656 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3114 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2657 insert remove)], 3115 insert remove inv nrof name archname title slaying race
3116 decrease split destroy change_exp value msg lore send_msg)],
2658 ["cf::object::player" => qw(player)], 3117 ["cf::object::player" => qw(player)],
2659 ["cf::player" => qw(peaceful)], 3118 ["cf::player" => qw(peaceful send_msg)],
2660 ["cf::map" => qw(trigger)], 3119 ["cf::map" => qw(trigger)],
2661) { 3120) {
2662 no strict 'refs'; 3121 no strict 'refs';
2663 my ($pkg, @funs) = @$_; 3122 my ($pkg, @funs) = @$_;
2664 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3123 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
2681 my ($code, %vars) = @_; 3140 my ($code, %vars) = @_;
2682 3141
2683 my $qcode = $code; 3142 my $qcode = $code;
2684 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3143 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2685 $qcode =~ s/\n/\\n/g; 3144 $qcode =~ s/\n/\\n/g;
3145
3146 %vars = (_dummy => 0) unless %vars;
2686 3147
2687 local $_; 3148 local $_;
2688 local @safe::cf::_safe_eval_args = values %vars; 3149 local @safe::cf::_safe_eval_args = values %vars;
2689 3150
2690 my $eval = 3151 my $eval =
… …
2738# the server's init and main functions 3199# the server's init and main functions
2739 3200
2740sub load_facedata($) { 3201sub load_facedata($) {
2741 my ($path) = @_; 3202 my ($path) = @_;
2742 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;
3209
2743 warn "loading facedata from $path\n"; 3210 warn "loading facedata from $path\n";
2744 3211
2745 my $facedata; 3212 my $facedata;
2746 0 < aio_load $path, $facedata 3213 0 < aio_load $path, $facedata
2747 or die "$path: $!"; 3214 or die "$path: $!";
… …
2749 $facedata = Coro::Storable::thaw $facedata; 3216 $facedata = Coro::Storable::thaw $facedata;
2750 3217
2751 $facedata->{version} == 2 3218 $facedata->{version} == 2
2752 or cf::cleanup "$path: version mismatch, cannot proceed."; 3219 or cf::cleanup "$path: version mismatch, cannot proceed.";
2753 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
2754 { 3228 {
2755 my $faces = $facedata->{faceinfo}; 3229 my $faces = $facedata->{faceinfo};
2756 3230
2757 while (my ($face, $info) = each %$faces) { 3231 while (my ($face, $info) = each %$faces) {
2758 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3232 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3233
2759 cf::face::set_visibility $idx, $info->{visibility}; 3234 cf::face::set_visibility $idx, $info->{visibility};
2760 cf::face::set_magicmap $idx, $info->{magicmap}; 3235 cf::face::set_magicmap $idx, $info->{magicmap};
2761 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3236 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2762 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3237 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2763 3238
2764 cf::cede_to_tick; 3239 cf::cede_to_tick;
2765 } 3240 }
2766 3241
2767 while (my ($face, $info) = each %$faces) { 3242 while (my ($face, $info) = each %$faces) {
2768 next unless $info->{smooth}; 3243 next unless $info->{smooth};
3244
2769 my $idx = cf::face::find $face 3245 my $idx = cf::face::find $face
2770 or next; 3246 or next;
3247
2771 if (my $smooth = cf::face::find $info->{smooth}) { 3248 if (my $smooth = cf::face::find $info->{smooth}) {
2772 cf::face::set_smooth $idx, $smooth; 3249 cf::face::set_smooth $idx, $smooth;
2773 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3250 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2774 } else { 3251 } else {
2775 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3252 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
2792 3269
2793 { 3270 {
2794 # TODO: for gcfclient pleasure, we should give resources 3271 # TODO: for gcfclient pleasure, we should give resources
2795 # that gcfclient doesn't grok a >10000 face index. 3272 # that gcfclient doesn't grok a >10000 face index.
2796 my $res = $facedata->{resource}; 3273 my $res = $facedata->{resource};
2797 my $enc = JSON::XS->new->utf8->canonical;
2798 3274
2799 while (my ($name, $info) = each %$res) { 3275 while (my ($name, $info) = each %$res) {
2800 my $meta = $enc->encode ({ 3276 if (defined $info->{type}) {
2801 name => $name,
2802 type => $info->{type},
2803 copyright => $info->{copyright}, #TODO#
2804 });
2805
2806 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3277 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3278 my $data;
2807 3279
2808 if ($name =~ /\.jpg$/) { 3280 if ($info->{type} & 1) {
2809 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3281 # prepend meta info
2810 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 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};
2811 } else { 3295 } else {
2812 my $data = pack "(w/a*)*", $meta, $info->{data}; 3296 $RESOURCE{$name} = $info;
2813 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2814
2815 cf::face::set_type $idx, 1;
2816 cf::face::set_data $idx, 0, $data, $chk;
2817 } 3297 }
2818 3298
2819 cf::cede_to_tick; 3299 cf::cede_to_tick;
2820 } 3300 }
2821 } 3301 }
2822 3302
3303 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3304
2823 1 3305 1
2824} 3306}
2825 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
2826sub 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
2827 load_resource_file "$MAPDIR/regions" 3351 load_resource_file "$MAPDIR/regions"
2828 or die "unable to load regions file\n"; 3352 or die "unable to load regions file\n";
2829 3353
2830 for (cf::region::list) { 3354 for (cf::region::list) {
2831 $_->{match} = qr/$_->{match}/ 3355 $_->{match} = qr/$_->{match}/
… …
2839} 3363}
2840 3364
2841sub reload_archetypes { 3365sub reload_archetypes {
2842 load_resource_file "$DATADIR/archetypes" 3366 load_resource_file "$DATADIR/archetypes"
2843 or die "unable to load archetypes\n"; 3367 or die "unable to load archetypes\n";
2844 #d# NEED to laod twice to resolve forward references
2845 # this really needs to be done in an extra post-pass
2846 # (which needs to be synchronous, so solve it differently)
2847 load_resource_file "$DATADIR/archetypes"
2848 or die "unable to load archetypes\n";
2849} 3368}
2850 3369
2851sub reload_treasures { 3370sub reload_treasures {
2852 load_resource_file "$DATADIR/treasures" 3371 load_resource_file "$DATADIR/treasures"
2853 or die "unable to load treasurelists\n"; 3372 or die "unable to load treasurelists\n";
2854} 3373}
2855 3374
2856sub reload_resources { 3375sub reload_resources {
2857 warn "reloading resource files...\n"; 3376 warn "reloading resource files...\n";
2858 3377
3378 reload_facedata;
3379 reload_archetypes;
2859 reload_regions; 3380 reload_regions;
2860 reload_facedata;
2861 #reload_archetypes;#d#
2862 reload_archetypes;
2863 reload_treasures; 3381 reload_treasures;
2864 3382
2865 warn "finished reloading resource files\n"; 3383 warn "finished reloading resource files\n";
2866} 3384}
2867 3385
2868sub init { 3386sub reload_config {
2869 reload_resources;
2870}
2871
2872sub cfg_load {
2873 open my $fh, "<:utf8", "$CONFDIR/config" 3387 open my $fh, "<:utf8", "$CONFDIR/config"
2874 or return; 3388 or return;
2875 3389
2876 local $/; 3390 local $/;
2877 *CFG = YAML::Syck::Load <$fh>; 3391 *CFG = YAML::Load <$fh>;
2878 3392
2879 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3393 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2880 3394
2881 $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};
2882 $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};
… …
2888 }; 3402 };
2889 warn $@ if $@; 3403 warn $@ if $@;
2890 } 3404 }
2891} 3405}
2892 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
2893sub 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
2894 # we must not ever block the main coroutine 3450 # we must not ever block the main coroutine
2895 local $Coro::idle = sub { 3451 local $Coro::idle = sub {
2896 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#
2897 (async { 3453 (async {
2898 Event::one_event; 3454 $Coro::current->{desc} = "IDLE BUG HANDLER";
3455 EV::loop EV::LOOP_ONESHOT;
2899 })->prio (Coro::PRIO_MAX); 3456 })->prio (Coro::PRIO_MAX);
2900 }; 3457 };
2901 3458
2902 cfg_load; 3459 evthread_start IO::AIO::poll_fileno;
3460
3461 cf::sync_job {
3462 reload_resources;
3463 reload_config;
2903 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
2904 load_extensions; 3477 load_extensions;
2905 3478
2906 $TICK_WATCHER->start; 3479 utime time, time, $RUNTIMEFILE;
2907 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;
2908} 3489}
2909 3490
2910############################################################################# 3491#############################################################################
2911# initialisation and cleanup 3492# initialisation and cleanup
2912 3493
2913# install some emergency cleanup handlers 3494# install some emergency cleanup handlers
2914BEGIN { 3495BEGIN {
3496 our %SIGWATCHER = ();
2915 for my $signal (qw(INT HUP TERM)) { 3497 for my $signal (qw(INT HUP TERM)) {
2916 Event->signal ( 3498 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2917 reentrant => 0,
2918 data => WF_AUTOCANCEL,
2919 signal => $signal,
2920 prio => 0,
2921 cb => sub {
2922 cf::cleanup "SIG$signal"; 3499 cf::cleanup "SIG$signal";
2923 },
2924 ); 3500 };
2925 } 3501 }
2926} 3502}
2927 3503
2928sub write_runtime { 3504sub write_runtime_sync {
2929 my $runtime = "$LOCALDIR/runtime";
2930
2931 # first touch the runtime file to show we are still running: 3505 # first touch the runtime file to show we are still running:
2932 # the fsync below can take a very very long time. 3506 # the fsync below can take a very very long time.
2933 3507
2934 IO::AIO::aio_utime $runtime, undef, undef; 3508 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
2935 3509
2936 my $guard = cf::lock_acquire "write_runtime"; 3510 my $guard = cf::lock_acquire "write_runtime";
2937 3511
2938 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3512 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
2939 or return; 3513 or return;
2940 3514
2941 my $value = $cf::RUNTIME + 90 + 10; 3515 my $value = $cf::RUNTIME + 90 + 10;
2942 # 10 is the runtime save interval, for a monotonic clock 3516 # 10 is the runtime save interval, for a monotonic clock
2943 # 60 allows for the watchdog to kill the server. 3517 # 60 allows for the watchdog to kill the server.
… …
2953 aio_utime $fh, undef, undef; 3527 aio_utime $fh, undef, undef;
2954 3528
2955 close $fh 3529 close $fh
2956 or return; 3530 or return;
2957 3531
2958 aio_rename "$runtime~", $runtime 3532 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
2959 and return; 3533 and return;
2960 3534
2961 warn "runtime file written.\n"; 3535 warn "runtime file written.\n";
2962 3536
2963 1 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 };
2964} 3588}
2965 3589
2966sub emergency_save() { 3590sub emergency_save() {
2967 my $freeze_guard = cf::freeze_mainloop; 3591 my $freeze_guard = cf::freeze_mainloop;
2968 3592
2969 warn "enter emergency perl save\n"; 3593 warn "emergency_perl_save: enter\n";
2970 3594
2971 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
2972 # use a peculiar iteration method to avoid tripping on perl 3601 # use a peculiar iteration method to avoid tripping on perl
2973 # refcount bugs in for. also avoids problems with players 3602 # refcount bugs in for. also avoids problems with players
2974 # and maps saved/destroyed asynchronously. 3603 # and maps saved/destroyed asynchronously.
2975 warn "begin emergency player save\n"; 3604 warn "emergency_perl_save: begin player save\n";
2976 for my $login (keys %cf::PLAYER) { 3605 for my $login (keys %cf::PLAYER) {
2977 my $pl = $cf::PLAYER{$login} or next; 3606 my $pl = $cf::PLAYER{$login} or next;
2978 $pl->valid or next; 3607 $pl->valid or next;
3608 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2979 $pl->save; 3609 $pl->save;
2980 } 3610 }
2981 warn "end emergency player save\n"; 3611 warn "emergency_perl_save: end player save\n";
2982 3612
2983 warn "begin emergency map save\n"; 3613 warn "emergency_perl_save: begin map save\n";
2984 for my $path (keys %cf::MAP) { 3614 for my $path (keys %cf::MAP) {
2985 my $map = $cf::MAP{$path} or next; 3615 my $map = $cf::MAP{$path} or next;
2986 $map->valid or next; 3616 $map->valid or next;
2987 $map->save; 3617 $map->save;
2988 } 3618 }
2989 warn "end emergency map save\n"; 3619 warn "emergency_perl_save: end map save\n";
2990 3620
2991 warn "begin emergency database checkpoint\n"; 3621 warn "emergency_perl_save: begin database checkpoint\n";
2992 BDB::db_env_txn_checkpoint $DB_ENV; 3622 BDB::db_env_txn_checkpoint $DB_ENV;
2993 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";
2994 }; 3628 };
2995 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
2996 warn "leave emergency perl save\n"; 3635 warn "emergency_perl_save: leave\n";
2997} 3636}
2998 3637
2999sub post_cleanup { 3638sub post_cleanup {
3000 my ($make_core) = @_; 3639 my ($make_core) = @_;
3001 3640
3002 warn Carp::longmess "post_cleanup backtrace" 3641 warn Carp::longmess "post_cleanup backtrace"
3003 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#
3004} 3672}
3005 3673
3006sub do_reload_perl() { 3674sub do_reload_perl() {
3007 # can/must only be called in main 3675 # can/must only be called in main
3008 if ($Coro::current != $Coro::main) { 3676 if ($Coro::current != $Coro::main) {
3009 warn "can only reload from main coroutine"; 3677 warn "can only reload from main coroutine";
3010 return; 3678 return;
3011 } 3679 }
3012 3680
3681 return if $RELOAD++;
3682
3683 my $t1 = EV::time;
3684
3685 while ($RELOAD) {
3013 warn "reloading..."; 3686 warn "reloading...";
3014 3687
3015 warn "entering sync_job"; 3688 warn "entering sync_job";
3016 3689
3017 cf::sync_job { 3690 cf::sync_job {
3018 cf::write_runtime; # external watchdog should not bark 3691 cf::write_runtime_sync; # external watchdog should not bark
3019 cf::emergency_save; 3692 cf::emergency_save;
3020 cf::write_runtime; # external watchdog should not bark 3693 cf::write_runtime_sync; # external watchdog should not bark
3021 3694
3022 warn "syncing database to disk"; 3695 warn "syncing database to disk";
3023 BDB::db_env_txn_checkpoint $DB_ENV; 3696 BDB::db_env_txn_checkpoint $DB_ENV;
3024 3697
3025 # 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
3026 3699
3027 warn "cancelling all WF_AUTOCANCEL watchers";
3028 for (Event::all_watchers) {
3029 $_->cancel if $_->data & WF_AUTOCANCEL;
3030 }
3031
3032 warn "flushing outstanding aio requests"; 3700 warn "flushing outstanding aio requests";
3033 for (;;) {
3034 BDB::flush;
3035 IO::AIO::flush;
3036 Coro::cede;
3037 last unless IO::AIO::nreqs || BDB::nreqs; 3701 while (IO::AIO::nreqs || BDB::nreqs) {
3038 warn "iterate..."; 3702 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3039 }
3040
3041 ++$RELOAD;
3042
3043 warn "cancelling all extension coros";
3044 $_->cancel for values %EXT_CORO;
3045 %EXT_CORO = ();
3046
3047 warn "removing commands";
3048 %COMMAND = ();
3049
3050 warn "removing ext/exti commands";
3051 %EXTCMD = ();
3052 %EXTICMD = ();
3053
3054 warn "unloading/nuking all extensions";
3055 for my $pkg (@EXTS) {
3056 warn "... unloading $pkg";
3057
3058 if (my $cb = $pkg->can ("unload")) {
3059 eval {
3060 $cb->($pkg);
3061 1
3062 } or warn "$pkg unloaded, but with errors: $@";
3063 } 3703 }
3064 3704
3065 warn "... nuking $pkg"; 3705 warn "cancelling all extension coros";
3066 Symbol::delete_package $pkg; 3706 $_->cancel for values %EXT_CORO;
3067 } 3707 %EXT_CORO = ();
3068 3708
3069 warn "unloading all perl modules loaded from $LIBDIR"; 3709 warn "removing commands";
3070 while (my ($k, $v) = each %INC) { 3710 %COMMAND = ();
3071 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3072 3711
3712 warn "removing ext/exti commands";
3713 %EXTCMD = ();
3714 %EXTICMD = ();
3715
3716 warn "unloading/nuking all extensions";
3717 for my $pkg (@EXTS) {
3073 warn "... unloading $k"; 3718 warn "... unloading $pkg";
3074 delete $INC{$k};
3075 3719
3076 $k =~ s/\.pm$//;
3077 $k =~ s/\//::/g;
3078
3079 if (my $cb = $k->can ("unload_module")) { 3720 if (my $cb = $pkg->can ("unload")) {
3721 eval {
3080 $cb->(); 3722 $cb->($pkg);
3723 1
3724 } or warn "$pkg unloaded, but with errors: $@";
3725 }
3726
3727 warn "... clearing $pkg";
3728 clear_package $pkg;
3081 } 3729 }
3082 3730
3083 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;
3084 } 3746 }
3085 3747
3086 warn "getting rid of safe::, as good as possible"; 3748 warn "getting rid of safe::, as good as possible";
3087 Symbol::delete_package "safe::$_" 3749 clear_package "safe::$_"
3088 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);
3089 3751
3090 warn "unloading cf.pm \"a bit\""; 3752 warn "unloading cf.pm \"a bit\"";
3091 delete $INC{"cf.pm"}; 3753 delete $INC{"cf.pm"};
3092 delete $INC{"cf/pod.pm"}; 3754 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3093 3755
3094 # don't, removes xs symbols, too, 3756 # don't, removes xs symbols, too,
3095 # and global variables created in xs 3757 # and global variables created in xs
3096 #Symbol::delete_package __PACKAGE__; 3758 #clear_package __PACKAGE__;
3097 3759
3098 warn "unload completed, starting to reload now"; 3760 warn "unload completed, starting to reload now";
3099 3761
3100 warn "reloading cf.pm"; 3762 warn "reloading cf.pm";
3101 require cf; 3763 require cf;
3102 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3764 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3103 3765
3104 warn "loading config and database again"; 3766 warn "loading config and database again";
3105 cf::cfg_load; 3767 cf::reload_config;
3106 3768
3107 warn "loading extensions"; 3769 warn "loading extensions";
3108 cf::load_extensions; 3770 cf::load_extensions;
3109 3771
3772 if ($REATTACH_ON_RELOAD) {
3110 warn "reattaching attachments to objects/players"; 3773 warn "reattaching attachments to objects/players";
3111 _global_reattach; # objects, sockets 3774 _global_reattach; # objects, sockets
3112 warn "reattaching attachments to maps"; 3775 warn "reattaching attachments to maps";
3113 reattach $_ for values %MAP; 3776 reattach $_ for values %MAP;
3114 warn "reattaching attachments to players"; 3777 warn "reattaching attachments to players";
3115 reattach $_ for values %PLAYER; 3778 reattach $_ for values %PLAYER;
3779 }
3116 3780
3781 warn "running post_init jobs";
3782 (pop @POST_INIT)->(1) while @POST_INIT;
3783
3117 warn "leaving sync_job"; 3784 warn "leaving sync_job";
3118 3785
3119 1 3786 1
3120 } or do { 3787 } or do {
3121 warn $@; 3788 warn $@;
3122 warn "error while reloading, exiting."; 3789 cf::cleanup "error while reloading, exiting.";
3123 exit 1;
3124 }; 3790 };
3125 3791
3126 warn "reloaded"; 3792 warn "reloaded";
3793 --$RELOAD;
3794 }
3795
3796 $t1 = EV::time - $t1;
3797 warn "reload completed in ${t1}s\n";
3127}; 3798};
3128 3799
3129our $RELOAD_WATCHER; # used only during reload 3800our $RELOAD_WATCHER; # used only during reload
3130 3801
3131sub reload_perl() { 3802sub reload_perl() {
3132 # doing reload synchronously and two reloads happen back-to-back, 3803 # doing reload synchronously and two reloads happen back-to-back,
3133 # coro crashes during coro_state_free->destroy here. 3804 # coro crashes during coro_state_free->destroy here.
3134 3805
3135 $RELOAD_WATCHER ||= Event->timer ( 3806 $RELOAD_WATCHER ||= cf::async {
3136 reentrant => 0, 3807 Coro::AIO::aio_wait cache_extensions;
3137 after => 0, 3808
3138 data => WF_AUTOCANCEL, 3809 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3139 cb => sub {
3140 do_reload_perl; 3810 do_reload_perl;
3141 undef $RELOAD_WATCHER; 3811 undef $RELOAD_WATCHER;
3142 }, 3812 };
3143 ); 3813 };
3144} 3814}
3145 3815
3146register_command "reload" => sub { 3816register_command "reload" => sub {
3147 my ($who, $arg) = @_; 3817 my ($who, $arg) = @_;
3148 3818
3149 if ($who->flag (FLAG_WIZ)) { 3819 if ($who->flag (FLAG_WIZ)) {
3150 $who->message ("reloading server."); 3820 $who->message ("reloading server.");
3821 async {
3822 $Coro::current->{desc} = "perl_reload";
3151 async { reload_perl }; 3823 reload_perl;
3824 };
3152 } 3825 }
3153}; 3826};
3154 3827
3155unshift @INC, $LIBDIR; 3828unshift @INC, $LIBDIR;
3156 3829
… …
3158 3831
3159our @WAIT_FOR_TICK; 3832our @WAIT_FOR_TICK;
3160our @WAIT_FOR_TICK_BEGIN; 3833our @WAIT_FOR_TICK_BEGIN;
3161 3834
3162sub wait_for_tick { 3835sub wait_for_tick {
3163 return unless $TICK_WATCHER->is_active;
3164 return if $Coro::current == $Coro::main; 3836 return if tick_inhibit || $Coro::current == $Coro::main;
3165 3837
3166 my $signal = new Coro::Signal; 3838 my $signal = new Coro::Signal;
3167 push @WAIT_FOR_TICK, $signal; 3839 push @WAIT_FOR_TICK, $signal;
3168 $signal->wait; 3840 $signal->wait;
3169} 3841}
3170 3842
3171sub wait_for_tick_begin { 3843sub wait_for_tick_begin {
3172 return unless $TICK_WATCHER->is_active;
3173 return if $Coro::current == $Coro::main; 3844 return if tick_inhibit || $Coro::current == $Coro::main;
3174 3845
3175 my $signal = new Coro::Signal; 3846 my $signal = new Coro::Signal;
3176 push @WAIT_FOR_TICK_BEGIN, $signal; 3847 push @WAIT_FOR_TICK_BEGIN, $signal;
3177 $signal->wait; 3848 $signal->wait;
3178} 3849}
3179 3850
3180 my $min = 1e6;#d# 3851sub tick {
3181 my $avg = 10;
3182$TICK_WATCHER = Event->timer (
3183 reentrant => 0,
3184 parked => 1,
3185 prio => 0,
3186 at => $NEXT_TICK || $TICK,
3187 data => WF_AUTOCANCEL,
3188 cb => sub {
3189 if ($Coro::current != $Coro::main) { 3852 if ($Coro::current != $Coro::main) {
3190 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"
3191 unless ++$bug_warning > 10; 3854 unless ++$bug_warning > 10;
3192 return; 3855 return;
3193 } 3856 }
3194 3857
3195 $NOW = $tick_start = Event::time;
3196
3197 cf::server_tick; # one server iteration 3858 cf::server_tick; # one server iteration
3198 3859
3199 0 && sync_job {#d# 3860 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3200 for(1..10) { 3861 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3201 my $t = Event::time; 3862 Coro::async_pool {
3202 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3863 $Coro::current->{desc} = "runtime saver";
3203 or die; 3864 write_runtime_sync
3204 3865 or warn "ERROR: unable to write runtime file: $!";
3205 $map->width (50);
3206 $map->height (50);
3207 $map->alloc;
3208 $map->_load_objects ("/tmp/x.map", 1);
3209 my $t = Event::time - $t;
3210
3211 #next unless $t < 0.0013;#d#
3212 if ($t < $min) {
3213 $min = $t;
3214 }
3215 $avg = $avg * 0.99 + $t * 0.01;
3216 }
3217 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3218 exit 0;
3219 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3220 }; 3866 };
3867 }
3221 3868
3222 $RUNTIME += $TICK;
3223 $NEXT_TICK += $TICK;
3224
3225 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3226 $NEXT_RUNTIME_WRITE = $NOW + 10;
3227 Coro::async_pool {
3228 write_runtime
3229 or warn "ERROR: unable to write runtime file: $!";
3230 };
3231 }
3232
3233# my $AFTER = Event::time;
3234# warn $AFTER - $NOW;#d#
3235
3236 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3869 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3237 $sig->send; 3870 $sig->send;
3238 } 3871 }
3239 while (my $sig = shift @WAIT_FOR_TICK) { 3872 while (my $sig = shift @WAIT_FOR_TICK) {
3240 $sig->send; 3873 $sig->send;
3241 } 3874 }
3242 3875
3243 $NOW = Event::time; 3876 $LOAD = ($NOW - $TICK_START) / $TICK;
3244
3245 # if we are delayed by four ticks or more, skip them all
3246 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3247
3248 $TICK_WATCHER->at ($NEXT_TICK);
3249 $TICK_WATCHER->start;
3250
3251 $LOAD = ($NOW - $tick_start) / $TICK;
3252 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3877 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3253 3878
3254 _post_tick; 3879 if (0) {
3255 3880 if ($NEXT_TICK) {
3256 3881 my $jitter = $TICK_START - $NEXT_TICK;
3882 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3883 warn "jitter $JITTER\n";#d#
3884 }
3257 }, 3885 }
3258); 3886}
3259 3887
3260{ 3888{
3261 BDB::max_poll_time $TICK * 0.1; 3889 # configure BDB
3262 $BDB_POLL_WATCHER = Event->io ( 3890
3263 reentrant => 0,
3264 fd => BDB::poll_fileno,
3265 poll => 'r',
3266 prio => 0,
3267 data => WF_AUTOCANCEL,
3268 cb => \&BDB::poll_cb,
3269 );
3270 BDB::min_parallel 8; 3891 BDB::min_parallel 8;
3271 3892 BDB::max_poll_reqs $TICK * 0.1;
3272 BDB::set_sync_prepare { 3893 $AnyEvent::BDB::WATCHER->priority (1);
3273 my $status;
3274 my $current = $Coro::current;
3275 (
3276 sub {
3277 $status = $!;
3278 $current->ready; undef $current;
3279 },
3280 sub {
3281 Coro::schedule while defined $current;
3282 $! = $status;
3283 },
3284 )
3285 };
3286 3894
3287 unless ($DB_ENV) { 3895 unless ($DB_ENV) {
3288 $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);
3289 3902
3290 cf::sync_job { 3903 cf::sync_job {
3291 eval { 3904 eval {
3292 BDB::db_env_open 3905 BDB::db_env_open
3293 $DB_ENV, 3906 $DB_ENV,
… …
3295 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
3296 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3909 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3297 0666; 3910 0666;
3298 3911
3299 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3912 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3300
3301 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3302 $DB_ENV->set_lk_detect;
3303 }; 3913 };
3304 3914
3305 cf::cleanup "db_env_open(db): $@" if $@; 3915 cf::cleanup "db_env_open(db): $@" if $@;
3306 }; 3916 };
3307 } 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 };
3308} 3928}
3309 3929
3310{ 3930{
3931 # configure IO::AIO
3932
3311 IO::AIO::min_parallel 8; 3933 IO::AIO::min_parallel 8;
3312
3313 undef $Coro::AIO::WATCHER;
3314 IO::AIO::max_poll_time $TICK * 0.1; 3934 IO::AIO::max_poll_time $TICK * 0.1;
3315 $AIO_POLL_WATCHER = Event->io ( 3935 undef $AnyEvent::AIO::WATCHER;
3316 reentrant => 0,
3317 data => WF_AUTOCANCEL,
3318 fd => IO::AIO::poll_fileno,
3319 poll => 'r',
3320 prio => 6,
3321 cb => \&IO::AIO::poll_cb,
3322 );
3323} 3936}
3324 3937
3325my $_log_backtrace; 3938my $_log_backtrace;
3326 3939
3327sub _log_backtrace { 3940sub _log_backtrace {
… …
3330 $msg =~ s/\n//; 3943 $msg =~ s/\n//;
3331 3944
3332 # limit the # of concurrent backtraces 3945 # limit the # of concurrent backtraces
3333 if ($_log_backtrace < 2) { 3946 if ($_log_backtrace < 2) {
3334 ++$_log_backtrace; 3947 ++$_log_backtrace;
3948 my $perl_bt = Carp::longmess $msg;
3335 async { 3949 async {
3950 $Coro::current->{desc} = "abt $msg";
3951
3336 my @bt = fork_call { 3952 my @bt = fork_call {
3337 @addr = map { sprintf "%x", $_ } @addr; 3953 @addr = map { sprintf "%x", $_ } @addr;
3338 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3954 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3339 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 |"
3340 or die "addr2line: $!"; 3956 or die "addr2line: $!";
… …
3348 } 3964 }
3349 3965
3350 @funcs 3966 @funcs
3351 }; 3967 };
3352 3968
3353 LOG llevInfo, "[ABT] $msg\n"; 3969 LOG llevInfo, "[ABT] $perl_bt\n";
3970 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3354 LOG llevInfo, "[ABT] $_\n" for @bt; 3971 LOG llevInfo, "[ABT] $_\n" for @bt;
3355 --$_log_backtrace; 3972 --$_log_backtrace;
3356 }; 3973 };
3357 } else { 3974 } else {
3358 LOG llevInfo, "[ABT] $msg\n"; 3975 LOG llevInfo, "[ABT] $msg\n";
3359 LOG llevInfo, "[ABT] [suppressed]\n"; 3976 LOG llevInfo, "[ABT] [suppressed]\n";
3360 } 3977 }
3361} 3978}
3362 3979
3363# load additional modules 3980# load additional modules
3364use cf::pod; 3981require "cf/$_.pm" for @EXTRA_MODULES;
3365 3982
3366END { cf::emergency_save } 3983END { cf::emergency_save }
3367 3984
33681 39851
3369 3986

Diff Legend

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