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.138 by root, Fri Jan 5 17:07:17 2007 UTC vs.
Revision 1.160 by root, Wed Jan 10 22:54:06 2007 UTC

15use Coro::Timer; 15use Coro::Timer;
16use Coro::Signal; 16use Coro::Signal;
17use Coro::Semaphore; 17use Coro::Semaphore;
18use Coro::AIO; 18use Coro::AIO;
19 19
20use Data::Dumper;
20use Digest::MD5; 21use Digest::MD5;
21use Fcntl; 22use Fcntl;
22use IO::AIO 2.31 (); 23use IO::AIO 2.32 ();
23use YAML::Syck (); 24use YAML::Syck ();
24use Time::HiRes; 25use Time::HiRes;
25 26
26use Event; $Event::Eval = 1; # no idea why this is required, but it is 27use Event; $Event::Eval = 1; # no idea why this is required, but it is
27 28
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30
28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 31# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
29$YAML::Syck::ImplicitUnicode = 1; 32$YAML::Syck::ImplicitUnicode = 1;
30 33
31$Coro::main->prio (2); # run main coroutine ("the server") with very high priority 34$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
32
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34 35
35our %COMMAND = (); 36our %COMMAND = ();
36our %COMMAND_TIME = (); 37our %COMMAND_TIME = ();
38
39our @EXTS = (); # list of extension package names
37our %EXTCMD = (); 40our %EXTCMD = ();
41our %EXT_CORO = (); # coroutines bound to extensions
38 42
39our @EVENT; 43our @EVENT;
40our $LIBDIR = datadir . "/ext"; 44our $LIBDIR = datadir . "/ext";
41 45
42our $TICK = MAX_TIME * 1e-6; 46our $TICK = MAX_TIME * 1e-6;
47our %CFG; 51our %CFG;
48 52
49our $UPTIME; $UPTIME ||= time; 53our $UPTIME; $UPTIME ||= time;
50our $RUNTIME; 54our $RUNTIME;
51 55
56our %PLAYER; # all users
52our %MAP; # all maps 57our %MAP; # all maps
53our $LINK_MAP; # the special {link} map 58our $LINK_MAP; # the special {link} map
54our $RANDOM_MAPS = cf::localdir . "/random"; 59our $RANDOM_MAPS = cf::localdir . "/random";
55our %EXT_CORO; 60
61our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
62our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
56 63
57binmode STDOUT; 64binmode STDOUT;
58binmode STDERR; 65binmode STDERR;
59 66
60# read virtual server time, if available 67# read virtual server time, if available
105=item %cf::CFG 112=item %cf::CFG
106 113
107Configuration for the server, loaded from C</etc/crossfire/config>, or 114Configuration for the server, loaded from C</etc/crossfire/config>, or
108from wherever your confdir points to. 115from wherever your confdir points to.
109 116
117=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE
118
119These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK)
120or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick
121processing has been done. Call C<< ->wait >> on them to maximise the
122window of cpu time available, or simply to synchronise to the server tick.
123
110=back 124=back
111 125
112=cut 126=cut
113 127
114BEGIN { 128BEGIN {
117 utf8::encode $msg; 131 utf8::encode $msg;
118 132
119 $msg .= "\n" 133 $msg .= "\n"
120 unless $msg =~ /\n$/; 134 unless $msg =~ /\n$/;
121 135
122 LOG llevError, "cfperl: $msg"; 136 LOG llevError, $msg;
123 }; 137 };
124} 138}
125 139
126@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 140@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
127@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 141@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
145 159
146$Event::DIED = sub { 160$Event::DIED = sub {
147 warn "error in event callback: @_"; 161 warn "error in event callback: @_";
148}; 162};
149 163
150my %ext_pkg;
151my @exts;
152my @hook;
153
154=head2 UTILITY FUNCTIONS 164=head2 UTILITY FUNCTIONS
155 165
156=over 4 166=over 4
157 167
168=item dumpval $ref
169
158=cut 170=cut
171
172sub dumpval {
173 eval {
174 local $SIG{__DIE__};
175 my $d;
176 if (1) {
177 $d = new Data::Dumper([$_[0]], ["*var"]);
178 $d->Terse(1);
179 $d->Indent(2);
180 $d->Quotekeys(0);
181 $d->Useqq(1);
182 #$d->Bless(...);
183 $d->Seen($_[1]) if @_ > 1;
184 $d = $d->Dump();
185 }
186 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
187 $d
188 } || "[unable to dump $_[0]: '$@']";
189}
159 190
160use JSON::Syck (); # TODO# replace by JSON::PC once working 191use JSON::Syck (); # TODO# replace by JSON::PC once working
161 192
162=item $ref = cf::from_json $json 193=item $ref = cf::from_json $json
163 194
228 259
229 my $guard = Coro::guard { $TICK_WATCHER->start }; 260 my $guard = Coro::guard { $TICK_WATCHER->start };
230 $TICK_WATCHER->stop; 261 $TICK_WATCHER->stop;
231 $guard 262 $guard
232} 263}
264
265=item cf::async { BLOCK }
266
267Currently the same as Coro::async_pool, meaning you cannot use
268C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
269thing you are allowed to do is call C<prio> on it.
270
271=cut
272
273BEGIN { *async = \&Coro::async_pool }
233 274
234=item cf::sync_job { BLOCK } 275=item cf::sync_job { BLOCK }
235 276
236The design of crossfire+ requires that the main coro ($Coro::main) is 277The design of crossfire+ requires that the main coro ($Coro::main) is
237always able to handle events or runnable, as crossfire+ is only partly 278always able to handle events or runnable, as crossfire+ is only partly
256 my $freeze_guard = freeze_mainloop; 297 my $freeze_guard = freeze_mainloop;
257 298
258 my $busy = 1; 299 my $busy = 1;
259 my @res; 300 my @res;
260 301
261 (Coro::async_pool { 302 (async {
262 @res = eval { $job->() }; 303 @res = eval { $job->() };
263 warn $@ if $@; 304 warn $@ if $@;
264 undef $busy; 305 undef $busy;
265 })->prio (Coro::PRIO_MAX); 306 })->prio (Coro::PRIO_MAX);
266 307
267 while ($busy) { 308 while ($busy) {
268 Coro::cede_notself; 309 Coro::cede or Event::one_event;
269 Event::one_event unless Coro::nready;
270 } 310 }
271 311
272 wantarray ? @res : $res[0] 312 wantarray ? @res : $res[0]
273 } else { 313 } else {
274 # we are in another coroutine, how wonderful, everything just works 314 # we are in another coroutine, how wonderful, everything just works
275 315
276 $job->() 316 $job->()
277 } 317 }
278} 318}
279 319
280=item $coro = cf::coro { BLOCK } 320=item $coro = cf::async_ext { BLOCK }
281 321
282Creates (and readies) and returns a new coro. This coro is automcatially 322Like async, but this coro is automatically being canceled when the
283being canceled when the extension calling this is being unloaded. 323extension calling this is being unloaded.
284 324
285=cut 325=cut
286 326
287sub coro(&) { 327sub async_ext(&) {
288 my $cb = shift; 328 my $cb = shift;
289 329
290 my $coro = &Coro::async_pool ($cb); 330 my $coro = &Coro::async ($cb);
291 331
292 $coro->on_destroy (sub { 332 $coro->on_destroy (sub {
293 delete $EXT_CORO{$coro+0}; 333 delete $EXT_CORO{$coro+0};
294 }); 334 });
295 $EXT_CORO{$coro+0} = $coro; 335 $EXT_CORO{$coro+0} = $coro;
324=cut 364=cut
325 365
326############################################################################# 366#############################################################################
327 367
328package cf::path; 368package cf::path;
369
370use overload
371 '""' => \&as_string;
372
373# used to convert map paths into valid unix filenames by repalcing / by ∕
374our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
329 375
330sub new { 376sub new {
331 my ($class, $path, $base) = @_; 377 my ($class, $path, $base) = @_;
332 378
333 $path = $path->as_string if ref $path; 379 $path = $path->as_string if ref $path;
339 # ?random/... random maps 385 # ?random/... random maps
340 # /! non-realised random map exit 386 # /! non-realised random map exit
341 # /... normal maps 387 # /... normal maps
342 # ~/... per-player maps without a specific player (DO NOT USE) 388 # ~/... per-player maps without a specific player (DO NOT USE)
343 # ~user/... per-player map of a specific user 389 # ~user/... per-player map of a specific user
390
391 $path =~ s/$PATH_SEP/\//go;
344 392
345 if ($path =~ /^{/) { 393 if ($path =~ /^{/) {
346 # fine as it is 394 # fine as it is
347 } elsif ($path =~ s{^\?random/}{}) { 395 } elsif ($path =~ s{^\?random/}{}) {
348 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data; 396 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
397# } 445# }
398} 446}
399 447
400# escape the /'s in the path 448# escape the /'s in the path
401sub _escaped_path { 449sub _escaped_path {
402 # ∕ is U+2215
403 (my $path = $_[0]{path}) =~ s/\///g; 450 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
404 $path 451 $path
405} 452}
406 453
407# the original (read-only) location 454# the original (read-only) location
408sub load_path { 455sub load_path {
896=cut 943=cut
897 944
898sub register_extcmd { 945sub register_extcmd {
899 my ($name, $cb) = @_; 946 my ($name, $cb) = @_;
900 947
901 my $caller = caller;
902 #warn "registering extcmd '$name' to '$caller'";
903
904 $EXTCMD{$name} = [$cb, $caller]; 948 $EXTCMD{$name} = $cb;
905} 949}
906 950
907cf::player->attach ( 951cf::player->attach (
908 on_command => sub { 952 on_command => sub {
909 my ($pl, $name, $params) = @_; 953 my ($pl, $name, $params) = @_;
922 966
923 my $msg = eval { from_json $buf }; 967 my $msg = eval { from_json $buf };
924 968
925 if (ref $msg) { 969 if (ref $msg) {
926 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 970 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
927 if (my %reply = $cb->[0]->($pl, $msg)) { 971 if (my %reply = $cb->($pl, $msg)) {
928 $pl->ext_reply ($msg->{msgid}, %reply); 972 $pl->ext_reply ($msg->{msgid}, %reply);
929 } 973 }
930 } 974 }
931 } else { 975 } else {
932 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 976 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
934 978
935 cf::override; 979 cf::override;
936 }, 980 },
937); 981);
938 982
939sub register {
940 my ($base, $pkg) = @_;
941
942 #TODO
943}
944
945sub load_extension { 983sub load_extension {
946 my ($path) = @_; 984 my ($path) = @_;
947 985
948 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 986 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
949 my $base = $1; 987 my $base = $1;
950 my $pkg = $1; 988 my $pkg = $1;
951 $pkg =~ s/[^[:word:]]/_/g; 989 $pkg =~ s/[^[:word:]]/_/g;
952 $pkg = "ext::$pkg"; 990 $pkg = "ext::$pkg";
953 991
954 warn "loading '$path' into '$pkg'\n"; 992 warn "... loading '$path' into '$pkg'\n";
955 993
956 open my $fh, "<:utf8", $path 994 open my $fh, "<:utf8", $path
957 or die "$path: $!"; 995 or die "$path: $!";
958 996
959 my $source = 997 my $source =
964 1002
965 eval $source 1003 eval $source
966 or die $@ ? "$path: $@\n" 1004 or die $@ ? "$path: $@\n"
967 : "extension disabled.\n"; 1005 : "extension disabled.\n";
968 1006
969 push @exts, $pkg; 1007 push @EXTS, $pkg;
970 $ext_pkg{$base} = $pkg;
971
972# no strict 'refs';
973# @{"$pkg\::ISA"} = ext::;
974
975 register $base, $pkg;
976}
977
978sub unload_extension {
979 my ($pkg) = @_;
980
981 warn "removing extension $pkg\n";
982
983 # remove hooks
984 #TODO
985# for my $idx (0 .. $#PLUGIN_EVENT) {
986# delete $hook[$idx]{$pkg};
987# }
988
989 # remove commands
990 for my $name (keys %COMMAND) {
991 my @cb = grep $_->[0] ne $pkg, @{ $COMMAND{$name} };
992
993 if (@cb) {
994 $COMMAND{$name} = \@cb;
995 } else {
996 delete $COMMAND{$name};
997 }
998 }
999
1000 # remove extcmds
1001 for my $name (grep $EXTCMD{$_}[1] eq $pkg, keys %EXTCMD) {
1002 delete $EXTCMD{$name};
1003 }
1004
1005 if (my $cb = $pkg->can ("unload")) {
1006 eval {
1007 $cb->($pkg);
1008 1
1009 } or warn "$pkg unloaded, but with errors: $@";
1010 }
1011
1012 Symbol::delete_package $pkg;
1013} 1008}
1014 1009
1015sub load_extensions { 1010sub load_extensions {
1016 for my $ext (<$LIBDIR/*.ext>) { 1011 for my $ext (<$LIBDIR/*.ext>) {
1017 next unless -r $ext; 1012 next unless -r $ext;
1035}; 1030};
1036 1031
1037cf::map->attach (prio => -10000, package => cf::mapsupport::); 1032cf::map->attach (prio => -10000, package => cf::mapsupport::);
1038 1033
1039############################################################################# 1034#############################################################################
1040# load/save perl data associated with player->ob objects
1041
1042sub all_objects(@) {
1043 @_, map all_objects ($_->inv), @_
1044}
1045
1046# TODO: compatibility cruft, remove when no longer needed
1047cf::player->attach (
1048 on_load => sub {
1049 my ($pl, $path) = @_;
1050
1051 for my $o (all_objects $pl->ob) {
1052 if (my $value = $o->get_ob_key_value ("_perl_data")) {
1053 $o->set_ob_key_value ("_perl_data");
1054
1055 %$o = %{ Storable::thaw pack "H*", $value };
1056 }
1057 }
1058 },
1059);
1060
1061#############################################################################
1062 1035
1063=head2 CORE EXTENSIONS 1036=head2 CORE EXTENSIONS
1064 1037
1065Functions and methods that extend core crossfire objects. 1038Functions and methods that extend core crossfire objects.
1066 1039
1040=cut
1041
1042package cf::player;
1043
1044use Coro::AIO;
1045
1067=head3 cf::player 1046=head3 cf::player
1068 1047
1069=over 4 1048=over 4
1070 1049
1071=item cf::player::exists $login 1050=item cf::player::find $login
1072 1051
1073Returns true when the given account exists. 1052Returns the given player object, loading it if necessary (might block).
1074 1053
1075=cut 1054=cut
1076 1055
1077sub cf::player::exists($) { 1056sub playerdir($) {
1078 cf::player::find $_[0] 1057 cf::localdir
1079 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2; 1058 . "/"
1059 . cf::playerdir
1060 . "/"
1061 . (ref $_[0] ? $_[0]->ob->name : $_[0])
1062}
1063
1064sub path($) {
1065 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
1066
1067 (playerdir $login) . "/$login.pl"
1068}
1069
1070sub find_active($) {
1071 $cf::PLAYER{$_[0]}
1072 and $cf::PLAYER{$_[0]}->active
1073 and $cf::PLAYER{$_[0]}
1074}
1075
1076sub exists($) {
1077 my ($login) = @_;
1078
1079 $cf::PLAYER{$login}
1080 or cf::sync_job { !aio_stat $login }
1081}
1082
1083sub find($) {
1084 return $cf::PLAYER{$_[0]} || do {
1085 my $login = $_[0];
1086
1087 my $guard = cf::lock_acquire "user_find:$login";
1088
1089 $cf::PLAYER{$_[0]} || do {
1090 my $pl = load_pl path $login
1091 or return;
1092 $cf::PLAYER{$login} = $pl
1093 }
1094 }
1095}
1096
1097sub save($) {
1098 my ($pl) = @_;
1099
1100 return if $pl->{deny_save};
1101
1102 my $path = path $pl;
1103 my $guard = cf::lock_acquire "user_save:$path";
1104
1105 return if $pl->{deny_save};
1106
1107 aio_mkdir playerdir $pl, 0770;
1108 $pl->{last_save} = $cf::RUNTIME;
1109
1110 $pl->save_pl ($path);
1111 Coro::cede;
1112}
1113
1114sub new($) {
1115 my ($login) = @_;
1116
1117 my $self = create;
1118
1119 $self->ob->name ($login);
1120 $self->{deny_save} = 1;
1121
1122 $cf::PLAYER{$login} = $self;
1123
1124 $self
1125}
1126
1127=item $pl->quit_character
1128
1129Nukes the player without looking back. If logged in, the connection will
1130be destroyed. May block for a long time.
1131
1132=cut
1133
1134sub quit_character {
1135 my ($pl) = @_;
1136
1137 $pl->{deny_save} = 1;
1138 $pl->password ("*"); # this should lock out the player until we nuked the dir
1139
1140 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1141 $pl->deactivate;
1142 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1143 $pl->ns->destroy if $pl->ns;
1144
1145 my $path = playerdir $pl;
1146 my $temp = "$path~$cf::RUNTIME~deleting~";
1147 aio_rename $path, $temp;
1148 delete $cf::PLAYER{$pl->ob->name};
1149 $pl->destroy;
1150 IO::AIO::aio_rmtree $temp;
1151}
1152
1153=item cf::player::list_logins
1154
1155Returns am arrayref of all valid playernames in the system, can take a
1156while and may block, so not sync_job-capable, ever.
1157
1158=cut
1159
1160sub list_logins {
1161 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir
1162 or return [];
1163
1164 my @logins;
1165
1166 for my $login (@$dirs) {
1167 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;
1168 aio_read $fh, 0, 512, my $buf, 0 or next;
1169 $buf !~ /^password -------------$/m or next; # official not-valid tag
1170
1171 utf8::decode $login;
1172 push @logins, $login;
1173 }
1174
1175 \@logins
1176}
1177
1178=item $player->maps
1179
1180Returns an arrayref of cf::path's of all maps that are private for this
1181player. May block.
1182
1183=cut
1184
1185sub maps($) {
1186 my ($pl) = @_;
1187
1188 my $files = aio_readdir playerdir $pl
1189 or return;
1190
1191 my @paths;
1192
1193 for (@$files) {
1194 utf8::decode $_;
1195 next if /\.(?:pl|pst)$/;
1196 next unless /^$PATH_SEP/o;
1197
1198 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_;
1199 }
1200
1201 \@paths
1080} 1202}
1081 1203
1082=item $player->ext_reply ($msgid, $msgtype, %msg) 1204=item $player->ext_reply ($msgid, $msgtype, %msg)
1083 1205
1084Sends an ext reply to the player. 1206Sends an ext reply to the player.
1085 1207
1086=cut 1208=cut
1087 1209
1088sub cf::player::ext_reply($$$%) { 1210sub ext_reply($$$%) {
1089 my ($self, $id, %msg) = @_; 1211 my ($self, $id, %msg) = @_;
1090 1212
1091 $msg{msgid} = $id; 1213 $msg{msgid} = $id;
1092 1214
1093 $self->send ("ext " . to_json \%msg); 1215 $self->send ("ext " . cf::to_json \%msg);
1094} 1216}
1217
1218package cf;
1095 1219
1096=back 1220=back
1097 1221
1098 1222
1099=head3 cf::map 1223=head3 cf::map
1265 Coro::cede; 1389 Coro::cede;
1266 1390
1267 $self->in_memory (cf::MAP_IN_MEMORY); 1391 $self->in_memory (cf::MAP_IN_MEMORY);
1268} 1392}
1269 1393
1394# find and load all maps in the 3x3 area around a map
1395sub load_diag {
1396 my ($map) = @_;
1397
1398 my @diag; # diagonal neighbours
1399
1400 for (0 .. 3) {
1401 my $neigh = $map->tile_path ($_)
1402 or next;
1403 $neigh = find $neigh, $map
1404 or next;
1405 $neigh->load;
1406
1407 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],
1408 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1409 }
1410
1411 for (@diag) {
1412 my $neigh = find @$_
1413 or next;
1414 $neigh->load;
1415 }
1416}
1417
1270sub find_sync { 1418sub find_sync {
1271 my ($path, $origin) = @_; 1419 my ($path, $origin) = @_;
1272 1420
1273 cf::sync_job { cf::map::find $path, $origin } 1421 cf::sync_job { find $path, $origin }
1274} 1422}
1275 1423
1276sub do_load_sync { 1424sub do_load_sync {
1277 my ($map) = @_; 1425 my ($map) = @_;
1278 1426
1279 cf::sync_job { $map->load }; 1427 cf::sync_job { $map->load };
1280} 1428}
1281 1429
1430our %MAP_PREFETCH;
1431our $MAP_PREFETCHER = Coro::async {
1432 while () {
1433 while (%MAP_PREFETCH) {
1434 my $key = each %MAP_PREFETCH
1435 or next;
1436 my $path = delete $MAP_PREFETCH{$key};
1437
1438 my $map = find $path
1439 or next;
1440 $map->load;
1441 }
1442 Coro::schedule;
1443 }
1444};
1445
1446sub find_async {
1447 my ($path, $origin) = @_;
1448
1449 $path = new cf::path $path, $origin && $origin->path;
1450 my $key = $path->as_string;
1451
1452 if (my $map = $cf::MAP{$key}) {
1453 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1454 }
1455
1456 $MAP_PREFETCH{$key} = $path;
1457 $MAP_PREFETCHER->ready;
1458
1459 ()
1460}
1461
1282sub save { 1462sub save {
1283 my ($self) = @_; 1463 my ($self) = @_;
1284 1464
1285 my $lock = cf::lock_acquire "map_data:" . $self->path; 1465 my $lock = cf::lock_acquire "map_data:" . $self->path;
1286 1466
1294 $self->{load_path} = $save; 1474 $self->{load_path} = $save;
1295 1475
1296 return if $self->{deny_save}; 1476 return if $self->{deny_save};
1297 1477
1298 local $self->{last_access} = $self->last_access;#d# 1478 local $self->{last_access} = $self->last_access;#d#
1479
1480 cf::async {
1481 $_->contr->save for $self->players;
1482 };
1299 1483
1300 if ($uniq) { 1484 if ($uniq) {
1301 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1485 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1302 $self->save_objects ($uniq, cf::IO_UNIQUES); 1486 $self->save_objects ($uniq, cf::IO_UNIQUES);
1303 } else { 1487 } else {
1398 } 1582 }
1399 1583
1400 $map 1584 $map
1401} 1585}
1402 1586
1403sub emergency_save { 1587=item cf::map::unique_maps
1404 my $freeze_guard = cf::freeze_mainloop;
1405 1588
1406 warn "enter emergency map save\n"; 1589Returns an arrayref of cf::path's of all shared maps that have
1590instantiated unique items. May block.
1407 1591
1408 cf::sync_job { 1592=cut
1409 warn "begin emergency map save\n"; 1593
1410 $_->save for values %cf::MAP; 1594sub unique_maps() {
1595 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir
1596 or return;
1597
1598 my @paths;
1599
1600 for (@$files) {
1601 utf8::decode $_;
1602 next if /\.pst$/;
1603 next unless /^$PATH_SEP/o;
1604
1605 push @paths, new cf::path $_;
1411 }; 1606 }
1412 1607
1413 warn "end emergency map save\n"; 1608 \@paths
1414} 1609}
1415 1610
1416package cf; 1611package cf;
1417 1612
1418=back 1613=back
1419 1614
1615=head3 cf::object
1616
1617=cut
1618
1619package cf::object;
1620
1621=over 4
1622
1623=item $ob->inv_recursive
1624
1625Returns the inventory of the object _and_ their inventories, recursively.
1626
1627=cut
1628
1629sub inv_recursive_;
1630sub inv_recursive_ {
1631 map { $_, inv_recursive_ $_->inv } @_
1632}
1633
1634sub inv_recursive {
1635 inv_recursive_ inv $_[0]
1636}
1637
1638package cf;
1639
1640=back
1420 1641
1421=head3 cf::object::player 1642=head3 cf::object::player
1422 1643
1423=over 4 1644=over 4
1424 1645
1516 # use -1 or undef as default coordinates, not 0, 0 1737 # use -1 or undef as default coordinates, not 0, 0
1517 ($x, $y) = ($map->enter_x, $map->enter_y) 1738 ($x, $y) = ($map->enter_x, $map->enter_y)
1518 if $x <=0 && $y <= 0; 1739 if $x <=0 && $y <= 0;
1519 1740
1520 $map->load; 1741 $map->load;
1742 $map->load_diag;
1521 1743
1744 return unless $self->contr->active;
1522 $self->activate_recursive; 1745 $self->activate_recursive;
1523 $self->enter_map ($map, $x, $y); 1746 $self->enter_map ($map, $x, $y);
1524} 1747}
1525 1748
1526cf::player->attach ( 1749cf::player->attach (
1539 1762
1540 # try to abort aborted map switching on player login :) 1763 # try to abort aborted map switching on player login :)
1541 # should happen only on crashes 1764 # should happen only on crashes
1542 if ($pl->ob->{_link_pos}) { 1765 if ($pl->ob->{_link_pos}) {
1543 $pl->ob->enter_link; 1766 $pl->ob->enter_link;
1544 Coro::async_pool { 1767 (async {
1545 # we need this sleep as the login has a concurrent enter_exit running 1768 # we need this sleep as the login has a concurrent enter_exit running
1546 # and this sleep increases chances of the player not ending up in scorn 1769 # and this sleep increases chances of the player not ending up in scorn
1770 $pl->ob->reply (undef,
1771 "There was an internal problem at your last logout, "
1772 . "the server will try to bring you to your intended destination in a second.",
1773 cf::NDI_RED);
1547 Coro::Timer::sleep 1; 1774 Coro::Timer::sleep 1;
1548 $pl->ob->leave_link; 1775 $pl->ob->leave_link;
1549 }; 1776 })->prio (2);
1550 } 1777 }
1551 }, 1778 },
1552); 1779);
1553 1780
1554=item $player_object->goto ($path, $x, $y) 1781=item $player_object->goto ($path, $x, $y)
1556=cut 1783=cut
1557 1784
1558sub cf::object::player::goto { 1785sub cf::object::player::goto {
1559 my ($self, $path, $x, $y) = @_; 1786 my ($self, $path, $x, $y) = @_;
1560 1787
1788 $path = new cf::path $path;
1789
1561 $self->enter_link; 1790 $self->enter_link;
1562 1791
1563 (Coro::async_pool { 1792 (async {
1564 $path = new cf::path $path;
1565
1566 my $map = cf::map::find $path->as_string; 1793 my $map = cf::map::find $path->as_string;
1567 $map = $map->customise_for ($self) if $map; 1794 $map = $map->customise_for ($self) if $map;
1568 1795
1569# warn "entering ", $map->path, " at ($x, $y)\n" 1796# warn "entering ", $map->path, " at ($x, $y)\n"
1570# if $map; 1797# if $map;
1571 1798
1572 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1799 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1573 1800
1574 $self->leave_link ($map, $x, $y); 1801 $self->leave_link ($map, $x, $y);
1575 })->prio (1); 1802 })->prio (1);
1576} 1803}
1577 1804
1630 1857
1631 return unless $self->type == cf::PLAYER; 1858 return unless $self->type == cf::PLAYER;
1632 1859
1633 $self->enter_link; 1860 $self->enter_link;
1634 1861
1635 (Coro::async_pool { 1862 (async {
1636 $self->deactivate_recursive; # just to be sure 1863 $self->deactivate_recursive; # just to be sure
1637 unless (eval { 1864 unless (eval {
1638 prepare_random_map $exit 1865 prepare_random_map $exit
1639 if $exit->slaying eq "/!"; 1866 if $exit->slaying eq "/!";
1640 1867
1643 1870
1644 1; 1871 1;
1645 }) { 1872 }) {
1646 $self->message ("Something went wrong deep within the crossfire server. " 1873 $self->message ("Something went wrong deep within the crossfire server. "
1647 . "I'll try to bring you back to the map you were before. " 1874 . "I'll try to bring you back to the map you were before. "
1648 . "Please report this to the dungeon master", 1875 . "Please report this to the dungeon master!",
1649 cf::NDI_UNIQUE | cf::NDI_RED); 1876 cf::NDI_UNIQUE | cf::NDI_RED);
1650 1877
1651 warn "ERROR in enter_exit: $@"; 1878 warn "ERROR in enter_exit: $@";
1652 $self->leave_link; 1879 $self->leave_link;
1653 } 1880 }
1721 } 1948 }
1722 } 1949 }
1723 }, 1950 },
1724); 1951);
1725 1952
1726=item $client->coro (\&cb) 1953=item $client->async (\&cb)
1727 1954
1728Create a new coroutine, running the specified callback. The coroutine will 1955Create a new coroutine, running the specified callback. The coroutine will
1729be automatically cancelled when the client gets destroyed (e.g. on logout, 1956be automatically cancelled when the client gets destroyed (e.g. on logout,
1730or loss of connection). 1957or loss of connection).
1731 1958
1732=cut 1959=cut
1733 1960
1734sub cf::client::coro { 1961sub cf::client::async {
1735 my ($self, $cb) = @_; 1962 my ($self, $cb) = @_;
1736 1963
1737 my $coro = &Coro::async_pool ($cb); 1964 my $coro = &Coro::async ($cb);
1738 1965
1739 $coro->on_destroy (sub { 1966 $coro->on_destroy (sub {
1740 delete $self->{_coro}{$coro+0}; 1967 delete $self->{_coro}{$coro+0};
1741 }); 1968 });
1742 1969
1980 local $/; 2207 local $/;
1981 *CFG = YAML::Syck::Load <$fh>; 2208 *CFG = YAML::Syck::Load <$fh>;
1982 2209
1983 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 2210 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
1984 2211
2212 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2213 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2214
1985 if (exists $CFG{mlockall}) { 2215 if (exists $CFG{mlockall}) {
1986 eval { 2216 eval {
1987 $CFG{mlockall} ? &mlockall : &munlockall 2217 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
1988 and die "WARNING: m(un)lockall failed: $!\n"; 2218 and die "WARNING: m(un)lockall failed: $!\n";
1989 }; 2219 };
1990 warn $@ if $@; 2220 warn $@ if $@;
1991 } 2221 }
1992} 2222}
1993 2223
1994sub main { 2224sub main {
1995 # we must not ever block the main coroutine 2225 # we must not ever block the main coroutine
1996 local $Coro::idle = sub { 2226 local $Coro::idle = sub {
1997 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2227 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1998 (Coro::unblock_sub {
1999 Event::one_event; 2228 async { Event::one_event };
2000 })->();
2001 }; 2229 };
2002 2230
2003 cfg_load; 2231 cfg_load;
2004 db_load; 2232 db_load;
2005 load_extensions; 2233 load_extensions;
2006 Event::loop; 2234 Event::loop;
2007} 2235}
2008 2236
2009############################################################################# 2237#############################################################################
2010# initialisation 2238# initialisation and cleanup
2239
2240# install some emergency cleanup handlers
2241BEGIN {
2242 for my $signal (qw(INT HUP TERM)) {
2243 Event->signal (
2244 data => WF_AUTOCANCEL,
2245 signal => $signal,
2246 cb => sub {
2247 cf::cleanup "SIG$signal";
2248 },
2249 );
2250 }
2251}
2252
2253sub emergency_save() {
2254 my $freeze_guard = cf::freeze_mainloop;
2255
2256 warn "enter emergency perl save\n";
2257
2258 cf::sync_job {
2259 # use a peculiar iteration method to avoid tripping on perl
2260 # refcount bugs in for. also avoids problems with players
2261 # and maps saved/Destroyed asynchronously.
2262 warn "begin emergency player save\n";
2263 for my $login (keys %cf::PLAYER) {
2264 my $pl = $cf::PLAYER{$login} or next;
2265 $pl->valid or next;
2266 $pl->save;
2267 }
2268 warn "end emergency player save\n";
2269
2270 warn "begin emergency map save\n";
2271 for my $path (keys %cf::MAP) {
2272 my $map = $cf::MAP{$path} or next;
2273 $map->valid or next;
2274 $map->save;
2275 }
2276 warn "end emergency map save\n";
2277 };
2278
2279 warn "leave emergency perl save\n";
2280}
2011 2281
2012sub reload() { 2282sub reload() {
2013 # can/must only be called in main 2283 # can/must only be called in main
2014 if ($Coro::current != $Coro::main) { 2284 if ($Coro::current != $Coro::main) {
2015 warn "can only reload from main coroutine\n"; 2285 warn "can only reload from main coroutine\n";
2016 return; 2286 return;
2017 } 2287 }
2018 2288
2019 warn "reloading..."; 2289 warn "reloading...";
2020 2290
2291 warn "freezing server";
2021 my $guard = freeze_mainloop; 2292 my $guard = freeze_mainloop;
2022 cf::emergency_save; 2293 cf::emergency_save;
2023 2294
2295 warn "sync database to disk";
2296 cf::db_sync;
2297 IO::AIO::flush;
2298
2024 eval { 2299 eval {
2025 # if anything goes wrong in here, we should simply crash as we already saved 2300 # if anything goes wrong in here, we should simply crash as we already saved
2026 2301
2027 # cancel all watchers 2302 warn "cancel all watchers";
2028 for (Event::all_watchers) { 2303 for (Event::all_watchers) {
2029 $_->cancel if $_->data & WF_AUTOCANCEL; 2304 $_->cancel if $_->data & WF_AUTOCANCEL;
2030 } 2305 }
2031 2306
2032 # cancel all extension coros 2307 warn "cancel all extension coros";
2033 $_->cancel for values %EXT_CORO; 2308 $_->cancel for values %EXT_CORO;
2034 %EXT_CORO = (); 2309 %EXT_CORO = ();
2035 2310
2311 warn "remove commands";
2312 %COMMAND = ();
2313
2314 warn "remove ext commands";
2315 %EXTCMD = ();
2316
2036 # unload all extensions 2317 warn "unload/nuke all extensions";
2037 for (@exts) { 2318 for my $pkg (@EXTS) {
2038 warn "unloading <$_>"; 2319 warn "... unloading $pkg";
2039 unload_extension $_; 2320
2321 if (my $cb = $pkg->can ("unload")) {
2322 eval {
2323 $cb->($pkg);
2324 1
2325 } or warn "$pkg unloaded, but with errors: $@";
2040 } 2326 }
2041 2327
2328 warn "... nuking $pkg";
2329 Symbol::delete_package $pkg;
2330 }
2331
2042 # unload all modules loaded from $LIBDIR 2332 warn "unload all perl modules loaded from $LIBDIR";
2043 while (my ($k, $v) = each %INC) { 2333 while (my ($k, $v) = each %INC) {
2044 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2334 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2045 2335
2046 warn "removing <$k>"; 2336 warn "removing <$k>";
2047 delete $INC{$k}; 2337 delete $INC{$k};
2054 } 2344 }
2055 2345
2056 Symbol::delete_package $k; 2346 Symbol::delete_package $k;
2057 } 2347 }
2058 2348
2059 # sync database to disk
2060 cf::db_sync;
2061 IO::AIO::flush;
2062
2063 # get rid of safe::, as good as possible 2349 warn "get rid of safe::, as good as possible";
2064 Symbol::delete_package "safe::$_" 2350 Symbol::delete_package "safe::$_"
2065 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2351 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2066 2352
2067 # remove register_script_function callbacks
2068 # TODO
2069
2070 # unload cf.pm "a bit" 2353 warn "unload cf.pm \"a bit\"";
2071 delete $INC{"cf.pm"}; 2354 delete $INC{"cf.pm"};
2072 2355
2073 # don't, removes xs symbols, too, 2356 # don't, removes xs symbols, too,
2074 # and global variables created in xs 2357 # and global variables created in xs
2075 #Symbol::delete_package __PACKAGE__; 2358 #Symbol::delete_package __PACKAGE__;
2076 2359
2077 # reload cf.pm
2078 warn "reloading cf.pm"; 2360 warn "reloading cf.pm";
2079 require cf; 2361 require cf;
2080 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2362 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2081 2363
2082 # load config and database again 2364 warn "load config and database again";
2083 cf::cfg_load; 2365 cf::cfg_load;
2084 cf::db_load; 2366 cf::db_load;
2085 2367
2086 # load extensions
2087 warn "load extensions"; 2368 warn "load extensions";
2088 cf::load_extensions; 2369 cf::load_extensions;
2089 2370
2090 # reattach attachments to objects 2371 warn "reattach attachments to objects/players";
2091 warn "reattach";
2092 _global_reattach; 2372 _global_reattach;
2373 warn "reattach attachments to maps";
2374 reattach $_ for values %MAP;
2093 }; 2375 };
2094 2376
2095 if ($@) { 2377 if ($@) {
2096 warn $@; 2378 warn $@;
2097 warn "error while reloading, exiting."; 2379 warn "error while reloading, exiting.";
2098 exit 1; 2380 exit 1;
2099 } 2381 }
2100 2382
2101 warn "reloaded successfully"; 2383 warn "reloaded";
2102}; 2384};
2103 2385
2104############################################################################# 2386#############################################################################
2105 2387
2106unless ($LINK_MAP) { 2388unless ($LINK_MAP) {
2113 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2395 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2114 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2396 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2115 2397
2116 # dirty hack because... archetypes are not yet loaded 2398 # dirty hack because... archetypes are not yet loaded
2117 Event->timer ( 2399 Event->timer (
2118 after => 2, 2400 after => 10,
2119 cb => sub { 2401 cb => sub {
2120 $_[0]->w->cancel; 2402 $_[0]->w->cancel;
2121 2403
2122 # provide some exits "home" 2404 # provide some exits "home"
2123 my $exit = cf::object::new "exit"; 2405 my $exit = cf::object::new "exit";
2141 $LINK_MAP->{deny_save} = 1; 2423 $LINK_MAP->{deny_save} = 1;
2142 $LINK_MAP->{deny_reset} = 1; 2424 $LINK_MAP->{deny_reset} = 1;
2143 2425
2144 $cf::MAP{$LINK_MAP->path} = $LINK_MAP; 2426 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2145} 2427}
2146
2147register "<global>", __PACKAGE__;
2148 2428
2149register_command "reload" => sub { 2429register_command "reload" => sub {
2150 my ($who, $arg) = @_; 2430 my ($who, $arg) = @_;
2151 2431
2152 if ($who->flag (FLAG_WIZ)) { 2432 if ($who->flag (FLAG_WIZ)) {
2165 data => WF_AUTOCANCEL, 2445 data => WF_AUTOCANCEL,
2166 cb => sub { 2446 cb => sub {
2167 cf::server_tick; # one server iteration 2447 cf::server_tick; # one server iteration
2168 $RUNTIME += $TICK; 2448 $RUNTIME += $TICK;
2169 $NEXT_TICK += $TICK; 2449 $NEXT_TICK += $TICK;
2450
2451 $WAIT_FOR_TICK->broadcast;
2452 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2170 2453
2171 # if we are delayed by four ticks or more, skip them all 2454 # if we are delayed by four ticks or more, skip them all
2172 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2455 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2173 2456
2174 $TICK_WATCHER->at ($NEXT_TICK); 2457 $TICK_WATCHER->at ($NEXT_TICK);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines