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.119 by root, Tue Jan 2 08:26:42 2007 UTC vs.
Revision 1.144 by root, Sun Jan 7 18:01:10 2007 UTC

… …
8use Storable; 8use Storable;
9use Opcode; 9use Opcode;
10use Safe; 10use Safe;
11use Safe::Hole; 11use Safe::Hole;
12 12
13use Coro 3.3; 13use Coro 3.3 ();
14use Coro::Event; 14use Coro::Event;
15use Coro::Timer; 15use Coro::Timer;
16use Coro::Signal; 16use Coro::Signal;
17use Coro::Semaphore; 17use Coro::Semaphore;
18use Coro::AIO; 18use Coro::AIO;
… …
26use Event; $Event::Eval = 1; # no idea why this is required, but it is 26use Event; $Event::Eval = 1; # no idea why this is required, but it is
27 27
28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
29$YAML::Syck::ImplicitUnicode = 1; 29$YAML::Syck::ImplicitUnicode = 1;
30 30
31$Coro::main->prio (2); # run main coroutine ("the server") with very high priority 31$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
32 32
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34 34
35our %COMMAND = (); 35our %COMMAND = ();
36our %COMMAND_TIME = (); 36our %COMMAND_TIME = ();
… …
47our %CFG; 47our %CFG;
48 48
49our $UPTIME; $UPTIME ||= time; 49our $UPTIME; $UPTIME ||= time;
50our $RUNTIME; 50our $RUNTIME;
51 51
52our %PLAYER; # all users
52our %MAP; # all maps 53our %MAP; # all maps
53our $LINK_MAP; # the special {link} map 54our $LINK_MAP; # the special {link} map
54our $FREEZE;
55our $RANDOM_MAPS = cf::localdir . "/random"; 55our $RANDOM_MAPS = cf::localdir . "/random";
56our %EXT_CORO; 56our %EXT_CORO; # coroutines bound to extensions
57 57
58binmode STDOUT; 58binmode STDOUT;
59binmode STDERR; 59binmode STDERR;
60 60
61# read virtual server time, if available 61# read virtual server time, if available
… …
71mkdir cf::localdir . "/" . cf::uniquedir; 71mkdir cf::localdir . "/" . cf::uniquedir;
72mkdir $RANDOM_MAPS; 72mkdir $RANDOM_MAPS;
73 73
74# a special map that is always available 74# a special map that is always available
75our $LINK_MAP; 75our $LINK_MAP;
76 76our $EMERGENCY_POSITION;
77our $EMERGENCY_POSITION = $cf::CFG{emergency_position} || ["/world/world_105_115", 5, 37];
78 77
79############################################################################# 78#############################################################################
80 79
81=head2 GLOBAL VARIABLES 80=head2 GLOBAL VARIABLES
82 81
… …
181sub to_json($) { 180sub to_json($) {
182 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 181 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
183 JSON::Syck::Dump $_[0] 182 JSON::Syck::Dump $_[0]
184} 183}
185 184
185=item cf::lock_wait $string
186
187Wait until the given lock is available. See cf::lock_acquire.
188
189=item my $lock = cf::lock_acquire $string
190
191Wait until the given lock is available and then acquires it and returns
192a Coro::guard object. If the guard object gets destroyed (goes out of scope,
193for example when the coroutine gets canceled), the lock is automatically
194returned.
195
196Lock names should begin with a unique identifier (for example, cf::map::find
197uses map_find and cf::map::load uses map_load).
198
199=cut
200
201our %LOCK;
202
203sub lock_wait($) {
204 my ($key) = @_;
205
206 # wait for lock, if any
207 while ($LOCK{$key}) {
208 push @{ $LOCK{$key} }, $Coro::current;
209 Coro::schedule;
210 }
211}
212
213sub lock_acquire($) {
214 my ($key) = @_;
215
216 # wait, to be sure we are not locked
217 lock_wait $key;
218
219 $LOCK{$key} = [];
220
221 Coro::guard {
222 # wake up all waiters, to be on the safe side
223 $_->ready for @{ delete $LOCK{$key} };
224 }
225}
226
227sub freeze_mainloop {
228 return unless $TICK_WATCHER->is_active;
229
230 my $guard = Coro::guard { $TICK_WATCHER->start };
231 $TICK_WATCHER->stop;
232 $guard
233}
234
235=item cf::async { BLOCK }
236
237Currently the same as Coro::async_pool, meaning you cannot use
238C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
239thing you are allowed to do is call C<prio> on it.
240
241=cut
242
243BEGIN { *async = \&Coro::async_pool }
244
186=item cf::sync_job { BLOCK } 245=item cf::sync_job { BLOCK }
187 246
188The design of crossfire+ requires that the main coro ($Coro::main) is 247The design of crossfire+ requires that the main coro ($Coro::main) is
189always able to handle events or runnable, as crossfire+ is only partly 248always able to handle events or runnable, as crossfire+ is only partly
190reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 249reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable.
… …
203 # this is the main coro, too bad, we have to block 262 # this is the main coro, too bad, we have to block
204 # till the operation succeeds, freezing the server :/ 263 # till the operation succeeds, freezing the server :/
205 264
206 # TODO: use suspend/resume instead 265 # TODO: use suspend/resume instead
207 # (but this is cancel-safe) 266 # (but this is cancel-safe)
208 local $FREEZE = 1; 267 my $freeze_guard = freeze_mainloop;
209 268
210 my $busy = 1; 269 my $busy = 1;
211 my @res; 270 my @res;
212 271
213 (Coro::async { 272 (async {
214 @res = eval { $job->() }; 273 @res = eval { $job->() };
215 warn $@ if $@; 274 warn $@ if $@;
216 undef $busy; 275 undef $busy;
217 })->prio (Coro::PRIO_MAX); 276 })->prio (Coro::PRIO_MAX);
218 277
219 while ($busy) { 278 while ($busy) {
220 Coro::cede_notself; 279 Coro::cede or Event::one_event;
221 Event::one_event unless Coro::nready;
222 } 280 }
223 281
224 wantarray ? @res : $res[0] 282 wantarray ? @res : $res[0]
225 } else { 283 } else {
226 # we are in another coroutine, how wonderful, everything just works 284 # we are in another coroutine, how wonderful, everything just works
227 285
228 $job->() 286 $job->()
229 } 287 }
230} 288}
231 289
232=item $coro = cf::coro { BLOCK } 290=item $coro = cf::async_ext { BLOCK }
233 291
234Creates and returns a new coro. This coro is automcatially being canceled 292Like async, but this coro is automcatially being canceled when the
235when the extension calling this is being unloaded. 293extension calling this is being unloaded.
236 294
237=cut 295=cut
238 296
239sub coro(&) { 297sub async_ext(&) {
240 my $cb = shift; 298 my $cb = shift;
241 299
242 my $coro; $coro = async { 300 my $coro = &Coro::async ($cb);
243 eval {
244 $cb->();
245 };
246 warn $@ if $@;
247 };
248 301
249 $coro->on_destroy (sub { 302 $coro->on_destroy (sub {
250 delete $EXT_CORO{$coro+0}; 303 delete $EXT_CORO{$coro+0};
251 }); 304 });
252 $EXT_CORO{$coro+0} = $coro; 305 $EXT_CORO{$coro+0} = $coro;
… …
1019 1072
1020=head2 CORE EXTENSIONS 1073=head2 CORE EXTENSIONS
1021 1074
1022Functions and methods that extend core crossfire objects. 1075Functions and methods that extend core crossfire objects.
1023 1076
1077=cut
1078
1079package cf::player;
1080
1024=head3 cf::player 1081=head3 cf::player
1025 1082
1026=over 4 1083=over 4
1027 1084
1028=item cf::player::exists $login 1085=item cf::player::find $login
1029 1086
1030Returns true when the given account exists. 1087Returns the given player object, loading it if necessary (might block).
1031 1088
1032=cut 1089=cut
1033 1090
1034sub cf::player::exists($) { 1091sub path($) {
1035 cf::player::find $_[0] 1092 sprintf "%s/%s/%s/%s.pl",
1036 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2; 1093 cf::localdir, cf::playerdir,
1094 (ref $_[0] ? $_[0]->ob->name : $_[0]) x 2
1095}
1096
1097sub find_active($) {
1098 $cf::PLAYER{$_[0]}
1099 and $cf::PLAYER{$_[0]}->active
1100 and $cf::PLAYER{$_[0]}
1101}
1102
1103sub exists($) {
1104 my ($login) = @_;
1105
1106 $cf::PLAYER{$login}
1107 or cf::sync_job { !aio_stat $login }
1108}
1109
1110sub find($) {
1111 return $cf::PLAYER{$_[0]} || do {
1112 my $login = $_[0];
1113
1114 my $guard = cf::lock_acquire "user_find:$login";
1115
1116 $cf::PLAYER{$login} ||= (load_pl path $login or return);
1117 };
1118}
1119
1120sub save($) {
1121 my ($pl) = @_;
1122
1123 return if $pl->{deny_save};
1124
1125 my $path = path $pl;
1126 my $guard = cf::lock_acquire "user_save:$path";
1127
1128 return if $pl->{deny_save};
1129 $pl->{last_save} = $cf::RUNTIME;
1130
1131 Coro::cede;
1132 $pl->save_pl ($path);
1133 Coro::cede;
1134}
1135
1136sub new($) {
1137 my ($login) = @_;
1138
1139 my $self = create;
1140
1141 $self->ob->name ($login);
1142 $self->{deny_save} = 1;
1143
1144 $cf::PLAYER{$login} = $self;
1145
1146 $self
1037} 1147}
1038 1148
1039=item $player->ext_reply ($msgid, $msgtype, %msg) 1149=item $player->ext_reply ($msgid, $msgtype, %msg)
1040 1150
1041Sends an ext reply to the player. 1151Sends an ext reply to the player.
1042 1152
1043=cut 1153=cut
1044 1154
1045sub cf::player::ext_reply($$$%) { 1155sub ext_reply($$$%) {
1046 my ($self, $id, %msg) = @_; 1156 my ($self, $id, %msg) = @_;
1047 1157
1048 $msg{msgid} = $id; 1158 $msg{msgid} = $id;
1049 1159
1050 $self->send ("ext " . to_json \%msg); 1160 $self->send ("ext " . cf::to_json \%msg);
1051} 1161}
1162
1163package cf;
1052 1164
1053=back 1165=back
1054 1166
1055 1167
1056=head3 cf::map 1168=head3 cf::map
… …
1062package cf::map; 1174package cf::map;
1063 1175
1064use Fcntl; 1176use Fcntl;
1065use Coro::AIO; 1177use Coro::AIO;
1066 1178
1067our $MAX_RESET = 7200; 1179our $MAX_RESET = 3600;
1068our $DEFAULT_RESET = 3600; 1180our $DEFAULT_RESET = 3000;
1069 1181
1070sub generate_random_map { 1182sub generate_random_map {
1071 my ($path, $rmp) = @_; 1183 my ($path, $rmp) = @_;
1072 1184
1073 # mit "rum" bekleckern, nicht 1185 # mit "rum" bekleckern, nicht
… …
1089# and all this just because we cannot iterate over 1201# and all this just because we cannot iterate over
1090# all maps in C++... 1202# all maps in C++...
1091sub change_all_map_light { 1203sub change_all_map_light {
1092 my ($change) = @_; 1204 my ($change) = @_;
1093 1205
1094 $_->change_map_light ($change) for values %cf::MAP; 1206 $_->change_map_light ($change)
1207 for grep $_->outdoor, values %cf::MAP;
1095} 1208}
1096 1209
1097sub try_load_header($) { 1210sub try_load_header($) {
1098 my ($path) = @_; 1211 my ($path) = @_;
1099 1212
… …
1102 or return; 1215 or return;
1103 1216
1104 my $map = cf::map::new 1217 my $map = cf::map::new
1105 or return; 1218 or return;
1106 1219
1220 # for better error messages only, will be overwritten
1221 $map->path ($path);
1222
1107 $map->load_header ($path) 1223 $map->load_header ($path)
1108 or return; 1224 or return;
1109 1225
1110 $map->{load_path} = $path; 1226 $map->{load_path} = $path;
1111 1227
1112 $map 1228 $map
1113} 1229}
1114 1230
1231sub find;
1115sub find_map { 1232sub find {
1116 my ($path, $origin) = @_; 1233 my ($path, $origin) = @_;
1117 1234
1118 #warn "find_map<$path,$origin>\n";#d# 1235 #warn "find<$path,$origin>\n";#d#
1119 1236
1120 $path = new cf::path $path, $origin && $origin->path; 1237 $path = new cf::path $path, $origin && $origin->path;
1121 my $key = $path->as_string; 1238 my $key = $path->as_string;
1122 1239
1240 cf::lock_wait "map_find:$key";
1241
1123 $cf::MAP{$key} || do { 1242 $cf::MAP{$key} || do {
1243 my $guard = cf::lock_acquire "map_find:$key";
1244
1124 # do it the slow way 1245 # do it the slow way
1125 my $map = try_load_header $path->save_path; 1246 my $map = try_load_header $path->save_path;
1126 1247
1248 Coro::cede;
1249
1127 if ($map) { 1250 if ($map) {
1251 $map->last_access ((delete $map->{last_access})
1252 || $cf::RUNTIME); #d#
1128 # safety 1253 # safety
1129 $map->{instantiate_time} = $cf::RUNTIME 1254 $map->{instantiate_time} = $cf::RUNTIME
1130 if $map->{instantiate_time} > $cf::RUNTIME; 1255 if $map->{instantiate_time} > $cf::RUNTIME;
1131 } else { 1256 } else {
1132 if (my $rmp = $path->random_map_params) { 1257 if (my $rmp = $path->random_map_params) {
… …
1137 1262
1138 $map or return; 1263 $map or return;
1139 1264
1140 $map->{load_original} = 1; 1265 $map->{load_original} = 1;
1141 $map->{instantiate_time} = $cf::RUNTIME; 1266 $map->{instantiate_time} = $cf::RUNTIME;
1267 $map->last_access ($cf::RUNTIME);
1142 $map->instantiate; 1268 $map->instantiate;
1143 1269
1144 # per-player maps become, after loading, normal maps 1270 # per-player maps become, after loading, normal maps
1145 $map->per_player (0) if $path->{user_rel}; 1271 $map->per_player (0) if $path->{user_rel};
1146 } 1272 }
1147 #Coro::Timer::sleep 1;#d#
1148 1273
1149 $map->path ($key); 1274 $map->path ($key);
1150 $map->{path} = $path; 1275 $map->{path} = $path;
1151 $map->{last_save} = $cf::RUNTIME; 1276 $map->{last_save} = $cf::RUNTIME;
1152 $map->last_access ($cf::RUNTIME); 1277
1278 Coro::cede;
1153 1279
1154 if ($map->should_reset) { 1280 if ($map->should_reset) {
1155 $map->reset; 1281 $map->reset;
1282 undef $guard;
1156 $map = find_map $path; 1283 $map = find $path
1284 or return;
1157 } 1285 }
1158 1286
1159 $cf::MAP{$key} = $map 1287 $cf::MAP{$key} = $map
1160 } 1288 }
1161} 1289}
1162 1290
1163sub load { 1291sub load {
1164 my ($self) = @_; 1292 my ($self) = @_;
1165 1293
1294 my $path = $self->{path};
1295 my $guard = cf::lock_acquire "map_load:" . $path->as_string;
1296
1166 return if $self->in_memory != cf::MAP_SWAPPED; 1297 return if $self->in_memory != cf::MAP_SWAPPED;
1167 1298
1168 $self->in_memory (cf::MAP_LOADING); 1299 $self->in_memory (cf::MAP_LOADING);
1169
1170 my $path = $self->{path};
1171 1300
1172 $self->alloc; 1301 $self->alloc;
1173 $self->load_objects ($self->{load_path}, 1) 1302 $self->load_objects ($self->{load_path}, 1)
1174 or return; 1303 or return;
1175 1304
… …
1181 if (aio_open $uniq, O_RDONLY, 0) { 1310 if (aio_open $uniq, O_RDONLY, 0) {
1182 $self->clear_unique_items; 1311 $self->clear_unique_items;
1183 $self->load_objects ($uniq, 0); 1312 $self->load_objects ($uniq, 0);
1184 } 1313 }
1185 } 1314 }
1315
1316 Coro::cede;
1186 1317
1187 # now do the right thing for maps 1318 # now do the right thing for maps
1188 $self->link_multipart_objects; 1319 $self->link_multipart_objects;
1189 1320
1190 if ($self->{path}->is_style_map) { 1321 if ($self->{path}->is_style_map) {
… …
1198 $self->difficulty ($self->estimate_difficulty) 1329 $self->difficulty ($self->estimate_difficulty)
1199 unless $self->difficulty; 1330 unless $self->difficulty;
1200 $self->activate; 1331 $self->activate;
1201 } 1332 }
1202 1333
1334 Coro::cede;
1335
1203 $self->in_memory (cf::MAP_IN_MEMORY); 1336 $self->in_memory (cf::MAP_IN_MEMORY);
1204} 1337}
1205 1338
1206sub load_map_sync { 1339sub find_sync {
1207 my ($path, $origin) = @_; 1340 my ($path, $origin) = @_;
1208 1341
1209 #warn "load_map_sync<$path, $origin>\n";#d# 1342 cf::sync_job { cf::map::find $path, $origin }
1343}
1210 1344
1211 cf::sync_job { 1345sub do_load_sync {
1212 my $map = cf::map::find_map $path, $origin 1346 my ($map) = @_;
1213 or return; 1347
1214 $map->load; 1348 cf::sync_job { $map->load };
1215 $map
1216 }
1217} 1349}
1218 1350
1219sub save { 1351sub save {
1220 my ($self) = @_; 1352 my ($self) = @_;
1221 1353
1354 my $lock = cf::lock_acquire "map_data:" . $self->path;
1355
1222 $self->{last_save} = $cf::RUNTIME; 1356 $self->{last_save} = $cf::RUNTIME;
1223 1357
1224 return unless $self->dirty; 1358 return unless $self->dirty;
1225 1359
1226 my $save = $self->{path}->save_path; utf8::encode $save; 1360 my $save = $self->{path}->save_path; utf8::encode $save;
1227 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1361 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1228 1362
1229 $self->{load_path} = $save; 1363 $self->{load_path} = $save;
1230 1364
1231 return if $self->{deny_save}; 1365 return if $self->{deny_save};
1366
1367 local $self->{last_access} = $self->last_access;#d#
1368
1369 cf::async {
1370 $_->contr->save for $self->players;
1371 };
1232 1372
1233 if ($uniq) { 1373 if ($uniq) {
1234 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1374 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1235 $self->save_objects ($uniq, cf::IO_UNIQUES); 1375 $self->save_objects ($uniq, cf::IO_UNIQUES);
1236 } else { 1376 } else {
… …
1239} 1379}
1240 1380
1241sub swap_out { 1381sub swap_out {
1242 my ($self) = @_; 1382 my ($self) = @_;
1243 1383
1384 # save first because save cedes
1385 $self->save;
1386
1387 my $lock = cf::lock_acquire "map_data:" . $self->path;
1388
1244 return if $self->players; 1389 return if $self->players;
1245 return if $self->in_memory != cf::MAP_IN_MEMORY; 1390 return if $self->in_memory != cf::MAP_IN_MEMORY;
1246 return if $self->{deny_save}; 1391 return if $self->{deny_save};
1247 1392
1248 $self->save;
1249 $self->clear; 1393 $self->clear;
1250 $self->in_memory (cf::MAP_SWAPPED); 1394 $self->in_memory (cf::MAP_SWAPPED);
1251} 1395}
1252 1396
1253sub reset_at { 1397sub reset_at {
… …
1291} 1435}
1292 1436
1293sub reset { 1437sub reset {
1294 my ($self) = @_; 1438 my ($self) = @_;
1295 1439
1440 my $lock = cf::lock_acquire "map_data:" . $self->path;
1441
1296 return if $self->players; 1442 return if $self->players;
1297 return if $self->{path}{user_rel};#d# 1443 return if $self->{path}{user_rel};#d#
1298 1444
1299 warn "resetting map ", $self->path;#d# 1445 warn "resetting map ", $self->path;#d#
1300 1446
… …
1319 1465
1320sub customise_for { 1466sub customise_for {
1321 my ($map, $ob) = @_; 1467 my ($map, $ob) = @_;
1322 1468
1323 if ($map->per_player) { 1469 if ($map->per_player) {
1324 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1470 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1325 } 1471 }
1326 1472
1327 $map 1473 $map
1328} 1474}
1329 1475
1330sub emergency_save { 1476sub emergency_save {
1331 local $cf::FREEZE = 1; 1477 my $freeze_guard = cf::freeze_mainloop;
1332 1478
1333 warn "enter emergency map save\n"; 1479 warn "enter emergency perl save\n";
1334 1480
1335 cf::sync_job { 1481 cf::sync_job {
1482 warn "begin emergency player save\n";
1483 $_->save for values %cf::PLAYER;
1484 warn "end emergency player save\n";
1485
1336 warn "begin emergency map save\n"; 1486 warn "begin emergency map save\n";
1337 $_->save for values %cf::MAP; 1487 $_->save for values %cf::MAP;
1488 warn "end emergency map save\n";
1338 }; 1489 };
1339 1490
1340 warn "end emergency map save\n"; 1491 warn "leave emergency perl save\n";
1341} 1492}
1342 1493
1343package cf; 1494package cf;
1344 1495
1345=back 1496=back
… …
1408=cut 1559=cut
1409 1560
1410sub cf::object::player::enter_link { 1561sub cf::object::player::enter_link {
1411 my ($self) = @_; 1562 my ($self) = @_;
1412 1563
1564 $self->deactivate_recursive;
1565
1413 return if $self->map == $LINK_MAP; 1566 return if $self->map == $LINK_MAP;
1414 1567
1415 $self->{_link_pos} = [$self->map->{path}, $self->x, $self->y] 1568 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1416 if $self->map; 1569 if $self->map;
1417 1570
1418 $self->enter_map ($LINK_MAP, 20, 20); 1571 $self->enter_map ($LINK_MAP, 20, 20);
1419 $self->deactivate_recursive;
1420} 1572}
1421 1573
1422sub cf::object::player::leave_link { 1574sub cf::object::player::leave_link {
1423 my ($self, $map, $x, $y) = @_; 1575 my ($self, $map, $x, $y) = @_;
1424 1576
1425 my $link_pos = delete $self->{_link_pos}; 1577 my $link_pos = delete $self->{_link_pos};
1426 1578
1427 unless ($map) { 1579 unless ($map) {
1428 # restore original map position 1580 # restore original map position
1429 ($map, $x, $y) = @{ $link_pos || [] }; 1581 ($map, $x, $y) = @{ $link_pos || [] };
1430 $map = cf::map::find_map $map; 1582 $map = cf::map::find $map;
1431 1583
1432 unless ($map) { 1584 unless ($map) {
1433 ($map, $x, $y) = @$EMERGENCY_POSITION; 1585 ($map, $x, $y) = @$EMERGENCY_POSITION;
1434 $map = cf::map::find_map $map 1586 $map = cf::map::find $map
1435 or die "FATAL: cannot load emergency map\n"; 1587 or die "FATAL: cannot load emergency map\n";
1436 } 1588 }
1437 } 1589 }
1438 1590
1439 ($x, $y) = (-1, -1) 1591 ($x, $y) = (-1, -1)
… …
1443 ($x, $y) = ($map->enter_x, $map->enter_y) 1595 ($x, $y) = ($map->enter_x, $map->enter_y)
1444 if $x <=0 && $y <= 0; 1596 if $x <=0 && $y <= 0;
1445 1597
1446 $map->load; 1598 $map->load;
1447 1599
1600 return unless $self->contr->active;
1448 $self->activate_recursive; 1601 $self->activate_recursive;
1449 $self->enter_map ($map, $x, $y); 1602 $self->enter_map ($map, $x, $y);
1450} 1603}
1451 1604
1605cf::player->attach (
1606 on_logout => sub {
1607 my ($pl) = @_;
1608
1609 # abort map switching before logout
1610 if ($pl->ob->{_link_pos}) {
1611 cf::sync_job {
1612 $pl->ob->leave_link
1613 };
1614 }
1615 },
1616 on_login => sub {
1617 my ($pl) = @_;
1618
1619 # try to abort aborted map switching on player login :)
1620 # should happen only on crashes
1621 if ($pl->ob->{_link_pos}) {
1622 $pl->ob->enter_link;
1623 (async {
1624 # we need this sleep as the login has a concurrent enter_exit running
1625 # and this sleep increases chances of the player not ending up in scorn
1626 $pl->ob->reply (undef,
1627 "There was an internal problem at your last logout, "
1628 . "the server will try to bring you to your intended destination in a second.",
1629 cf::NDI_RED);
1630 Coro::Timer::sleep 1;
1631 $pl->ob->leave_link;
1632 })->prio (2);
1633 }
1634 },
1635);
1636
1452=item $player_object->goto_map ($path, $x, $y) 1637=item $player_object->goto ($path, $x, $y)
1453 1638
1454=cut 1639=cut
1455 1640
1456sub cf::object::player::goto_map { 1641sub cf::object::player::goto {
1457 my ($self, $path, $x, $y) = @_; 1642 my ($self, $path, $x, $y) = @_;
1458 1643
1459 $self->enter_link; 1644 $self->enter_link;
1460 1645
1461 (Coro::async { 1646 (async {
1462 $path = new cf::path $path; 1647 $path = new cf::path $path;
1463 1648
1464 my $map = cf::map::find_map $path->as_string; 1649 my $map = cf::map::find $path->as_string;
1465 $map = $map->customise_for ($self) if $map; 1650 $map = $map->customise_for ($self) if $map;
1466 1651
1467# warn "entering ", $map->path, " at ($x, $y)\n" 1652# warn "entering ", $map->path, " at ($x, $y)\n"
1468# if $map; 1653# if $map;
1469 1654
… …
1528 1713
1529 return unless $self->type == cf::PLAYER; 1714 return unless $self->type == cf::PLAYER;
1530 1715
1531 $self->enter_link; 1716 $self->enter_link;
1532 1717
1533 (Coro::async { 1718 (async {
1719 $self->deactivate_recursive; # just to be sure
1534 unless (eval { 1720 unless (eval {
1535
1536 prepare_random_map $exit 1721 prepare_random_map $exit
1537 if $exit->slaying eq "/!"; 1722 if $exit->slaying eq "/!";
1538 1723
1539 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1724 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1540 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1725 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1541 1726
1542 1; 1727 1;
1543 }) { 1728 }) {
1544 $self->message ("Something went wrong deep within the crossfire server. " 1729 $self->message ("Something went wrong deep within the crossfire server. "
1545 . "I'll try to bring you back to the map you were before. " 1730 . "I'll try to bring you back to the map you were before. "
… …
1602 on_reply => sub { 1787 on_reply => sub {
1603 my ($ns, $msg) = @_; 1788 my ($ns, $msg) = @_;
1604 1789
1605 # this weird shuffling is so that direct followup queries 1790 # this weird shuffling is so that direct followup queries
1606 # get handled first 1791 # get handled first
1607 my $queue = delete $ns->{query_queue}; 1792 my $queue = delete $ns->{query_queue}
1793 or return; # be conservative, not sure how that can happen, but we saw a crash here
1608 1794
1609 (shift @$queue)->[1]->($msg); 1795 (shift @$queue)->[1]->($msg);
1610 1796
1611 push @{ $ns->{query_queue} }, @$queue; 1797 push @{ $ns->{query_queue} }, @$queue;
1612 1798
… …
1618 } 1804 }
1619 } 1805 }
1620 }, 1806 },
1621); 1807);
1622 1808
1623=item $client->coro (\&cb) 1809=item $client->async (\&cb)
1624 1810
1625Create a new coroutine, running the specified callback. The coroutine will 1811Create a new coroutine, running the specified callback. The coroutine will
1626be automatically cancelled when the client gets destroyed (e.g. on logout, 1812be automatically cancelled when the client gets destroyed (e.g. on logout,
1627or loss of connection). 1813or loss of connection).
1628 1814
1629=cut 1815=cut
1630 1816
1631sub cf::client::coro { 1817sub cf::client::async {
1632 my ($self, $cb) = @_; 1818 my ($self, $cb) = @_;
1633 1819
1634 my $coro; $coro = async { 1820 my $coro = &Coro::async ($cb);
1635 eval {
1636 $cb->();
1637 };
1638 warn $@ if $@;
1639 };
1640 1821
1641 $coro->on_destroy (sub { 1822 $coro->on_destroy (sub {
1642 delete $self->{_coro}{$coro+0}; 1823 delete $self->{_coro}{$coro+0};
1643 }); 1824 });
1644 1825
… …
1816 1997
1817{ 1998{
1818 my $path = cf::localdir . "/database.pst"; 1999 my $path = cf::localdir . "/database.pst";
1819 2000
1820 sub db_load() { 2001 sub db_load() {
1821 warn "loading database $path\n";#d# remove later
1822 $DB = stat $path ? Storable::retrieve $path : { }; 2002 $DB = stat $path ? Storable::retrieve $path : { };
1823 } 2003 }
1824 2004
1825 my $pid; 2005 my $pid;
1826 2006
1827 sub db_save() { 2007 sub db_save() {
1828 warn "saving database $path\n";#d# remove later
1829 waitpid $pid, 0 if $pid; 2008 waitpid $pid, 0 if $pid;
1830 if (0 == ($pid = fork)) { 2009 if (0 == ($pid = fork)) {
1831 $DB->{_meta}{version} = 1; 2010 $DB->{_meta}{version} = 1;
1832 Storable::nstore $DB, "$path~"; 2011 Storable::nstore $DB, "$path~";
1833 rename "$path~", $path; 2012 rename "$path~", $path;
… …
1881 open my $fh, "<:utf8", cf::confdir . "/config" 2060 open my $fh, "<:utf8", cf::confdir . "/config"
1882 or return; 2061 or return;
1883 2062
1884 local $/; 2063 local $/;
1885 *CFG = YAML::Syck::Load <$fh>; 2064 *CFG = YAML::Syck::Load <$fh>;
2065
2066 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2067
2068 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2069 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2070
2071 if (exists $CFG{mlockall}) {
2072 eval {
2073 $CFG{mlockall} ? &mlockall : &munlockall
2074 and die "WARNING: m(un)lockall failed: $!\n";
2075 };
2076 warn $@ if $@;
2077 }
1886} 2078}
1887 2079
1888sub main { 2080sub main {
1889 # we must not ever block the main coroutine 2081 # we must not ever block the main coroutine
1890 local $Coro::idle = sub { 2082 local $Coro::idle = sub {
1891 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2083 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1892 (Coro::unblock_sub {
1893 Event::one_event; 2084 async { Event::one_event };
1894 })->();
1895 }; 2085 };
1896 2086
1897 cfg_load; 2087 cfg_load;
1898 db_load; 2088 db_load;
1899 load_extensions; 2089 load_extensions;
… …
1910 return; 2100 return;
1911 } 2101 }
1912 2102
1913 warn "reloading..."; 2103 warn "reloading...";
1914 2104
1915 local $FREEZE = 1; 2105 my $guard = freeze_mainloop;
1916 cf::emergency_save; 2106 cf::emergency_save;
1917 2107
1918 eval { 2108 eval {
1919 # if anything goes wrong in here, we should simply crash as we already saved 2109 # if anything goes wrong in here, we should simply crash as we already saved
1920 2110
… …
1982 cf::load_extensions; 2172 cf::load_extensions;
1983 2173
1984 # reattach attachments to objects 2174 # reattach attachments to objects
1985 warn "reattach"; 2175 warn "reattach";
1986 _global_reattach; 2176 _global_reattach;
2177 reattach $_ for values %MAP;
1987 }; 2178 };
1988 2179
1989 if ($@) { 2180 if ($@) {
1990 warn $@; 2181 warn $@;
1991 warn "error while reloading, exiting."; 2182 warn "error while reloading, exiting.";
… …
2007 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2198 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2008 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2199 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2009 2200
2010 # dirty hack because... archetypes are not yet loaded 2201 # dirty hack because... archetypes are not yet loaded
2011 Event->timer ( 2202 Event->timer (
2012 after => 2, 2203 after => 10,
2013 cb => sub { 2204 cb => sub {
2014 $_[0]->w->cancel; 2205 $_[0]->w->cancel;
2015 2206
2016 # provide some exits "home" 2207 # provide some exits "home"
2017 my $exit = cf::object::new "exit"; 2208 my $exit = cf::object::new "exit";
… …
2056 reentrant => 0, 2247 reentrant => 0,
2057 prio => 0, 2248 prio => 0,
2058 at => $NEXT_TICK || $TICK, 2249 at => $NEXT_TICK || $TICK,
2059 data => WF_AUTOCANCEL, 2250 data => WF_AUTOCANCEL,
2060 cb => sub { 2251 cb => sub {
2061 unless ($FREEZE) {
2062 cf::server_tick; # one server iteration 2252 cf::server_tick; # one server iteration
2063 $RUNTIME += $TICK; 2253 $RUNTIME += $TICK;
2064 }
2065
2066 $NEXT_TICK += $TICK; 2254 $NEXT_TICK += $TICK;
2067 2255
2068 # if we are delayed by four ticks or more, skip them all 2256 # if we are delayed by four ticks or more, skip them all
2069 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2257 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2070 2258
… …
2093 or warn "ERROR: unable to write runtime file: $!"; 2281 or warn "ERROR: unable to write runtime file: $!";
2094 })->(); 2282 })->();
2095 }, 2283 },
2096); 2284);
2097 2285
2286END { cf::emergency_save }
2287
20981 22881
2099 2289

Diff Legend

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